From d11d2d9acba012134672b17abef906365131c7fa Mon Sep 17 00:00:00 2001 From: Jesse Beach Date: Wed, 23 Mar 2011 18:23:14 -0400 Subject: [PATCH 1/2] 1098052 patch update --- css/views-admin.css | 29 +++++- css/views-admin.ctools.css | 100 ++++----------------- css/views-admin.seven.css | 208 ++++++++++++++++++++++++++++++++++++++++++- css/views-admin.theme.css | 51 +++++------ 4 files changed, 270 insertions(+), 118 deletions(-) diff --git a/css/views-admin.css b/css/views-admin.css index a2b0eec..241a05f 100644 --- a/css/views-admin.css +++ b/css/views-admin.css @@ -2,6 +2,20 @@ * The .css file is intended to only contain positioning and size declarations * For example: display, position, float, clear, and overflow. */ + +/* @group Resets */ + +.views-admin ul, +.views-admin menu, +.views-admin dir { + padding-left: 0; /* LTR for IE */ + /* padding-start is used so that RTL works out of the box */ + -moz-padding-start: 0; + -webkit-padding-start: 0; + padding-start: 0; +} + +/* @end */ /* @group Inline lists */ @@ -87,20 +101,25 @@ float:left; /* LTR */ } -.views-displays .secondary { - overflow: visible; -} - /* @end */ /* @group Attachment details tabs * * The tabs that switch between sections */ + + .views-displays .secondary { + border-bottom: 0 none; + margin: 0; + overflow: visible; + padding: 0; + } .views-displays .secondary > li { + border-right: 0 none; display: inline-block; float: left; /* LTR */ + padding: 0; } .views-displays .secondary .open > a { @@ -133,7 +152,7 @@ left: 0; /* LTR */ margin: 0; position: absolute; - top: 22px; + top: 23px; z-index: 50; } diff --git a/css/views-admin.ctools.css b/css/views-admin.ctools.css index d326951..8d94193 100644 --- a/css/views-admin.ctools.css +++ b/css/views-admin.ctools.css @@ -2,33 +2,7 @@ .ctools-button { background-color: #ffffff; - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0px, - #f9f9f9 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(249, 249, 249, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0px, - #f9f9f9 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0px, - #f9f9f9 100%); border-color: #cccccc; - -moz-border-radius: 11px 11px 11px 11px; - -webkit-border-radius: 11px 11px 11px 11px; - border-radius: 11px 11px 11px 11px; font-size: 11px; padding-bottom: 2px; padding-top: 2px; @@ -40,29 +14,6 @@ } .ctools-button:hover { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0px, - #f1f1f1 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(241, 241, 241, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0px, - #f1f1f1 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0px, - #f1f1f1 100%); border-color: #b8b8b8; } @@ -79,42 +30,27 @@ border-right: 1px solid #e8e8e8; } +.ctools-dropbutton .ctools-content ul { + margin: 0; + padding: 0; +} + +.ctools-content ul.actions { + margin-top: 0; + margin-bottom: 0; + padding-left: 0; +} + .ctools-button .ctools-content a { background-image: none; border: medium none; } .ctools-dropbutton.open:hover { - background-image: - -moz-linear-gradient( - -90deg, - #ffffff 0px, - #f9f9f9 100%); - background-image: - -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0.0, rgba(255, 255, 255, 1.0)), - color-stop(1.0, rgba(249, 249, 249, 1.0)) - ); - background-image: - -webkit-linear-gradient( - -90deg, - #ffffff 0px, - #f9f9f9 100%); - background-image: - linear-gradient( - -90deg, - #ffffff 0px, - #f9f9f9 100%); border-color: #D0D0D0; } .ctools-dropbutton.open { - -moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); - -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); - box-shadow: 1px 1px 2px rgba(0,0,0,0.25); z-index: 100; } @@ -160,10 +96,10 @@ .views-ui-display-tab-actions .ctools-button input { background: none; border: medium; - color: #0074BD; font-family: inherit; font-size: 12px; padding: 0; + margin-bottom: 0; } /* @end */ @@ -180,7 +116,7 @@ float: left; height: 0; margin-right: 2px; - margin-top: 0.6667em; + margin-top: 0.4545em; width: 0; } @@ -192,7 +128,7 @@ border-width: 5px 0 5px 5px; margin-left: 2px; margin-right: 5px; - margin-top: 0.5em; + margin-top: 0.3333em; } .ctools-toggle:hover, @@ -212,25 +148,24 @@ } .views-display-settings .ctools-toggle { - color: #008BCB; + color: #000000; } .views-display-column > .ctools-toggle { margin-left: 6px; margin-right: 3px; - margin-top: 14px; + margin-top: 10px; } .views-display-column > .ctools-toggle.ctools-toggle-collapsed { margin-left: 9px; margin-right: 5px; - margin-top: 12px; + margin-top: 8px; } .views-display-column > .ctools-collapsible-handle { border-color: #F3F3F3; border-style: solid; border-width: 1px 1px 0; - color: #008BCB; font-size: 13px; font-weight: normal; margin: 0; @@ -270,3 +205,4 @@ } /* @end */ + diff --git a/css/views-admin.seven.css b/css/views-admin.seven.css index a900a68..8faa80b 100644 --- a/css/views-admin.seven.css +++ b/css/views-admin.seven.css @@ -216,6 +216,75 @@ table th { /* @end */ +/* @group Attachment details */ + +#edit-display-settings-title { + color: #008BCB; +} + +/* @end */ + +/* @group Attachment details tabs + * + * The tabs that switch between sections + */ + +.views-displays .secondary { + text-align: left; /* LTR */ +} + +.views-displays .secondary > li:first-child { + padding-left: 0; +} + +.views-admin .icon.add { + background-position: center 3px; +} + +.views-displays .secondary a { + background-color: #f1f1f1; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + color: #008BCB; +} + +.views-displays .secondary a:hover > .icon.add { + background-position: center -25px; +} + +.views-displays .secondary .open > a { + -moz-border-radius: 7px 7px 0 0; + -webkit-border-radius: 7px 7px 0 0; + border-radius: 7px 7px 0 0; +} + +.views-displays .secondary .open > a:hover { + background-color: #f1f1f1; + color: #008BCB; +} + +.views-displays .secondary .action-list li:first-child { + -moz-border-radius: 0 7px 0 0; + -webkit-border-radius: 0 7px 0 0; + border-radius: 0 7px 0 0; +} + +.views-displays .secondary .action-list li:last-child { + -moz-border-radius: 0 0 7px 7px; + -webkit-border-radius: 0 0 7px 7px; + border-radius: 0 0 7px 7px; +} + +.views-displays .secondary .action-list input.form-submit { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; + color: #008BCB; +} + +/* @end */ + /* @group Attachment buckets * * These are the individual "buckets," or boxes, inside the display settings area @@ -274,14 +343,143 @@ table th { /* @end */ -/* @group Attachments */ +/* @group Modal dialog box + * + * The contents of the popup dialog on the views edit form. + */ -.views-displays .secondary { - text-align: left; /* LTR */ +.filterable-option .form-item.form-type-checkbox { + /* This selector is aggressive because Seven's reset for .form-items is aggressive. */ + padding-bottom: 4px; + padding-left: 4px; + padding-top: 4px; } -.views-displays .secondary > li:first-child { - padding-left: 0; +/* @end */ + +/* @group CTools */ + +/* @group Buttons */ + +.ctools-button { + background-image: + -moz-linear-gradient( + -90deg, + #ffffff 0px, + #f9f9f9 100%); + background-image: + -webkit-gradient( + linear, + left top, + left bottom, + color-stop(0.0, rgba(255, 255, 255, 1.0)), + color-stop(1.0, rgba(249, 249, 249, 1.0)) + ); + background-image: + -webkit-linear-gradient( + -90deg, + #ffffff 0px, + #f9f9f9 100%); + background-image: + linear-gradient( + -90deg, + #ffffff 0px, + #f9f9f9 100%); + -moz-border-radius: 11px 11px 11px 11px; + -webkit-border-radius: 11px 11px 11px 11px; + border-radius: 11px 11px 11px 11px; +} + +.ctools-button:hover { + background-image: + -moz-linear-gradient( + -90deg, + #ffffff 0px, + #f1f1f1 100%); + background-image: + -webkit-gradient( + linear, + left top, + left bottom, + color-stop(0.0, rgba(255, 255, 255, 1.0)), + color-stop(1.0, rgba(241, 241, 241, 1.0)) + ); + background-image: + -webkit-linear-gradient( + -90deg, + #ffffff 0px, + #f1f1f1 100%); + background-image: + linear-gradient( + -90deg, + #ffffff 0px, + #f1f1f1 100%); +} + +.ctools-dropbutton.open:hover { + background-image: + -moz-linear-gradient( + -90deg, + #ffffff 0px, + #f9f9f9 100%); + background-image: + -webkit-gradient( + linear, + left top, + left bottom, + color-stop(0.0, rgba(255, 255, 255, 1.0)), + color-stop(1.0, rgba(249, 249, 249, 1.0)) + ); + background-image: + -webkit-linear-gradient( + -90deg, + #ffffff 0px, + #f9f9f9 100%); + background-image: + linear-gradient( + -90deg, + #ffffff 0px, + #f9f9f9 100%); +} + +.ctools-dropbutton.open { + -moz-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); + -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,0.25); + box-shadow: 1px 1px 2px rgba(0,0,0,0.25); +} + +/* @end */ + +/* @group Collapsible */ + +.ctools-toggle { + margin-top: 0.6667em; } +.ctools-toggle.ctools-toggle-collapsed { + margin-top: 0.5em; +} + +.views-display-settings .ctools-toggle { + color: #008BCB; +} + +.views-display-column > .ctools-toggle { + margin-top: 14px; +} + +.views-display-column > .ctools-toggle.ctools-toggle-collapsed { + margin-top: 12px; +} + +.views-display-column > .ctools-collapsible-handle { + color: #008BCB; +} + +.views-ui-display-tab-actions .ctools-button input { + color: #0074BD; +} + +/* @end */ + /* @end */ diff --git a/css/views-admin.theme.css b/css/views-admin.theme.css index b4121dc..249d047 100644 --- a/css/views-admin.theme.css +++ b/css/views-admin.theme.css @@ -191,10 +191,15 @@ input.form-radio { } .views-admin fieldset fieldset.container-inline { - margin-top: 6px; + margin-bottom: 1em; + margin-top: 1em; padding-top: 0; } +.views-admin fieldset fieldset.container-inline > .fieldset-wrapper { + padding-bottom: 0; +} + /* Indent form elements so they're directly underneath the label of the checkbox that reveals them */ .views-admin .form-type-checkbox + .form-wrapper { margin-left: 16px; /* LTR */ @@ -431,14 +436,10 @@ td.group-title { */ .views-displays .secondary a { - background-color: #f1f1f1; border: 1px solid #cbcbcb; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; - color: #008BCB; display: inline-block; - padding: 2px 7px 3px; + line-height: 1.3333; + padding: 3px 7px; } .views-displays .secondary a:focus { @@ -449,19 +450,17 @@ td.group-title { .views-displays .secondary .active a { background-color: #666666; color: #ffffff; + border-bottom-width: 1px; } .views-displays .secondary .open > a { - -moz-border-radius: 7px 7px 0 0; - -webkit-border-radius: 7px 7px 0 0; - border-radius: 7px 7px 0 0; + background-color: #f1f1f1; border-bottom: 1px solid transparent; position: relative; } .views-displays .secondary .open > a:hover { background-color: #f1f1f1; - color: #008BCB; } .views-displays .secondary .action-list li { @@ -473,9 +472,6 @@ td.group-title { } .views-displays .secondary .action-list li:first-child { - -moz-border-radius: 0 7px 0 0; - -webkit-border-radius: 0 7px 0 0; - border-radius: 0 7px 0 0; border-width: 1px 1px 0; } @@ -484,19 +480,12 @@ td.group-title { } .views-displays .secondary .action-list li:last-child { - -moz-border-radius: 0 0 7px 7px; - -webkit-border-radius: 0 0 7px 7px; - border-radius: 0 0 7px 7px; border-width: 0 1px 1px; } .views-displays .secondary .action-list input.form-submit { background: none repeat scroll 0 0 transparent; border: medium none; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; - color: #008BCB; padding: 0; } @@ -514,7 +503,6 @@ td.group-title { } #edit-display-settings-title { - color: #008BCB; font-size: 14px; line-height: 1.5; margin: 0; @@ -614,6 +602,7 @@ td.group-title { .views-ui-display-tab-bucket h3 { font-size: 12px; text-transform: uppercase; + margin: 0; } .views-ui-display-tab-bucket .links.actions { @@ -752,21 +741,26 @@ td.group-title { padding-top: 2.5em; } -div.views-filterable-options .form-type-checkbox { +.views-filterable-options .form-type-checkbox { border: 1px solid #CCC; padding: 5px 8px; border-top: none; } -div.views-filterable-options { +.views-filterable-options { border-top: 1px solid #CCC; } -div.views-filterable-options .even .form-type-checkbox { +.views-filterable-options .even .form-type-checkbox { background-color: #F3F4EE; } -div.views-filterable-options .form-type-checkbox .description { +.filterable-option .form-item { + margin-bottom: 0; + margin-top: 0; +} + +.views-filterable-options .form-type-checkbox .description { margin-top: 0; margin-bottom: 0; } @@ -832,12 +826,17 @@ div.views-filterable-options .form-type-checkbox .description { padding: 8px 13px; } +.views-ui-dialog fieldset .item-list { + padding-left: 2em; +} + .views-ui-dialog .form-buttons { background-color: #F3F4EE; padding: 8px 13px; } .views-ui-dialog .form-buttons input { margin-bottom: 0; + margin-right: 0; } /* @end */ -- 1.7.3.4 From fff247740333c2e4667d2eaaf578d277c58d27f9 Mon Sep 17 00:00:00 2001 From: Jesse Beach Date: Thu, 24 Mar 2011 11:18:21 -0400 Subject: [PATCH 2/2] Responding to merlinofchaos' comments in http://drupal.org/node/1098052#comment-4252346 --- css/views-admin.css | 6 ++++++ css/views-admin.ctools.css | 10 ++++++++++ css/views-admin.seven.css | 17 +++++++++++++++-- css/views-admin.theme.css | 8 ++++---- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/css/views-admin.css b/css/views-admin.css index 241a05f..55ac294 100644 --- a/css/views-admin.css +++ b/css/views-admin.css @@ -15,6 +15,12 @@ padding-start: 0; } +.views-admin pre { + margin-bottom: 0; + margin-top: 0; + white-space: pre-wrap; +} + /* @end */ /* @group Inline lists */ diff --git a/css/views-admin.ctools.css b/css/views-admin.ctools.css index 8d94193..094ede6 100644 --- a/css/views-admin.ctools.css +++ b/css/views-admin.ctools.css @@ -192,6 +192,16 @@ /* @group Export */ +/* Override for filter button on the views list screen */ +#ctools-export-ui-list-form .form-submit { + margin-top: 0em !important; + margin-right: 0em; +} + +.ctools-export-ui-row + .ctools-export-ui-row { + margin-top: 1em; +} + .ctools-export-ui-fourth-row input { margin-top: 5px !important; } diff --git a/css/views-admin.seven.css b/css/views-admin.seven.css index 8faa80b..640c672 100644 --- a/css/views-admin.seven.css +++ b/css/views-admin.seven.css @@ -81,8 +81,7 @@ fieldset.fieldset-no-legend { /* Override for filter button on the views list screen */ #ctools-export-ui-list-form .form-submit { - margin-top: 0em; - margin-right: 0em; + margin-bottom: 0; } #ctools-export-ui-list-form .ctools-export-ui-first-row .form-item { @@ -290,6 +289,11 @@ table th { * These are the individual "buckets," or boxes, inside the display settings area */ +.views-ui-display-tab-bucket h3 { + font-size: 12px; + text-transform: uppercase; +} + .views-ui-display-tab-bucket .links { padding: 2px 6px 4px; } @@ -334,6 +338,15 @@ table th { /* @end */ +/* @group Live preview elements */ + +.views-query-info pre { + margin-bottom: 0; + margin-top: 0; +} + +/* @end */ + /* @group Add view */ .form-item-page-create, diff --git a/css/views-admin.theme.css b/css/views-admin.theme.css index 249d047..1b46d2c 100644 --- a/css/views-admin.theme.css +++ b/css/views-admin.theme.css @@ -176,8 +176,8 @@ input.form-radio { vertical-align: baseline; } -.form-submit + .form-submit, -.views-admin a.button + a.button { +.form-submit:not(.js-hide) + .form-submit, +.views-admin a.button:not(.js-hide) + a.button { margin-left: 1em; /* LTR */ } @@ -600,8 +600,7 @@ td.group-title { } .views-ui-display-tab-bucket h3 { - font-size: 12px; - text-transform: uppercase; + font-size: small; margin: 0; } @@ -730,6 +729,7 @@ td.group-title { */ .views-ui-dialog { + font-size: small; padding: 0; } -- 1.7.3.4