diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/admin_wind/css/fix-ie.css | 6 | ||||
-rw-r--r-- | themes/admin_wind/css/screen.css | 53 | ||||
-rw-r--r-- | themes/admin_wind/views/admin.html.php | 2 | ||||
-rw-r--r-- | themes/night_wind/css/fix-ie.css | 4 | ||||
-rw-r--r-- | themes/night_wind/views/album.html.php | 2 | ||||
-rw-r--r-- | themes/night_wind/views/page.html.php | 2 | ||||
-rw-r--r-- | themes/night_wind/views/pager.html.php | 2 | ||||
-rw-r--r-- | themes/night_wind/views/photo.html.php | 2 | ||||
-rw-r--r-- | themes/night_wind/views/sidebar.html.php | 2 | ||||
-rw-r--r-- | themes/wind/css/fix-ie.css | 4 | ||||
-rw-r--r-- | themes/wind/css/screen.css | 70 | ||||
-rw-r--r-- | themes/wind/views/album.html.php | 2 | ||||
-rw-r--r-- | themes/wind/views/page.html.php | 2 | ||||
-rw-r--r-- | themes/wind/views/pager.html.php | 2 | ||||
-rw-r--r-- | themes/wind/views/photo.html.php | 2 | ||||
-rw-r--r-- | themes/wind/views/sidebar.html.php | 2 |
16 files changed, 13 insertions, 146 deletions
diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css index 106fe4a1..99fc6241 100644 --- a/themes/admin_wind/css/fix-ie.css +++ b/themes/admin_wind/css/fix-ie.css @@ -2,12 +2,6 @@ * Fix display in IE 6 and 7 */ -.g-clearfix, -#g-group-admin, -#g-developer-tools { - zoom: 1; -} - .g-unavailable { filter: alpha(opacity=40); } diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 58a72baa..3d620f1c 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -583,8 +583,7 @@ li.g-group-disable h4, li.g-group-disable .g-user { * 5) Navigation and menus *********************************************************************/ -#g-site-admin-menu, -#g-tag-cloud ul { +#g-site-admin-menu { font-size: 1.2em; } @@ -791,27 +790,6 @@ li.g-group-disable h4, li.g-group-disable .g-user { list-style-type: disc; } -#g-tag-admin { - table-layout: fixed; -} - -#g-tag-admin td { - border: 0; -} - -#g-tag-admin ul { - padding-bottom: .3em; -} - -#g-tag-admin li { - padding: .1em 0 .2em .3em; -} - -#g-tag-admin .g-column { - float: left; - width: 200px; -} - .g-editable { padding: .1em .3em .2em .3em; } @@ -821,32 +799,6 @@ li.g-group-disable h4, li.g-group-disable .g-user { cursor: text; } -#g-rename-tag-form input { - padding: 0 .2em 0 .2em; - clear: none; - float: left; - margin: 0 .2em 0 0; -} - -#g-rename-tag-form input[type="text"].g-error { - border: 2px solid red; - background: none; -} - -#g-rename-tag-form input[type="submit"] { - height: 25px; -} - -#g-rename-tag-form a, #g-rename-tag-form span { - display: block; - float: left; - padding: .2em .2em 0 .1em; -} - -#g-rename-tag-form span { - float: right; -} - #g-task-log-dialog h1 { font-size: 1.1em; } @@ -965,9 +917,6 @@ li.g-group-disable h4, li.g-group-disable .g-user { .rtl .g-available .g-block img, .rtl #g-content #g-photo-stream .g-item, .rtl li.g-group, -.rtl #g-tag-admin .g-column, -.rtl #g-rename-tag-form input, -.rtl #g-rename-tag-form a, .rtl #g-server-add-admin, .rtl .ui-icon-left .ui-icon { float: right; diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 4ee08d95..b788eb93 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -50,7 +50,7 @@ <a id="g-logo" 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="g-clearfix"> + <div id="g-site-admin-menu" class="ui-helper-clearfix"> <?= $theme->admin_menu() ?> </div> <?= $theme->admin_header_bottom() ?> diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css index 60abc08d..cb51f349 100644 --- a/themes/night_wind/css/fix-ie.css +++ b/themes/night_wind/css/fix-ie.css @@ -2,10 +2,6 @@ * Fix display in IE 6, 7 */ -.g-clearfix { - zoom: 1; -} - #g-banner { z-index: 2; } diff --git a/themes/night_wind/views/album.html.php b/themes/night_wind/views/album.html.php index 91646b1e..1163630d 100644 --- a/themes/night_wind/views/album.html.php +++ b/themes/night_wind/views/album.html.php @@ -6,7 +6,7 @@ <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div> </div> -<ul id="g-album-grid" class="g-clearfix"> +<ul id="g-album-grid" class="ui-helper-clearfix"> <? if (count($children)): ?> <? foreach ($children as $i => $child): ?> <? $item_class = "g-photo"; ?> diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php index fab4ba9e..c8b08129 100644 --- a/themes/night_wind/views/page.html.php +++ b/themes/night_wind/views/page.html.php @@ -76,7 +76,7 @@ <?= $theme->page_top() ?> <div id="doc4" class="yui-t5 g-view"> <?= $theme->site_status() ?> - <div id="g-header" class="g-clearfix"> + <div id="g-header" class="ui-helper-clearfix"> <div id="g-banner"> <?= $theme->header_top() ?> <? if ($header_text = module::get_var("gallery", "header_text")): ?> diff --git a/themes/night_wind/views/pager.html.php b/themes/night_wind/views/pager.html.php index 2075fd95..337d658f 100644 --- a/themes/night_wind/views/pager.html.php +++ b/themes/night_wind/views/pager.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <? // See http://docs.kohanaphp.com/libraries/pagination ?> -<ul class="g-pager g-clearfix"> +<ul class="g-pager ui-helper-clearfix"> <? /* @todo This message isn't easily localizable */ $from_to_msg = t2("Photo %from_number of %count", "Photos %from_number - %to_number of %count", diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php index c9c30017..b33e2afa 100644 --- a/themes/night_wind/views/photo.html.php +++ b/themes/night_wind/views/photo.html.php @@ -15,7 +15,7 @@ <div id="g-item"> <?= $theme->photo_top() ?> - <ul class="g-pager g-clearfix"> + <ul class="g-pager ui-helper-clearfix"> <li> <? if ($previous_item): ?> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> diff --git a/themes/night_wind/views/sidebar.html.php b/themes/night_wind/views/sidebar.html.php index 151c6365..cd50fc01 100644 --- a/themes/night_wind/views/sidebar.html.php +++ b/themes/night_wind/views/sidebar.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <?= $theme->sidebar_top() ?> -<div id="g-view-menu" class="g-buttonset g-clearfix"> +<div id="g-view-menu" class="g-buttonset ui-helper-clearfix"> <? if ($page_type == "album"):?> <?= $theme->album_menu() ?> <? elseif ($page_type == "photo") : ?> diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index 60abc08d..cb51f349 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -2,10 +2,6 @@ * Fix display in IE 6, 7 */ -.g-clearfix { - zoom: 1; -} - #g-banner { z-index: 2; } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index cae472be..36231b0d 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -467,8 +467,7 @@ li.g-error select { * 5) Navigation and menus *********************************************************************/ -#g-site-menu, -#g-tag-cloud ul { +#g-site-menu { font-size: 1.2em; } @@ -566,73 +565,6 @@ li.g-error select { background-image: url('../images/ico-print.png'); } -/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-tag-cloud ul { - text-align: justify; -} - -#g-tag-cloud ul li { - display: inline; - line-height: 1.5em; - text-align: justify; -} - -#g-tag-cloud ul li a { - text-decoration: none; -} - -#g-tag-cloud ul li span { - display: none; -} - -#g-tag-cloud ul li.size1 a { - color: #9cf; - font-size: 80%; - font-weight: 100; -} - -#g-tag-cloud ul li.size2 a { - color: #69f; - font-size: 90%; - font-weight: 300; -} - -#g-tag-cloud ul li.size3 a { - color: #69c; - font-size: 100%; - font-weight: 500; -} - -#g-tag-cloud ul li.size4 a { - color: #369; - font-size: 110%; - font-weight: 700; -} - -#g-tag-cloud ul li.size5 a { - color: #0e2b52; - font-size: 120%; - font-weight: 900; -} - -#g-tag-cloud ul li.size6 a { - color: #0e2b52; - font-size: 130%; - font-weight: 900; -} - -#g-tag-cloud ul li.size7 a { - color: #0e2b52; - font-size: 140%; - font-weight: 900; -} - -#g-tag-cloud ul li a:hover { - color: #f30; - text-decoration: underline; -} - #g-welcome-message p { padding-bottom: 1em; } diff --git a/themes/wind/views/album.html.php b/themes/wind/views/album.html.php index 91646b1e..1163630d 100644 --- a/themes/wind/views/album.html.php +++ b/themes/wind/views/album.html.php @@ -6,7 +6,7 @@ <div class="g-description"><?= nl2br(html::purify($item->description)) ?></div> </div> -<ul id="g-album-grid" class="g-clearfix"> +<ul id="g-album-grid" class="ui-helper-clearfix"> <? if (count($children)): ?> <? foreach ($children as $i => $child): ?> <? $item_class = "g-photo"; ?> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index fab4ba9e..c8b08129 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -76,7 +76,7 @@ <?= $theme->page_top() ?> <div id="doc4" class="yui-t5 g-view"> <?= $theme->site_status() ?> - <div id="g-header" class="g-clearfix"> + <div id="g-header" class="ui-helper-clearfix"> <div id="g-banner"> <?= $theme->header_top() ?> <? if ($header_text = module::get_var("gallery", "header_text")): ?> diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index 2075fd95..337d658f 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <? // See http://docs.kohanaphp.com/libraries/pagination ?> -<ul class="g-pager g-clearfix"> +<ul class="g-pager ui-helper-clearfix"> <? /* @todo This message isn't easily localizable */ $from_to_msg = t2("Photo %from_number of %count", "Photos %from_number - %to_number of %count", diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index c9c30017..b33e2afa 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -15,7 +15,7 @@ <div id="g-item"> <?= $theme->photo_top() ?> - <ul class="g-pager g-clearfix"> + <ul class="g-pager ui-helper-clearfix"> <li> <? if ($previous_item): ?> <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all"> diff --git a/themes/wind/views/sidebar.html.php b/themes/wind/views/sidebar.html.php index 151c6365..cd50fc01 100644 --- a/themes/wind/views/sidebar.html.php +++ b/themes/wind/views/sidebar.html.php @@ -1,6 +1,6 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> <?= $theme->sidebar_top() ?> -<div id="g-view-menu" class="g-buttonset g-clearfix"> +<div id="g-view-menu" class="g-buttonset ui-helper-clearfix"> <? if ($page_type == "album"):?> <?= $theme->album_menu() ?> <? elseif ($page_type == "photo") : ?> |