From 3049c3b7edfb213408e906a5d1583fe96b80dde9 Mon Sep 17 00:00:00 2001 From: Meghan P Date: Thu, 1 Nov 2012 23:17:17 -0700 Subject: [PATCH 1/3] Move CSS styles into themes. --- .../views/views_ui/css/views-admin.bartik-rtl.css | 21 -- .../views/views_ui/css/views-admin.bartik.css | 122 ------- .../views/views_ui/css/views-admin.seven-rtl.css | 43 --- .../views/views_ui/css/views-admin.seven.css | 376 -------------------- core/themes/bartik/css/style-rtl.css | 19 + core/themes/bartik/css/style.css | 120 +++++++ core/themes/seven/style-rtl.css | 41 +++ core/themes/seven/style.css | 376 ++++++++++++++++++++ 8 files changed, 556 insertions(+), 562 deletions(-) delete mode 100644 core/modules/views/views_ui/css/views-admin.bartik-rtl.css delete mode 100644 core/modules/views/views_ui/css/views-admin.bartik.css delete mode 100644 core/modules/views/views_ui/css/views-admin.seven-rtl.css delete mode 100644 core/modules/views/views_ui/css/views-admin.seven.css diff --git a/core/modules/views/views_ui/css/views-admin.bartik-rtl.css b/core/modules/views/views_ui/css/views-admin.bartik-rtl.css deleted file mode 100644 index db382d5..0000000 --- a/core/modules/views/views_ui/css/views-admin.bartik-rtl.css +++ /dev/null @@ -1,21 +0,0 @@ -/** - * The .bartik.css file is intended to contain styles that override declarations - * in the Bartik theme. - */ - - /* @group Lists */ - -.views-display-top .secondary .action-list { - padding-left: inherit; - padding-right: 0; -} - -/* @end */ - -/* @group Collapsible */ - -.views-display-columns fieldset .fieldset-legend { - padding: 0 2px 4px 0; -} - -/* @end */ diff --git a/core/modules/views/views_ui/css/views-admin.bartik.css b/core/modules/views/views_ui/css/views-admin.bartik.css deleted file mode 100644 index c05e0ef..0000000 --- a/core/modules/views/views_ui/css/views-admin.bartik.css +++ /dev/null @@ -1,122 +0,0 @@ -/** - * The .bartik.css file is intended to contain styles that override declarations - * 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 - */ - -.views-displays .region-content .secondary, -.views-displays .region-content .secondary { - padding-bottom: 0; - padding-left: 0; -} - -.views-displays .secondary a { - font-size: smaller; -} - -.views-displays .secondary > li a { - border-radius: 5px; -} - -.views-displays .secondary > li.open a { - border-radius: 5px 5px 0 0; -} - -.views-displays .secondary .open > a:hover { - color: #0071B3; -} - -.views-displays .secondary input.form-submit { - font-size: smaller; -} - -/* @end */ - -/* @group Modal dialog box - * - * The contents of the popup dialog on the views edit form. - */ - -.views-filterable-options .even .form-type-checkbox { - background-color: #F9F9F9; -} - -.views-ui-dialog .ui-dialog-titlebar-close, -.views-ui-dialog #views-ajax-title, -.views-ui-dialog .views-override, -.views-ui-dialog .form-buttons { - background-color: #f6f6f6; -} - -.views-ui-dialog a { - color: #0071b3; -} - -.views-ui-dialog a:hover, -.views-ui-dialog a:focus { - color: #018fe2; -} - -/* @end */ - -.views-display-column .fieldset-wrapper { - margin-top: 0; -} - -.views-display-column fieldset legend { - background: none; - border: none; - font-family: inherit; - font-size: 13px; - line-height: inherit; - position: relative; - text-indent: 0; - text-shadow: none; - top: 3px; -} - -.views-display-columns fieldset { - position: inherit; -} - -.views-display-columns fieldset .fieldset-legend { - padding: 0 0 4px 2px; /* LTR */ -} - -.views-display-columns a.fieldset-title { - color: #0071B3; -} - -.views-display-columns a.fieldset-title:hover { - color: #018FE2; -} - -/* @group Dropbutton */ - -.views-ui-display-tab-actions .dropbutton input { - color: #0071B3; -} - -.views-ui-display-tab-actions .dropbutton input:hover, -.views-ui-display-tab-actions .dropbutton input:focus { - color: #018FE2; -} - -.views-ui-display-tab-actions .dropbutton input.form-submit { - margin-right: 0; - margin-top: 0; -} - -/* @end */ diff --git a/core/modules/views/views_ui/css/views-admin.seven-rtl.css b/core/modules/views/views_ui/css/views-admin.seven-rtl.css deleted file mode 100644 index abdd5aa..0000000 --- a/core/modules/views/views_ui/css/views-admin.seven-rtl.css +++ /dev/null @@ -1,43 +0,0 @@ -/** - * The .seven.css file is intended to contain styles that override declarations - * in the Seven admin theme. - */ - -/* @group Forms */ - -.views-admin .form-submit, -.views-admin a.button { - margin-left: 0; -} - -/* @end */ - -/* @group Lists */ - -.views-admin .links li { - padding-left: 0; -} - -/* @end */ - -/* @group Attachments */ - -.views-displays .secondary { - text-align: right; -} - -/* @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/core/modules/views/views_ui/css/views-admin.seven.css b/core/modules/views/views_ui/css/views-admin.seven.css deleted file mode 100644 index 6b57ca2..0000000 --- a/core/modules/views/views_ui/css/views-admin.seven.css +++ /dev/null @@ -1,376 +0,0 @@ -/** - * The .seven.css file is intended to contain styles that override declarations - * in the Seven admin theme. - */ - -/* @group Content */ - -.views-ui-display-tab-bucket h1, -.views-ui-display-tab-bucket h2, -.views-ui-display-tab-bucket h3, -.views-ui-display-tab-bucket h4, -.views-ui-display-tab-bucket h5 { - margin-bottom: 0; - margin-top: 0; -} - -/* @end */ - -/* @group Forms */ - -.views-ui-dialog fieldset { - padding-top: 2.5em; -} - -fieldset fieldset { - border: medium none; -} - -/** - * Seven positions the legend absolutely, but does not have a way to ignore - * fieldsets without a legend so we make one up. - */ -fieldset.fieldset-no-legend { - padding-top: 0; -} - -/** - * Being extra safe here and scoping this to the add view wizard form (where - * a layout problem occurs for the Display format fieldset if we don't fix its - * padding), but it's probably safe to just let it apply everywhere. - */ -#views-ui-add-form fieldset fieldset .fieldset-wrapper { - padding-left: 0; - padding-right: 0; -} - -.views-display-tab fieldset.box-padding .fieldset-wrapper { - padding: 0; -} - -.views-admin .form-item label.option, -#views-ui-preview-form .form-item label.option { - font-size: 1em; -} - -#views-ui-preview-form .form-submit { - margin-top: 3px; -} - -.views-admin input.form-submit, -.views-ui-dialog input.form-submit, -.views-admin a.button, -.views-ui-dialog a.button { - margin-bottom: 0; - margin-right: 0; /* LTR */ - margin-top: 0; -} - -/* Override for a button on the edit display screen */ -#edit-displays-preview-controls .form-submit { - display: inline-block; - margin-right: 1em; -} - -.form-item, -.form-item .form-item { - margin-bottom: 0; - margin-top: 9px; - padding-bottom: 0; - padding-top: 0; -} - -.form-actions { - margin-bottom: 0; - margin-top: 0; -} - -.form-item .form-item { - padding-bottom: 0; - padding-top: 0; -} - -.form-radios > .form-item { - margin-top: 3px; -} - -/* @group Dependent options - */ - -/* This is necessary to supercede the Seven .form-item - * reset declaration that sets the margin to zero. - */ -.form-item-options-expose-required, -.form-item-options-expose-label, -.form-item-options-expose-description { - margin-left: 1.5em; -} - -.views-admin-dependent .form-item .form-item, -.views-admin-dependent .form-type-checkboxes, -.views-admin-dependent .form-type-radios, -.views-admin-dependent .form-item .form-item, -.form-item-options-expose-required, -.form-item-options-expose-label, -.form-item-options-expose-description { - margin-bottom: 6px; - margin-top: 6px; -} - -.views-admin-dependent .form-type-radio, -.views-admin-dependent .form-radios .form-item { - margin-bottom: 2px; - margin-top: 2px; -} - -/* @end */ - -/* @group Lists */ - -.views-admin ul.secondary, -.views-admin .item-list ul { - margin: 0; - padding: 0; -} - -.views-admin ul.secondary { - clear: none; -} - -.views-displays ul.secondary li a, -.views-displays ul.secondary li.active a, -.views-displays ul.secondary li.active a.active { - padding: 2px 7px 3px; -} - -.views-displays ul.secondary li.active a, -.views-displays ul.secondary li.active a.active { - border: 1px solid transparent; -} - -.views-admin .links li { - padding-right: 0; /* LTR */ -} - -.views-admin .button .links li { - padding-right: 12px; /* LTR */ -} - -.page-admin-structure-views #content ul.action-links { - padding-left: 0; - padding-right: 0; -} - -.views-display-top ul.secondary { - background-color: transparent; - float: left -} - -.views-display-top .secondary .action-list li { - float: none; - margin: 0; -} - -/* @end */ - -/* @group Tables */ - -table td, -table th { - vertical-align: top; -} - -/* @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; - 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 - */ - -.views-ui-display-tab-bucket h3 { - font-size: 12px; - text-transform: uppercase; -} - -.views-ui-display-tab-bucket .links { - padding: 2px 6px 4px; -} - -.views-ui-display-tab-bucket .links li + li { - margin-left: 3px; -} - -/* @end */ - -/* @group Rearrange filter criteria */ - -#views-ui-rearrange-filter-form .action-links { - margin: 0; - padding: 0; -} - -#views-ui-rearrange-filter-form table { - border: medium none; -} - -#views-ui-rearrange-filter-form [id^="views-row"] { - border: medium none; -} - -#views-ui-rearrange-filter-form tr td:last-child { - border-right: medium none; -} - -#views-ui-rearrange-filter-form .filter-group-operator-row { - border-left: 1px solid transparent !important; - border-right: 1px solid transparent !important; -} - -#views-ui-rearrange-filter-form tr.drag td { - background-color: #FFEE77 !important; -} - -#views-ui-rearrange-filter-form tr.drag-previous td { - background-color: #FFFFBB !important; -} - -/* @end */ - -/* @group Live preview elements */ - -.views-query-info pre { - margin-bottom: 0; - margin-top: 0; -} - -/* @group Query info table */ - -.views-query-info table { - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; - -webkit-border-horizontal-spacing: 1px; - -webkit-border-vertical-spacing: 1px; -} - -.views-query-info table tr td:last-child { - /* Fixes a Seven style that bleeds down into this table unnecessarily */ - border-right: 0 none; -} - -/* @end */ - -/* @end */ - -/* @group Add view */ - -.form-item-page-create, -.form-item-block-create { - margin-top: 13px; -} - -/* @end */ - -/* @group Modal dialog box - * - * The contents of the popup dialog on the views edit form. - */ - -.views-ui-dialog .ui-dialog-titlebar-close { - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; - border-color: #cccccc; - right: -27px; - top: -1px; -} - -.views-ui-dialog fieldset.collapsible { - padding-top: 1.5em; -} - -.views-ui-dialog fieldset.collapsed { - padding-top: 2.5em; -} - -.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; -} - -/* @end */ - -.views-ui-display-tab-actions .dropbutton-wrapper input { - color: #0074BD; -} - -/* @end */ diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css index 90638eb..703a8f8 100644 --- a/core/themes/bartik/css/style-rtl.css +++ b/core/themes/bartik/css/style-rtl.css @@ -279,3 +279,22 @@ ul.action-links li a { right: -20px; left: 0; } + +/* ---------- Views styling ---------- */ + + /* @group Lists */ + +.views-display-top .secondary .action-list { + padding-left: inherit; + padding-right: 0; +} + +/* @end */ + +/* @group Collapsible */ + +.views-display-columns fieldset .fieldset-legend { + padding: 0 2px 4px 0; +} + +/* @end */ diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index f0e244c..29152bb 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -1738,3 +1738,123 @@ div.admin-panel .description { display: none; } } + +/* ---------- Views styling ---------- */ + +/* @group Lists */ + +.views-display-top .secondary .action-list { + padding-left: 0; /* LTR */ +} + +/* @end */ + +/* @group Attachment details tabs + * + * The tabs that switch between sections + */ + +.views-displays .region-content .secondary, +.views-displays .region-content .secondary { + padding-bottom: 0; + padding-left: 0; +} + +.views-displays .secondary a { + font-size: smaller; +} + +.views-displays .secondary > li a { + border-radius: 5px; +} + +.views-displays .secondary > li.open a { + border-radius: 5px 5px 0 0; +} + +.views-displays .secondary .open > a:hover { + color: #0071B3; +} + +.views-displays .secondary input.form-submit { + font-size: smaller; +} + +/* @end */ + +/* @group Modal dialog box + * + * The contents of the popup dialog on the views edit form. + */ + +.views-filterable-options .even .form-type-checkbox { + background-color: #F9F9F9; +} + +.views-ui-dialog .ui-dialog-titlebar-close, +.views-ui-dialog #views-ajax-title, +.views-ui-dialog .views-override, +.views-ui-dialog .form-buttons { + background-color: #f6f6f6; +} + +.views-ui-dialog a { + color: #0071b3; +} + +.views-ui-dialog a:hover, +.views-ui-dialog a:focus { + color: #018fe2; +} + +/* @end */ + +.views-display-column .fieldset-wrapper { + margin-top: 0; +} + +.views-display-column fieldset legend { + background: none; + border: none; + font-family: inherit; + font-size: 13px; + line-height: inherit; + position: relative; + text-indent: 0; + text-shadow: none; + top: 3px; +} + +.views-display-columns fieldset { + position: inherit; +} + +.views-display-columns fieldset .fieldset-legend { + padding: 0 0 4px 2px; /* LTR */ +} + +.views-display-columns a.fieldset-title { + color: #0071B3; +} + +.views-display-columns a.fieldset-title:hover { + color: #018FE2; +} + +/* @group Dropbutton */ + +.views-ui-display-tab-actions .dropbutton input { + color: #0071B3; +} + +.views-ui-display-tab-actions .dropbutton input:hover, +.views-ui-display-tab-actions .dropbutton input:focus { + color: #018FE2; +} + +.views-ui-display-tab-actions .dropbutton input.form-submit { + margin-right: 0; + margin-top: 0; +} + +/* @end */ diff --git a/core/themes/seven/style-rtl.css b/core/themes/seven/style-rtl.css index 788aa36..6ead7c2 100644 --- a/core/themes/seven/style-rtl.css +++ b/core/themes/seven/style-rtl.css @@ -209,3 +209,44 @@ div.add-or-remove-shortcuts { #user-login-form .openid-links .user-link { margin-right: 1.5em; } +/** + * Views styling + */ + /* @group Forms */ + +.views-admin .form-submit, +.views-admin a.button { + margin-left: 0; +} + +/* @end */ + +/* @group Lists */ + +.views-admin .links li { + padding-left: 0; +} + +/* @end */ + +/* @group Attachments */ + +.views-displays .secondary { + text-align: right; +} + +/* @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/core/themes/seven/style.css b/core/themes/seven/style.css index 3b5776a..660d6d4 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -1081,3 +1081,379 @@ div.add-or-remove-shortcuts { color: #fff; border-radius: 8px; } + +/** + * Views styling + */ + +/* @group Content */ + +.views-ui-display-tab-bucket h1, +.views-ui-display-tab-bucket h2, +.views-ui-display-tab-bucket h3, +.views-ui-display-tab-bucket h4, +.views-ui-display-tab-bucket h5 { + margin-bottom: 0; + margin-top: 0; +} + +/* @end */ + +/* @group Forms */ + +.views-ui-dialog fieldset { + padding-top: 2.5em; +} + +fieldset fieldset { + border: medium none; +} + +/** + * Seven positions the legend absolutely, but does not have a way to ignore + * fieldsets without a legend so we make one up. + */ +fieldset.fieldset-no-legend { + padding-top: 0; +} + +/** + * Being extra safe here and scoping this to the add view wizard form (where + * a layout problem occurs for the Display format fieldset if we don't fix its + * padding), but it's probably safe to just let it apply everywhere. + */ +#views-ui-add-form fieldset fieldset .fieldset-wrapper { + padding-left: 0; + padding-right: 0; +} + +.views-display-tab fieldset.box-padding .fieldset-wrapper { + padding: 0; +} + +.views-admin .form-item label.option, +#views-ui-preview-form .form-item label.option { + font-size: 1em; +} + +#views-ui-preview-form .form-submit { + margin-top: 3px; +} + +.views-admin input.form-submit, +.views-ui-dialog input.form-submit, +.views-admin a.button, +.views-ui-dialog a.button { + margin-bottom: 0; + margin-right: 0; /* LTR */ + margin-top: 0; +} + +/* Override for a button on the edit display screen */ +#edit-displays-preview-controls .form-submit { + display: inline-block; + margin-right: 1em; +} + +.form-item, +.form-item .form-item { + margin-bottom: 0; + margin-top: 9px; + padding-bottom: 0; + padding-top: 0; +} + +.form-actions { + margin-bottom: 0; + margin-top: 0; +} + +.form-item .form-item { + padding-bottom: 0; + padding-top: 0; +} + +.form-radios > .form-item { + margin-top: 3px; +} + +/* @group Dependent options + */ + +/* This is necessary to supercede the Seven .form-item + * reset declaration that sets the margin to zero. + */ +.form-item-options-expose-required, +.form-item-options-expose-label, +.form-item-options-expose-description { + margin-left: 1.5em; +} + +.views-admin-dependent .form-item .form-item, +.views-admin-dependent .form-type-checkboxes, +.views-admin-dependent .form-type-radios, +.views-admin-dependent .form-item .form-item, +.form-item-options-expose-required, +.form-item-options-expose-label, +.form-item-options-expose-description { + margin-bottom: 6px; + margin-top: 6px; +} + +.views-admin-dependent .form-type-radio, +.views-admin-dependent .form-radios .form-item { + margin-bottom: 2px; + margin-top: 2px; +} + +/* @end */ + +/* @group Lists */ + +.views-admin ul.secondary, +.views-admin .item-list ul { + margin: 0; + padding: 0; +} + +.views-admin ul.secondary { + clear: none; +} + +.views-displays ul.secondary li a, +.views-displays ul.secondary li.active a, +.views-displays ul.secondary li.active a.active { + padding: 2px 7px 3px; +} + +.views-displays ul.secondary li.active a, +.views-displays ul.secondary li.active a.active { + border: 1px solid transparent; +} + +.views-admin .links li { + padding-right: 0; /* LTR */ +} + +.views-admin .button .links li { + padding-right: 12px; /* LTR */ +} + +.page-admin-structure-views #content ul.action-links { + padding-left: 0; + padding-right: 0; +} + +.views-display-top ul.secondary { + background-color: transparent; + float: left +} + +.views-display-top .secondary .action-list li { + float: none; + margin: 0; +} + +/* @end */ + +/* @group Tables */ + +table td, +table th { + vertical-align: top; +} + +/* @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; + 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 + */ + +.views-ui-display-tab-bucket h3 { + font-size: 12px; + text-transform: uppercase; +} + +.views-ui-display-tab-bucket .links { + padding: 2px 6px 4px; +} + +.views-ui-display-tab-bucket .links li + li { + margin-left: 3px; +} + +/* @end */ + +/* @group Rearrange filter criteria */ + +#views-ui-rearrange-filter-form .action-links { + margin: 0; + padding: 0; +} + +#views-ui-rearrange-filter-form table { + border: medium none; +} + +#views-ui-rearrange-filter-form [id^="views-row"] { + border: medium none; +} + +#views-ui-rearrange-filter-form tr td:last-child { + border-right: medium none; +} + +#views-ui-rearrange-filter-form .filter-group-operator-row { + border-left: 1px solid transparent !important; + border-right: 1px solid transparent !important; +} + +#views-ui-rearrange-filter-form tr.drag td { + background-color: #FFEE77 !important; +} + +#views-ui-rearrange-filter-form tr.drag-previous td { + background-color: #FFFFBB !important; +} + +/* @end */ + +/* @group Live preview elements */ + +.views-query-info pre { + margin-bottom: 0; + margin-top: 0; +} + +/* @group Query info table */ + +.views-query-info table { + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + -webkit-border-horizontal-spacing: 1px; + -webkit-border-vertical-spacing: 1px; +} + +.views-query-info table tr td:last-child { + /* Fixes a Seven style that bleeds down into this table unnecessarily */ + border-right: 0 none; +} + +/* @end */ + +/* @end */ + +/* @group Add view */ + +.form-item-page-create, +.form-item-block-create { + margin-top: 13px; +} + +/* @end */ + +/* @group Modal dialog box + * + * The contents of the popup dialog on the views edit form. + */ + +.views-ui-dialog .ui-dialog-titlebar-close { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + border-color: #cccccc; + right: -27px; + top: -1px; +} + +.views-ui-dialog fieldset.collapsible { + padding-top: 1.5em; +} + +.views-ui-dialog fieldset.collapsed { + padding-top: 2.5em; +} + +.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; +} + +/* @end */ + +.views-ui-display-tab-actions .dropbutton-wrapper input { + color: #0074BD; +} + +/* @end */ -- 1.7.10.2 (Apple Git-33) From 50cf3cdac7dec0f4f07291f4009558b8b57b485e Mon Sep 17 00:00:00 2001 From: Meghan P Date: Thu, 1 Nov 2012 23:30:12 -0700 Subject: [PATCH 2/3] Clean up the views CSS added to Seven. --- core/themes/seven/style.css | 75 +++---------------------------------------- 1 file changed, 4 insertions(+), 71 deletions(-) diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 660d6d4..2311fa5 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -1057,9 +1057,7 @@ div.add-or-remove-shortcuts { .dropbutton-multiple.open .dropbutton-content li:first-child > * { text-overflow: clip; } -.dropbutton-arrow { - right: 35%; -} + /* Disable overlay message */ #overlay-disable-message { background-color: #addafc; @@ -1086,25 +1084,8 @@ div.add-or-remove-shortcuts { * Views styling */ -/* @group Content */ - -.views-ui-display-tab-bucket h1, -.views-ui-display-tab-bucket h2, -.views-ui-display-tab-bucket h3, -.views-ui-display-tab-bucket h4, -.views-ui-display-tab-bucket h5 { - margin-bottom: 0; - margin-top: 0; -} - -/* @end */ - /* @group Forms */ -.views-ui-dialog fieldset { - padding-top: 2.5em; -} - fieldset fieldset { border: medium none; } @@ -1155,24 +1136,6 @@ fieldset.fieldset-no-legend { margin-right: 1em; } -.form-item, -.form-item .form-item { - margin-bottom: 0; - margin-top: 9px; - padding-bottom: 0; - padding-top: 0; -} - -.form-actions { - margin-bottom: 0; - margin-top: 0; -} - -.form-item .form-item { - padding-bottom: 0; - padding-top: 0; -} - .form-radios > .form-item { margin-top: 3px; } @@ -1216,10 +1179,6 @@ fieldset.fieldset-no-legend { padding: 0; } -.views-admin ul.secondary { - clear: none; -} - .views-displays ul.secondary li a, .views-displays ul.secondary li.active a, .views-displays ul.secondary li.active a.active { @@ -1239,11 +1198,6 @@ fieldset.fieldset-no-legend { padding-right: 12px; /* LTR */ } -.page-admin-structure-views #content ul.action-links { - padding-left: 0; - padding-right: 0; -} - .views-display-top ul.secondary { background-color: transparent; float: left @@ -1258,8 +1212,8 @@ fieldset.fieldset-no-legend { /* @group Tables */ -table td, -table th { +.views-ui-rearrange-filter-form table td, +.views-ui-rearrange-filter-form table th { vertical-align: top; } @@ -1282,17 +1236,11 @@ table th { 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; - border-radius: 7px; color: #008BCB; } @@ -1323,13 +1271,6 @@ table th { 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 @@ -1435,14 +1376,10 @@ table th { top: -1px; } -.views-ui-dialog fieldset.collapsible { +.views-ui-dialog fieldset.collapsible:not(.collapsed) { padding-top: 1.5em; } -.views-ui-dialog fieldset.collapsed { - padding-top: 2.5em; -} - .filterable-option .form-item.form-type-checkbox { /* This selector is aggressive because Seven's reset for .form-items is aggressive. */ padding-bottom: 4px; @@ -1452,8 +1389,4 @@ table th { /* @end */ -.views-ui-display-tab-actions .dropbutton-wrapper input { - color: #0074BD; -} - /* @end */ -- 1.7.10.2 (Apple Git-33) From edebb0661bf8af1a9e1ecfa9e5bf8a8f79a2510c Mon Sep 17 00:00:00 2001 From: Meghan P Date: Thu, 1 Nov 2012 23:41:00 -0700 Subject: [PATCH 3/3] remove PHP code. --- .../lib/Drupal/views_ui/ViewFormControllerBase.php | 26 -------------------- 1 file changed, 26 deletions(-) diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php index aae0052..3683875 100644 --- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php +++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php @@ -61,32 +61,6 @@ public static function getAdminCSS() { $list[$module_path . '/css/views-admin.css'] = array(); $list[$module_path . '/css/views-admin.theme.css'] = array(); - // Add in any theme specific CSS files we have - $themes = list_themes(); - $theme_key = $GLOBALS['theme']; - while ($theme_key) { - // Try to find the admin css file for non-core themes. - if (!in_array($theme_key, array('seven', 'bartik'))) { - $theme_path = drupal_get_path('theme', $theme_key); - // First search in the css directory, then in the root folder of the theme. - if (file_exists($theme_path . "/css/views-admin.$theme_key.css")) { - $list[$theme_path . "/css/views-admin.$theme_key.css"] = array( - 'group' => CSS_THEME, - ); - } - elseif (file_exists($theme_path . "/views-admin.$theme_key.css")) { - $list[$theme_path . "/views-admin.$theme_key.css"] = array( - 'group' => CSS_THEME, - ); - } - } - else { - $list[$module_path . "/css/views-admin.$theme_key.css"] = array( - 'group' => CSS_THEME, - ); - } - $theme_key = isset($themes[$theme_key]->base_theme) ? $themes[$theme_key]->base_theme : ''; - } if (module_exists('contextual')) { $list[$module_path . '/css/views-admin.contextual.css'] = array(); } -- 1.7.10.2 (Apple Git-33)