diff options
Diffstat (limited to 'themes')
-rw-r--r-- | themes/admin_wind/css/screen.css | 24 | ||||
-rw-r--r-- | themes/admin_wind/views/admin.html.php | 1 | ||||
-rw-r--r-- | themes/admin_wind/views/pager.html.php | 2 | ||||
-rw-r--r-- | themes/wind/css/fix-ie.css | 2 | ||||
-rw-r--r-- | themes/wind/css/screen.css | 24 | ||||
-rw-r--r-- | themes/wind/views/movie.html.php | 2 | ||||
-rw-r--r-- | themes/wind/views/page.html.php | 1 | ||||
-rw-r--r-- | themes/wind/views/pager.html.php | 2 | ||||
-rw-r--r-- | themes/wind/views/photo.html.php | 2 |
9 files changed, 7 insertions, 53 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 3aee0719..d006463d 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -5,7 +5,6 @@ * * Sheet organization: * 1) Basic HTML elements - * 2) Reusable classes * 3) Reusable content blocks * 4) Page layout containers * 5) Content blocks in specific layout containers @@ -240,29 +239,6 @@ li.gError select { } /** ******************************************************************* - * 2) Reusable generic classes - *********************************************************************/ - -.inactive, .understate { - color: #ccc; - font-weight: normal; -} - -.left { - float: left; - margin: 1em 1em 1em 0; -} - -.right { - float: right; - margin: 1em 0 1em 1em; -} - -.txtright { - text-align: right; -} - -/** ******************************************************************* * 3) Reusable content blocks *********************************************************************/ diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index ef15ed25..b18f010a 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -10,6 +10,7 @@ <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> <?= $theme->css("superfish/css/superfish.css") ?> + <?= $theme->css("gallery.common.css") ?> <?= $theme->css("screen.css") ?> <!--[if lt IE 8]> <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>" diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php index 5034ec19..90c71446 100644 --- a/themes/admin_wind/views/pager.html.php +++ b/themes/admin_wind/views/pager.html.php @@ -25,7 +25,7 @@ <? endif ?> </li> <li class="gInfo"><?= $from_to_msg ?></li> - <li class="txtright"> + <li class="g-txt-right"> <? if ($next_page): ?> <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a> diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index eee88c15..4c13764f 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -28,7 +28,7 @@ input.submit { float: none !important; } -.gPager .txtright { +.gPager .g-txt-right { width: 29%; } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index df46b443..9f3a53e6 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -5,7 +5,6 @@ * * Sheet organization: * 1) Basic HTML elements - * 2) Reusable classes * 3) Reusable content blocks * 4) Page layout containers * 5) Content blocks in specific layout containers @@ -243,29 +242,6 @@ li.gError select { } /** ******************************************************************* - * 2) Reusable generic classes - *********************************************************************/ - -.inactive, .understate { - color: #ccc; - font-weight: normal; -} - -.left { - float: left; - margin: 1em 1em 1em 0; -} - -.right { - float: right; - margin: 1em 0 1em 1em; -} - -.txtright { - text-align: right; -} - -/** ******************************************************************* * 3) Reusable content blocks *********************************************************************/ diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index 910814dd..8b8e43a8 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -13,7 +13,7 @@ <? endif; ?> </li> <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> - <li class="txtright"> + <li class="g-txt-right"> <? if ($next_item): ?> <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a> diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 19d8cc00..414174b6 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -27,6 +27,7 @@ <?= $theme->css("yui/reset-fonts-grids.css") ?> <?= $theme->css("superfish/css/superfish.css") ?> <?= $theme->css("themeroller/ui.base.css") ?> + <?= $theme->css("gallery.common.css") ?> <?= $theme->css("screen.css") ?> <!--[if lt IE 8]> <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>" diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index 7cdc9bb0..b57e0c9d 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -25,7 +25,7 @@ <? endif ?> </li> <li class="gInfo"><?= $from_to_msg ?></li> - <li class="txtright"> + <li class="g-txt-right"> <? if ($next_page): ?> <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a> diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index b0096043..25e1ad39 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -26,7 +26,7 @@ <? endif; ?> </li> <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li> - <li class="txtright"> + <li class="g-txt-right"> <? if ($next_item): ?> <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all"> <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a> |