diff --git a/ChangeLog b/ChangeLog index 5be55f6cec..b6f264f15e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog - bug #4845 White screen (Cloudflare) - bug #4794 Server error viewing table content - bug Fix issues related to number of decimal places in time +- bug #4853 Relation view between 1600 and 1780 px 4.4.2.0 (2015-04-13) - bug #4835 PMA_hideShowConnection not called after submit_num_fields diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 44faf5c94e..400ddf2e4e 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -463,7 +463,8 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i, . ' placeholder="' . __('Constraint name') . '" />'; $html_output .= '' . "\n"; - $html_output .= ''; + $html_output .= '
'; + $html_output .= ''; // For ON DELETE and ON UPDATE, the default action // is RESTRICT as per MySQL doc; however, a SHOW CREATE TABLE // won't display the clause if it's set as RESTRICT. @@ -477,7 +478,7 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i, ); $html_output .= '' . "\n"; - $html_output .= '' . "\n"; + $html_output .= '' . "\n"; $on_update = isset($one_key['on_update']) ? $one_key['on_update'] : 'RESTRICT'; $html_output .= PMA_generateDropdown( @@ -487,6 +488,7 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i, $on_update ); $html_output .= ''; + $html_output .= '
'; $column_array = array(); $column_array[''] = ''; diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 0b57c91d10..730de22e33 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -247,19 +247,6 @@ fieldset .formelement { white-space: nowrap; } -@media all and (min-width: 1600px) { - fieldset .formelement { - clear: none; - } - #foreign_keys.relationalTable td:first-child + td select { - width: auto; - margin-right: 1%; - } - #foreign_keys.relationalTable { - width: 100%; - } -} - /* revert for Gecko */ fieldset div[class=formelement] { white-space: normal; diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index a2b69bc8e9..cf644f3fa7 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -531,19 +531,6 @@ fieldset .formelement { white-space: nowrap; } -@media all and (min-width: 1600px) { - fieldset .formelement { - clear: none; - } - #foreign_keys.relationalTable td:first-child + td select { - width: auto; - margin-right: 1%; - } - #foreign_keys.relationalTable { - width: 100%; - } -} - /* revert for Gecko */ fieldset div[class=formelement] { white-space: normal;