diff options
| -rw-r--r-- | lib/gallery.common.css | 62 | ||||
| -rw-r--r-- | themes/admin_wind/css/screen.css | 72 | ||||
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 33 |
4 files changed, 62 insertions, 107 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 93dd56e8..c5adc3ee 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -400,16 +400,11 @@ ul.sf-menu li li li.sfHover ul { left: 12em; } -/* jQuery UI ThemeRoller buttons */ +/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ -/* Rotate icon, themerollower only provides one of these */ - -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; +.ui-widget-overlay { + background: #000; + opacity: .7; } /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -429,6 +424,40 @@ ul.sf-menu li li li.sfHover ul { -moz-outline-style: none; } +/* jQuery UI ThemeRoller buttons ~~~~~~~~~ */ + +.g-buttonset { + padding-left: 1px; +} + +.g-buttonset li { + float: left; +} + +.g-buttonset .g-button { + margin: 0; +} + +.ui-icon-left .ui-icon { + float: left; + margin-right: .2em; +} + +.ui-icon-right .ui-icon { + float: right; + margin-left: .2em; +} + +/* Rotate icon, ThemeRoller only provides one of these */ + +.ui-icon-rotate-ccw { + background-position: -192px -64px; +} + +.ui-icon-rotate-cw { + background-position: -208px -64px; +} + .g-progress-bar { height: 1em; width: 100%; @@ -541,7 +570,11 @@ div#g-action-status { .g-inline li { float: left; - margin-right: .4em; + margin-left: 1em; +} + +.g-inline li.g-first { + margin-left: 0; } /* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ @@ -549,3 +582,12 @@ div#g-action-status { .rtl .g-short-form li { float: right; } + +.rtl .g-inline li { + float: right; + margin-right: 1em; +} + +.rtl .g-inline li.g-first { + margin-right: 0; +} diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 19da5a4b..4ae0c218 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -13,6 +13,7 @@ * 7) Right-to-left language styles * * @todo Consider moving g-panel to gallery.common + * @todo Review g-actions along with g-buttonset-vertical */ /** ******************************************************************* @@ -40,11 +41,7 @@ h1 { font-size: 1.7em; } -#g-search-results h1 { - margin-bottom: 1em; -} - -#g-progress h1 { +#g-dialog h1 { font-size: 1.1em; } @@ -259,16 +256,6 @@ th { text-decoration: none; } -#g-header #g-quick-search-form { - clear: right; - float: right; - margin: 1em 0; -} - -#g-header #g-quick-search-form input[type='text'] { - width: 17em; -} - #g-content .g-block h2 { background-color: transparent; padding-left: 0; @@ -278,13 +265,6 @@ th { padding-left: 1em; } -/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-content #g-search-results { - margin-top: 1em; - padding-top: 1em; -} - .g-block .ui-dialog-titlebar { margin: -1em -1em 0; } @@ -293,6 +273,8 @@ th { background: none; } +/* Photo stream ~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + #g-photo-stream { background-color: #e8e8e8; } @@ -329,6 +311,8 @@ th { width: 90px; } +/* Graphics settings ~~~~~~~~~~~~~~~~~~~~~ */ + #g-admin-graphics .g-available .g-block { clear: none; float: left; @@ -336,6 +320,8 @@ th { width: 30%; } +/* Appearance settings ~~~~~~~~~~~~~~~~~~~ */ + #g-site-theme, #g-admin-theme { float: left; @@ -380,15 +366,6 @@ th { * 5) Navigation and menus *********************************************************************/ -/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-header #g-login-menu { - color: #999; - float: right; - margin: 0; - padding: 5px 0; -} - /* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-site-admin-menu { @@ -447,41 +424,8 @@ th { padding: .2em .4em; } -.ui-widget-overlay { - background: #000; - opacity: .7; -} - -/* jQuery UI ThemeRoller buttons */ - -.g-buttonset { - padding-left: 1px; -} - -.g-buttonset li { - float: left; -} - -.g-buttonset .g-button { - margin: 0; -} - -.ui-icon-left .ui-icon { - float: left; - margin-right: .2em; -} - -.ui-icon-right .ui-icon { - float: right; - margin-left: .2em; -} - /*************** STUFF THAT NEEDS A HOME ****************/ -#g-task-log-dialog h1 { - font-size: 1.1em; -} - .g-task-log { border: 1pt solid; font-size: .9em; diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 38109c17..d88cabf6 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -43,7 +43,7 @@ <?= $theme->site_status() ?> <div id="g-header"> <?= $theme->admin_header_top() ?> - <ul id="g-login-menu" class="g-inline"> + <ul id="g-login-menu" class="g-inline g-right"> <li class="g-first"><?= html::anchor(item::root()->abs_url(), "← ".t("Back to the Gallery")) ?></li> <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li> </ul> diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 6e370a7f..15ce4173 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -40,7 +40,7 @@ h1 { font-size: 1.7em; } -#g-progress h1 { +#g-dialog h1 { font-size: 1.1em; } @@ -412,37 +412,6 @@ td { background-color: #dfe9ff; } -/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ - -.ui-widget-overlay { - background: #000; - opacity: .7; -} - -/* jQuery UI ThemeRoller buttons */ - -.g-buttonset { - padding-left: 1px; -} - -.g-buttonset li { - float: left; -} - -.g-buttonset .g-button { - margin: 0; -} - -.ui-icon-left .ui-icon { - float: left; - margin-right: .2em; -} - -.ui-icon-right .ui-icon { - float: right; - margin-left: .2em; -} - /** ******************************************************************* * 6) Right to left styles *********************************************************************/ |