summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_wind/css/screen.css25
-rw-r--r--themes/admin_wind/js/ui.init.js2
-rw-r--r--themes/admin_wind/views/pager.html.php16
-rw-r--r--themes/wind/css/screen.css15
-rw-r--r--themes/wind/js/ui.init.js2
-rw-r--r--themes/wind/views/movie.html.php8
-rw-r--r--themes/wind/views/pager.html.php16
-rw-r--r--themes/wind/views/photo.html.php8
8 files changed, 39 insertions, 53 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index d006463d..737c5939 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -68,9 +68,9 @@ h3 {
a,
.gMenu a,
#gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
a.ui-state-hover,
input.ui-state-hover,
button.ui-state-hover {
@@ -283,11 +283,11 @@ li.gError select {
background: #eee;
}
-.gAvailable .gButtonLink {
+.gAvailable .g-button {
width: 96%;
}
-.gSelected .gButtonLink {
+.gSelected .g-button {
display: none;
}
@@ -627,7 +627,7 @@ li.gGroup h4 {
border-bottom: 1px dashed #ccc;
padding: .5em 0 .5em .5em;
}
-li.gGroup .gButtonLink {
+li.gGroup .g-button {
padding: 0;
}
li.gGroup ul, li.gGroup div {
@@ -644,7 +644,7 @@ li.gGroup div p {
li.gGroup .gUser {
padding: .2em 0 0 .5em;
}
-li.gGroup .gUser .gButtonLink {
+li.gGroup .gUser .g-button {
vertical-align: middle;
}
@@ -838,13 +838,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
/* jQuery UI ThemeRoller buttons */
-.gButtonLink {
- display: inline-block;
- margin: 0 4px 0 0;
- padding: .2em .4em;
- outline: 0;
-}
-
.gButtonSet {
padding-left: 1px;
}
@@ -853,7 +846,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
float: left;
}
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
margin: 0;
}
@@ -1106,7 +1099,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
clear: both;
}
-#gTranslations .gButtonLink {
+#gTranslations .g-button {
padding: .5em;
}
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index c6379c09..d9b011bd 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -37,7 +37,7 @@ $(document).ready(function(){
if ($("#gAdminCommentsMenu").length) {
$("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
$("#gAdminCommentsMenu").addClass("gButtonSet");
- $("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default");
+ $("#gAdminCommentsMenu a").addClass("g-button ui-state-default");
$("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
$("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
}
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 90c71446..29b9f9d0 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -10,34 +10,34 @@
"count" => $total_items)) ?>
<li>
<? if ($first_page): ?>
- <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? endif ?>
<? if ($previous_page): ?>
- <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? endif ?>
</li>
<li class="gInfo"><?= $from_to_msg ?></li>
<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">
+ <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? endif ?>
<? if ($last_page): ?>
- <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? endif ?>
</li>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 9f3a53e6..6d955481 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -68,9 +68,9 @@ h3 {
a,
.gMenu a,
#gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
a.ui-state-hover,
input.ui-state-hover,
button.ui-state-hover {
@@ -884,13 +884,6 @@ form .gError,
/* jQuery UI ThemeRoller buttons */
-.gButtonLink {
- display: inline-block;
- margin: 0 4px 0 0;
- padding: .2em .4em;
- outline: 0;
-}
-
.gButtonSet {
padding-left: 1px;
}
@@ -899,7 +892,7 @@ form .gError,
float: left;
}
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
margin: 0;
}
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index c79e91bd..4a1962c0 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -49,7 +49,7 @@ $(document).ready(function() {
// Apply styles and icon classes to gContextMenu
if ($(".gContextMenu").length) {
$(".gContextMenu li").addClass("ui-state-default");
- $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
+ $(".gContextMenu a").addClass("g-button ui-icon-left");
$(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
$(".gContextMenu a span").each(function() {
var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 8b8e43a8..cf7c9b7f 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -5,20 +5,20 @@
<ul class="gPager">
<li>
<? if ($previous_item): ?>
- <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?>
</li>
<li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<? if ($next_item): ?>
- <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?>
</li>
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index b57e0c9d..155c8d16 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -10,34 +10,34 @@
"count" => $total_items)) ?>
<li>
<? if ($first_page): ?>
- <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
<? endif ?>
<? if ($previous_page): ?>
- <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
<? endif ?>
</li>
<li class="gInfo"><?= $from_to_msg ?></li>
<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">
+ <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
<? endif ?>
<? if ($last_page): ?>
- <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? else: ?>
- <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+ <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
<span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
<? endif ?>
</li>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index 25e1ad39..def3d8b7 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -18,20 +18,20 @@
<ul class="gPager">
<li>
<? if ($previous_item): ?>
- <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+ <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>
<? else: ?>
- <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
<? endif; ?>
</li>
<li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
<li class="g-txt-right">
<? if ($next_item): ?>
- <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+ <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? else: ?>
- <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+ <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
<span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
<? endif ?>
</li>