diff options
| -rw-r--r-- | lib/gallery.common.css | 53 | ||||
| -rw-r--r-- | modules/gallery/views/login.html.php | 2 | ||||
| -rw-r--r-- | modules/search/views/search_link.html.php | 2 | ||||
| -rw-r--r-- | themes/admin_wind/css/screen.css | 26 | ||||
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 4 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 17 | ||||
| -rw-r--r-- | themes/wind/views/pager.html.php | 2 | ||||
| -rw-r--r-- | themes/wind/views/photo.html.php | 2 |
8 files changed, 88 insertions, 20 deletions
diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 4cb5735f..2cbce900 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -9,7 +9,9 @@ * 4) States and interactions * 5) Positioning and order * 6) Containers/widgets + * 7) Right to left language styles * + * @todo Update .g-message-block, don't force it to 100%, bad things happen is themes when you do. * @todo Remove extra white space at the top of the add comment form, above the first field */ @@ -85,6 +87,11 @@ option:focus { color: #000; } +input.checkbox { + float: left; + margin-right: .4em; +} + /* Form layout ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ form li { @@ -502,7 +509,7 @@ div#g-action-status { .g-breadcrumbs li { background: transparent url('images/ico-separator.gif') no-repeat scroll left center; float: left; - padding: 1em .6em 1em 1.4em; + padding: 1em 8px 1em 18px; } .g-breadcrumbs .g-first { @@ -523,7 +530,7 @@ div#g-action-status { /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-pager { - padding: 5px 0; + padding: .2em 0; width: 100%; } @@ -566,17 +573,23 @@ div#g-action-status { } /** ******************************************************************* - * 7) Right to left styles + * 7) Right to left language styles **********************************************************************/ .rtl { direction: rtl; } +.rtl #g-header, +.rtl #g-content, +.rtl #g-sidebar, +.rtl #g-footer, .rtl caption, .rtl th, .rtl #g-dialog, -.g-message { +.rtl .g-context-menu li a, +.rtl .g-message-box li, +.rtl #g-site-status li { text-align: right; } @@ -584,6 +597,14 @@ div#g-action-status { text-align: left; } +.rtl .g-error, +.rtl .g-info, +.rtl .g-success, +.rtl .g-warning { + background-position: center right; + padding-right: 30px !important; +} + .rtl .g-left, .rtl .g-inline li, .rtl form ul ul li, @@ -594,7 +615,8 @@ div#g-action-status { .rtl .g-breadcrumbs li, .rtl .g-pager li, .rtl .g-buttonset li, -.rtl .ui-icon-left .ui-icon { +.rtl .ui-icon-left .ui-icon, +.rtl input.checkbox { float: right; } @@ -610,3 +632,24 @@ div#g-action-status { .rtl .g-inline li.g-first { margin-right: 0; } + +.rtl .g-breadcrumbs li { + background-position: right center; + padding: 1em 18px 1em 8px; +} + +.rtl .g-breadcrumbs .g-first { + padding-right: 0; +} + +.rtl .g-pager .g-info { + width: 35%; +} + +.rtl .g-pager .g-txt-right { + margin-left: 0; +} + +.rtl input.checkbox { + margin-right: .4em; +} diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php index a7734369..4c13ef4b 100644 --- a/modules/gallery/views/login.html.php +++ b/modules/gallery/views/login.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<ul id="g-login-menu" class="g-inline g-right"> +<ul id="g-login-menu" class="g-inline ui-helper-clearfix"> <? if ($user->guest): ?> <li class="g-first"> <a href="<?= url::site("login/ajax") ?>" diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php index 9d1ce83b..481d0c82 100644 --- a/modules/search/views/search_link.html.php +++ b/modules/search/views/search_link.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form g-right"> +<form action="<?= url::site("search") ?>" id="g-quick-search-form" class="g-short-form"> <ul> <li> <label for="g-search"><?= t("Search the gallery") ?></label> diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index fbcdf4ae..5ed42391 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -1,5 +1,5 @@ /** - * Gallery 3 Default Theme Screen Styles + * Gallery 3 Admin Wind Theme Screen Styles * * @requires YUI reset, font, grids CSS * @@ -195,6 +195,12 @@ th { * 3) Page layout containers *********************************************************************/ +/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +#g-header #g-login-menu { + margin-top: 1em; +} + /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-view { @@ -217,7 +223,7 @@ th { #g-content { font-size: 1.1em; - padding-left: 20px; + padding: 0 2em; width: 96%; } @@ -457,11 +463,6 @@ th { * 7) Right to left styles *********************************************************************/ -.rtl #g-admin-menu { - left: auto; - right: 150px; -} - .rtl #g-content #g-album-grid .g-item, .rtl #g-site-theme, .rtl #g-admin-theme, @@ -478,3 +479,14 @@ th { margin-left: 1em; margin-right: 0em; } + +.rtl #g-site-admin-menu { + left: auto; + right: 150px; +} + +.rtl #g-header #g-login-menu li { + margin-left: 0; + padding-left: 0; + padding-right: 1.2em; +} diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index e554b817..25ba1c97 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -41,7 +41,7 @@ <div id="doc3" class="yui-t7 g-view"> <? endif; ?> <?= $theme->site_status() ?> - <div id="g-header"> + <div id="g-header" class="ui-helper-clearfix"> <?= $theme->admin_header_top() ?> <ul id="g-login-menu" class="g-inline g-right"> <li class="g-first"> @@ -57,7 +57,7 @@ </li> <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li> </ul> - <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> + <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>"> ← <?= t("back to the ...") ?> </a> <div id="g-site-admin-menu" class="ui-helper-clearfix"> diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index b73c21f0..1fc5fa65 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -1,5 +1,5 @@ /** - * Gallery 3 Default Theme Screen Styles + * Gallery 3 Wind Theme Screen Styles * * @requires YUI reset, font, grids CSS * @@ -307,6 +307,7 @@ td { #g-banner #g-login-menu { color: #999; + float: right; } #g-banner #g-login-menu li { @@ -412,9 +413,21 @@ td { } /** ******************************************************************* - * 7) Right to left styles + * 7) Right to left language styles *********************************************************************/ +.rtl #g-header #g-login-menu, +.rtl #g-header #g-quick-search-form { + clear: left; + float: left; +} + +.rtl #g-header #g-login-menu li { + margin-left: 0; + padding-left: 0; + padding-right: 1.2em; +} + .rtl #g-site-menu { left: auto; right: 150px; diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index ba325d03..36b2c13f 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -8,7 +8,7 @@ array("from_number" => $current_first_item, "to_number" => $current_last_item, "count" => $total_items)) ?> - <li> + <li class="g-first"> <? if ($first_page): ?> <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-seek-first"></span><?= t("First") ?></a> diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index e1231f65..cee44134 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -16,7 +16,7 @@ <?= $theme->photo_top() ?> <ul class="g-pager ui-helper-clearfix"> - <li> + <li class="g-first"> <? if ($previous_item): ?> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a> |