- Patch #162202 by dvessel: fixed CSS problems in Opera.

3 files changed, 14 insertions, 25 deletions

diff --git a/modules/system/admin-rtl.css b/modules/system/admin-rtl.css
index 6a76675a5..b95dd1d11 100644
--- a/modules/system/admin-rtl.css
+++ b/modules/system/admin-rtl.css
@@ -24,14 +24,13 @@ table.screenshot {
   margin-left: 1em;
 }
 
-div.date-container {
+.date-container {
   clear: right;
 }
-
-div.date-container div {
+.date-container .select-container, .date-container .custom-container {
   float: right;
 }
-div.custom-container {
+.date-container .custom-container {
   margin-left: inherit;
   margin-right: 15px;
 }
diff --git a/modules/system/admin.css b/modules/system/admin.css
index 30416c90d..debc7963f 100644
--- a/modules/system/admin.css
+++ b/modules/system/admin.css
@@ -115,30 +115,20 @@ table.screenshot {
 /**
  * Date and time settings page
  */
-div.date-container {
+.date-container {
   overflow: auto;
   clear: left; /* LTR */
 }
-
-div.date-container > div, div.date-container > div > div {
-  margin-top: 0px;
-  margin-bottom: 0px;
+.date-container .form-item {
+  margin-top: 0;
 }
-
-div.date-container div {
+.date-container .select-container, .date-container .custom-container {
   float: left; /* LTR */
 }
-
-html.js div.custom-container {
-  display: none;
-}
-
-html.js div.custom-container .form-item label {
-  visibility: hidden;
-}
-
-div.custom-container {
+.date-container .custom-container {
   margin-left: 15px; /* LTR */
   width: 50%;
 }
-
+html.js .custom-container label {
+  visibility: hidden;
+}
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 1d82333d2..c9088126f 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1378,7 +1378,7 @@ function system_date_time_settings() {
 
   $date_format_short = variable_get('date_format_short', $date_short[1]);
   $form['date_formats']['date_format_short'] = array(
-    '#prefix' => '<div class="date-container"><div>',
+    '#prefix' => '<div class="date-container"><div class="select-container">',
     '#suffix' => '</div>',
     '#type' => 'select',
     '#title' => t('Short date format'),
@@ -1401,7 +1401,7 @@ function system_date_time_settings() {
 
   $date_format_medium = variable_get('date_format_medium', $date_medium[1]);
   $form['date_formats']['date_format_medium'] = array(
-    '#prefix' => '<div class="date-container"><div>',
+    '#prefix' => '<div class="date-container"><div class="select-container">',
     '#suffix' => '</div>',
     '#type' => 'select',
     '#title' => t('Medium date format'),
@@ -1424,7 +1424,7 @@ function system_date_time_settings() {
 
   $date_format_long = variable_get('date_format_long', $date_long[0]);
   $form['date_formats']['date_format_long'] = array(
-    '#prefix' => '<div class="date-container"><div>',
+    '#prefix' => '<div class="date-container"><div class="select-container">',
     '#suffix' => '</div>',
     '#type' => 'select',
     '#title' => t('Long date format'),