diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/admin_wind/css/screen.css | 134 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 130 | ||||
| -rw-r--r-- | themes/wind/views/no_sidebar.html.php | 9 |
3 files changed, 38 insertions, 235 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index f23472b8..3573df57 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -5,13 +5,12 @@ * * Sheet organization: * 1) Basic HTML elements - * 3) Reusable content blocks - * 4) Page layout containers - * 5) Content blocks in specific layout containers - * 6) Navigation and menus - * 7) Browser hacks - * 8) jQuery and jQuery UI - * 9) Right-to-left language styles + * 2) Reusable content blocks + * 3) Page layout containers + * 4) Content blocks in specific layout containers + * 5) Navigation and menus + * 6) jQuery and jQuery UI + * 7) Right-to-left language styles */ /** ******************************************************************* @@ -219,21 +218,15 @@ li.g-error select { } /** ******************************************************************* - * 3) Reusable content blocks + * 2) Reusable content blocks *********************************************************************/ .g-block { background-color: #fff; border: 1px solid #ccc; - clear: both; - margin-bottom: 2.5em; padding: 1em; } -#g-sidebar .g-block-content { - padding: 0; -} - .g-block h2 { background-color: #e8e8e8; padding: .3em .8em; @@ -243,6 +236,10 @@ li.g-error select { margin-top: 1em; } +#g-sidebar .g-block-content { + padding: 0; +} + .g-selected img, .g-available .g-block img { float: left; @@ -276,53 +273,6 @@ li.g-error select { opacity: 0.4; } -/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-action-status { - width: 100%; -} - -#g-site-status li, -#g-action-status li, -.g-module-status { - border: 1px solid #ccc; - margin-bottom: .4em; -} - -#g-site-status li { - margin-bottom: 0; - border: none; - border-bottom: 1px solid #ccc; -} - -.g-module-status { - clear: both; - margin-bottom: 1em; -} - -.g-error, -.g-info, -.g-success, -.g-warning { - padding: .4em .5em .4em 30px; -} - -.g-error, tr.g-error td.g-error { - background: #f6cbca url('../../../lib/images/ico-error.png') no-repeat .4em 50%; -} - -.g-info { - background: #e8e8e8 url('../../../lib/images/ico-info.png') no-repeat .4em 50%; -} - -.g-success { - background: #d9efc2 url('../../../lib/images/ico-success.png') no-repeat .4em 50%; -} - -.g-warning, tr.g-warning td.g-warning { - background: #fcf9ce url('../../../lib/images/ico-warning.png') no-repeat .4em 50%; -} - .g-pager .g-info, tr.g-error, tr.g-info, @@ -368,7 +318,7 @@ tr.g-warning { } /*** ****************************************************************** - * 4) Page layout containers + * 3) Page layout containers *********************************************************************/ /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -413,7 +363,7 @@ tr.g-warning { } /** ******************************************************************* - * 5) Content blocks in specific layout containers + * 4) Content blocks in specific layout containers *********************************************************************/ /* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -563,14 +513,11 @@ tr.g-warning { #g-user-admin-list { margin-bottom: 1em; } + #g-user-admin-list td { vertical-align: bottom; } -#g-user-admin-list .g-draggable:hover { - border: 1px dashed black; -} - #g-user-admin-list .admin { color: #55f; font-weight: bold; @@ -694,28 +641,7 @@ li.g-default-group h4, li.g-default-group .g-user { } /** ******************************************************************* - * 6) Browser hacks - *********************************************************************/ - -#g-site-admin-menu:after, -#g-header:after, -#g-admin-comments-menu:after, -#g-group-admin:after, -.g-selected:after, -.g-available .g-block:after, -#g-module-create-form ul li ul:after, -#g-developer-tools:after, -#g-photo-stream:after, -#g-view-menu:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} - -/** ******************************************************************* - * 7) jQuery and jQuery UI + * 6) jQuery and jQuery UI *********************************************************************/ /* Superfish menu overrides ~~~~~~~~~~~~~~ */ @@ -728,30 +654,6 @@ li.g-default-group h4, li.g-default-group .g-user { background-color: #dfe9ff; } -/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ - -.g-loading-large, -.g-dialog-loading-large { - background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; - font-size: 0; -} - -.g-loading-small { - background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; - font-size: 0; -} - -.g-draggable { - cursor: move; -} - -.g-drop-target { - background-color: #cfdeff; - border: 1px dotted #999; - height: 100px; - margin: 1em 0; -} - /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ #g-panel { @@ -771,6 +673,12 @@ li.g-default-group h4, li.g-default-group .g-user { cursor: move; } +#g-admin-dashboard .ui-state-highlight, +#g-sidebar .ui-state-highlight { + height: 2em; + margin-bottom: 1em; +} + .g-buttonset-vertical a { width: 8em !important; } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index dac6a899..fe1025cc 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -5,13 +5,13 @@ * * Sheet organization: * 1) Basic HTML elements - * 3) Reusable content blocks - * 4) Page layout containers - * 5) Content blocks in specific layout containers - * 6) Navigation and menus - * 7) Browser hacks - * 8) jQuery and jQuery UI - * 9) Right-to-left language styles + * 2) Reusable content blocks + * 3) Page layout containers + * 4) Content blocks in specific layout containers + * 5) Navigation and menus + * 6) Browser hacks + * 7) jQuery and jQuery UI + * 8) Right-to-left language styles */ /** ******************************************************************* @@ -222,14 +222,9 @@ li.g-error select { } /** ******************************************************************* - * 3) Reusable content blocks + * 2) Reusable content blocks *********************************************************************/ -.g-block { - clear: both; - margin-bottom: 2.5em; -} - .g-block h2 { background-color: #e8e8e8; padding: .3em .8em; @@ -241,57 +236,6 @@ li.g-error select { /* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */ -#g-content #g-action-status { - width: 100%; -} - -#g-site-status li, -#g-action-status li, -.g-module-status { - border: 1px solid #ccc; - margin-bottom: .4em; -} - -#g-site-status li { - margin-bottom: 0; - border: none; - border-bottom: 1px solid #ccc; -} - -.g-module-status { - clear: both; - margin-bottom: 1em; -} - -.g-error, -.g-info, -.g-success, -.g-warning { - background-position: .4em 50%; - background-repeat: no-repeat; - padding: .4em .5em .4em 30px; -} - -.g-error { - background-color: #f6cbca; - background-image: url('../../../lib/images/ico-error.png'); -} - -.g-info { - background-color: #e8e8e8; - background-image: url('../../../lib/images/ico-info.png'); -} - -.g-success { - background-color: #d9efc2; - background-image: url('../../../lib/images/ico-success.png'); -} - -.g-warning { - background-color: #fcf9ce; - background-image: url('../../../lib/images/ico-warning.png'); -} - form .g-error, .g-pager .g-info { background-color: #fff !important; @@ -316,7 +260,7 @@ form .g-error, } /*** ****************************************************************** - * 4) Page layout containers + * 3) Page layout containers *********************************************************************/ /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -364,7 +308,7 @@ form .g-error, } /** ******************************************************************* - * 5) Content blocks in specific layout containers + * 4) Content blocks in specific layout containers *********************************************************************/ /* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -455,7 +399,7 @@ form .g-error, #g-content #g-item { position: relative; - width: 99%; + width: 100%; } #g-content #g-photo { @@ -707,22 +651,7 @@ form .g-error, } /** ******************************************************************* - * 6) Browser hacks - *********************************************************************/ - -#g-header:after, -#g-album-grid:after, -.g-pager:after, -#g-view-menu:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} - -/** ******************************************************************* - * 7) jQuery and jQuery UI + * 6) jQuery and jQuery UI *********************************************************************/ /* Superfish menu overrides ~~~~~~~~~~~~~~ */ @@ -735,34 +664,6 @@ form .g-error, background-color: #dfe9ff; } -/* Ajax loading indicator ~~~~~~~~~~~~~~~~ */ - -.g-loading-large { - background: #e8e8e8 url('../../../lib/images/loading-large.gif') no-repeat center center; - font-size: 0; -} - -.g-dialog-loading-large { - background: url('../../../lib/images/loading-large.gif') no-repeat center center !important; - font-size: 0; -} - -.g-loading-small { - background: #e8e8e8 url('../../../lib/images/loading-small.gif') no-repeat center center; - font-size: 0; -} - -.g-draggable { - cursor: move; -} - -.g-drop-target { - background-color: #cfdeff; - border: 1px dotted #999; - height: 100px; - margin: 1em 0; -} - /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ .ui-widget-overlay { @@ -876,13 +777,6 @@ form .g-error, /*************** STUFF THAT NEEDS A HOME ****************/ -.g-progress-bar { - height: 1em; - width: 100%; - margin-top: .5em; - display: inline-block; -} - #g-add-photos #SWFUpload_0 { position: relative; top: -200px; diff --git a/themes/wind/views/no_sidebar.html.php b/themes/wind/views/no_sidebar.html.php index d0d3eba6..378bd971 100644 --- a/themes/wind/views/no_sidebar.html.php +++ b/themes/wind/views/no_sidebar.html.php @@ -1,5 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div class="g-warning"> - <?= t("No active sidebar blocks. <a href=\"%url\">Add blocks</a>", - array("url" => html::mark_clean(url::site("admin/sidebar")))) ?> -</div> +<ul class="g-message-block"> + <li class="g-warning"><?= t("No active sidebar blocks.<br/> + <a href=\"%url\">Add blocks</a>", + array("url" => html::mark_clean(url::site("admin/sidebar")))) ?></li> +</ul> |