From 11c8d87cfa4eac7ce2ab72b2344eb8a3008ec2fa Mon Sep 17 00:00:00 2001 From: droplet Date: Thu, 8 Sep 2011 00:05:57 -0400 Subject: [PATCH] Issue #1268466 by droplet, jessebeach: Repaired .views-display-top after changes to the Seven secondary menu unordered list styling jarred the layout. Cleaned out some crufty CSS. --- css/views-admin-rtl.css | 4 ---- css/views-admin.bartik-rtl.css | 9 ++++++++- css/views-admin.bartik.css | 8 ++++++++ css/views-admin.css | 26 -------------------------- css/views-admin.garland-rtl.css | 10 +++++++++- css/views-admin.seven-rtl.css | 14 ++++++++++++++ css/views-admin.seven.css | 7 ++++++- css/views-admin.theme.css | 8 +++----- includes/admin.inc | 2 +- 9 files changed, 49 insertions(+), 39 deletions(-) diff --git a/css/views-admin-rtl.css b/css/views-admin-rtl.css index cb3edaa..6d1e03a 100644 --- a/css/views-admin-rtl.css +++ b/css/views-admin-rtl.css @@ -25,10 +25,6 @@ float: left; } -.views-displays { - float: right; -} - /* @end */ /* @group Attachment details tabs diff --git a/css/views-admin.bartik-rtl.css b/css/views-admin.bartik-rtl.css index 0402f26..f46250d 100644 --- a/css/views-admin.bartik-rtl.css +++ b/css/views-admin.bartik-rtl.css @@ -2,4 +2,11 @@ * The .bartik.css file is intended to contain styles that override declarations * in the Bartik theme. */ - \ No newline at end of file + + /* @group Lists */ + +.views-display-top .secondary .action-list { + padding-right: 0; +} + +/* @end */ \ No newline at end of file diff --git a/css/views-admin.bartik.css b/css/views-admin.bartik.css index d9f051e..f720af4 100644 --- a/css/views-admin.bartik.css +++ b/css/views-admin.bartik.css @@ -3,6 +3,14 @@ * in the Bartik theme. */ +/* @group Lists */ + +.views-display-top .secondary .action-list { + padding-left: 0; /* LTR */ +} + +/* @end */ + /* @group Attachment details tabs * * The tabs that switch between sections diff --git a/css/views-admin.css b/css/views-admin.css index 2582900..7ce7088 100644 --- a/css/views-admin.css +++ b/css/views-admin.css @@ -109,7 +109,6 @@ .views-displays { clear: both; - float:left; /* LTR */ } /* @end */ @@ -118,7 +117,6 @@ * * The tabs that switch between sections */ - .views-displays .secondary { border-bottom: 0 none; margin: 0; @@ -314,31 +312,7 @@ div.form-item-options-value-all { /* @end */ -/* @group Clearfix - * - * @see http://perishablepress.com/press/2009/12/06/new-clearfix-hack - */ - /* Reset the formatting context for all modern browsers */ -.views-display-tab .fieldset-wrapper:after, -ul.secondary:after { - clear: both; - content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x "; - display: block; - font-size: xx-large; - height: 0 !important; - line-height: 0; - overflow: hidden; - visibility: hidden; -} - -/* Reset the formatting context for IE */ -.views-display-tab .fieldset-wrapper, -ul.secondary { - zoom: 1; -} - -/* @end */ /* @group Javascript dependent styling */ diff --git a/css/views-admin.garland-rtl.css b/css/views-admin.garland-rtl.css index b0fcc7a..c239b72 100644 --- a/css/views-admin.garland-rtl.css +++ b/css/views-admin.garland-rtl.css @@ -2,4 +2,12 @@ * The .garland.css file is intended to contain styles that override declarations * in the Garland theme. */ - \ No newline at end of file + + /* @group Lists */ + +.views-displays .secondary .action-list { + left: auto; + right: 1px; +} + + /* @end */ \ No newline at end of file diff --git a/css/views-admin.seven-rtl.css b/css/views-admin.seven-rtl.css index e01f830..abdd5aa 100644 --- a/css/views-admin.seven-rtl.css +++ b/css/views-admin.seven-rtl.css @@ -27,3 +27,17 @@ } /* @end */ + +/* @group Attachment details tabs */ + +.views-display-top ul.secondary { + float: right; +} + +.views-displays .secondary .action-list li:first-child { + -moz-border-radius: 7px 0 0 0; + -webkit-border-radius: 7px 0 0 0; + border-radius: 7px 0 0 0; +} + +/* @end */ diff --git a/css/views-admin.seven.css b/css/views-admin.seven.css index 02c8077..6ebdbf1 100644 --- a/css/views-admin.seven.css +++ b/css/views-admin.seven.css @@ -192,7 +192,12 @@ fieldset.fieldset-no-legend { .views-display-top ul.secondary { background-color: transparent; - margin-right: 18em; + float: left +} + +.views-display-top .secondary .action-list li { + float: none; + margin: 0; } /* @end */ diff --git a/css/views-admin.theme.css b/css/views-admin.theme.css index c68c308..9dcf3dc 100644 --- a/css/views-admin.theme.css +++ b/css/views-admin.theme.css @@ -24,8 +24,7 @@ } .box-margin { - margin-left: 12px; - margin-right: 12px; + margin: 12px 12px 0 12px; } /* @end */ @@ -413,8 +412,7 @@ td.group-title { .views-display-top { background-color: #F9F9F9; border-bottom: 1px solid #CCCCCC; - margin-bottom: 14px; - padding: 8px 8px 6px; /* LTR */ + padding: 8px 8px 8px; /* LTR */ position: relative; } @@ -423,7 +421,6 @@ td.group-title { } .views-display-top .secondary > li { - margin-bottom: 6px; margin-right: 6px; padding-left: 0; } @@ -923,6 +920,7 @@ td.group-title { #views-preview-wrapper { border: 1px solid #CCC; border-top: 2px solid #CCC; + padding-bottom: 12px; padding-top: 12px; } diff --git a/includes/admin.inc b/includes/admin.inc index 5d646f7..fe90a2f 100644 --- a/includes/admin.inc +++ b/includes/admin.inc @@ -1192,7 +1192,7 @@ function views_ui_preview_form($form, &$form_state, $view, $display_id = 'defaul */ function views_ui_render_display_top($view, $display_id) { $element['#theme_wrappers'] = array('views_container'); - $element['#attributes']['class'] = array('views-display-top'); + $element['#attributes']['class'] = array('views-display-top', 'clearfix'); $element['#attributes']['id'] = array('views-display-top'); // Extra actions for the display -- 1.7.3.4