From 23739bda0168a9c0f300a47c3c3f153bf3981af1 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 7 Nov 2009 16:02:20 -0700 Subject: Move the Remove all completed tasks back out of the th, shouldn't have put it there in the first place. --- modules/gallery/views/admin_maintenance.html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php index 107b35cc..7ad75f85 100644 --- a/modules/gallery/views/admin_maintenance.html.php +++ b/modules/gallery/views/admin_maintenance.html.php @@ -116,6 +116,9 @@ count()): ?>
+ " + class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> +

@@ -135,9 +138,6 @@ -- cgit v1.2.3 From d73de4f0a20001963fa2274a2d758d6931c6ee1f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 09:00:49 -0700 Subject: No need to abbreviate text in CSS class names. Thx bharat! --- lib/gallery.common.css | 10 +++++----- modules/gallery/views/admin_maintenance_show_log.html.php | 2 +- modules/gallery/views/admin_maintenance_task.html.php | 2 +- modules/gallery/views/login_ajax.html.php | 2 +- themes/admin_wind/css/screen.css | 1 + themes/admin_wind/views/pager.html.php | 2 +- themes/night_wind/css/fix-ie.css | 2 +- themes/night_wind/views/movie.html.php | 2 +- themes/night_wind/views/pager.html.php | 2 +- themes/night_wind/views/photo.html.php | 2 +- themes/wind/css/fix-ie.css | 2 +- themes/wind/views/movie.html.php | 2 +- themes/wind/views/pager.html.php | 2 +- themes/wind/views/photo.html.php | 2 +- 14 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index f199ba45..5ca69908 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -19,15 +19,15 @@ * 1) Text **********************************************************************/ -.g-txt-small { +.g-text-small { font-size: .8em; } -.g-txt-big { +.g-text-big { font-size: 1.2em; } -.g-txt-right { +.g-text-right { text-align: right; } @@ -596,7 +596,7 @@ div#g-action-status { text-align: right; } -.rtl .g-txt-right { +.rtl .g-text-right { text-align: left; } @@ -649,7 +649,7 @@ div#g-action-status { width: 35%; } -.rtl .g-pager .g-txt-right { +.rtl .g-pager .g-text-right { margin-left: 0; } diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php index ff7ac50e..d2472fdc 100644 --- a/modules/gallery/views/admin_maintenance_show_log.html.php +++ b/modules/gallery/views/admin_maintenance_show_log.html.php @@ -11,7 +11,7 @@ appendTo('body').submit().remove();

name ?>

-
+ 
get_log()) ?>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php index 53972b70..76756b66 100644 --- a/modules/gallery/views/admin_maintenance_task.html.php +++ b/modules/gallery/views/admin_maintenance_task.html.php @@ -57,7 +57,7 @@
-
+
diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php index 9741db0c..36647f9d 100644 --- a/modules/gallery/views/login_ajax.html.php +++ b/modules/gallery/views/login_ajax.html.php @@ -38,7 +38,7 @@
  • - +
    • diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 4aa02023..97e0bfd0 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -124,6 +124,7 @@ td { } th { + vertical-align: bottom; white-space: nowrap; } diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php index e4fbd5d5..7870ef3f 100644 --- a/themes/admin_wind/views/pager.html.php +++ b/themes/admin_wind/views/pager.html.php @@ -25,7 +25,7 @@
    • -
  • +
  • diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css index cb51f349..fcebeea8 100644 --- a/themes/night_wind/css/fix-ie.css +++ b/themes/night_wind/css/fix-ie.css @@ -20,7 +20,7 @@ input.submit { float: none !important; } -.g-pager .g-txt-right { +.g-pager .g-text-right { width: 29%; } diff --git a/themes/night_wind/views/movie.html.php b/themes/night_wind/views/movie.html.php index 9254c7fe..a791f2d8 100644 --- a/themes/night_wind/views/movie.html.php +++ b/themes/night_wind/views/movie.html.php @@ -13,7 +13,7 @@
  • $position, "total" => $sibling_count)) ?>
    • -
  • +
  • diff --git a/themes/night_wind/views/pager.html.php b/themes/night_wind/views/pager.html.php index ba325d03..af82b835 100644 --- a/themes/night_wind/views/pager.html.php +++ b/themes/night_wind/views/pager.html.php @@ -25,7 +25,7 @@
    • -
  • +
  • diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php index e1231f65..a748daf2 100644 --- a/themes/night_wind/views/photo.html.php +++ b/themes/night_wind/views/photo.html.php @@ -26,7 +26,7 @@
  • $position, "total" => $sibling_count)) ?>
    • -
  • +
  • diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css index cb51f349..fcebeea8 100644 --- a/themes/wind/css/fix-ie.css +++ b/themes/wind/css/fix-ie.css @@ -20,7 +20,7 @@ input.submit { float: none !important; } -.g-pager .g-txt-right { +.g-pager .g-text-right { width: 29%; } diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index 9254c7fe..a791f2d8 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -13,7 +13,7 @@
  • $position, "total" => $sibling_count)) ?>
    • -
  • +
  • diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php index 36b2c13f..1dfe7eac 100644 --- a/themes/wind/views/pager.html.php +++ b/themes/wind/views/pager.html.php @@ -25,7 +25,7 @@
    • -
  • +
  • diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php index cee44134..e17dcdb3 100644 --- a/themes/wind/views/photo.html.php +++ b/themes/wind/views/photo.html.php @@ -26,7 +26,7 @@
  • $position, "total" => $sibling_count)) ?>
    • -
  • +
  • -- cgit v1.2.3 From ecadec6b84127db5749cc664b9b8878aca9d61ed Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 13:07:12 -0700 Subject: Wrap movies in #g-movie, apply ui-helper-clearfix to the pager and g-moive to fix clear issues reported in ticket #873. --- themes/wind/css/screen.css | 18 ++++++++++++++---- themes/wind/views/movie.html.php | 11 ++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 74771e07..1a7fc110 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -129,6 +129,9 @@ td { border: none; border-bottom: 1px solid #ccc; padding: .5em; +} + +td { vertical-align: top; } @@ -274,18 +277,25 @@ td { /* Individual photo content ~~~~~~~~~~~~~~ */ -#g-content #g-item { +#g-item { position: relative; width: 100%; } -#g-content #g-photo { +#g-item #g-photo, +#g-item #g-movie { + padding: 1em 0; +} + +#g-item #g-photo, +#g-item #g-movie { position: relative; } -#g-content #g-item .g-fullsize-link img { +#g-item img.g-resize, +#g-item a.g-movie object { display: block; - margin: 1em auto; + margin: 0 auto; } /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index a791f2d8..116fd95e 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -2,7 +2,7 @@
    photo_top() ?> -
    -- cgit v1.2.3 From 176ca8cb33ffb07406ad46352d164f69f1201b6d Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 19:21:06 -0700 Subject: Move g-panel styles into gallery.common and tighten up form layout a bit. --- lib/gallery.common.css | 32 +++++++++++++++++++++++++------- themes/admin_wind/css/screen.css | 14 -------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 5ca69908..c80dc90f 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -12,7 +12,6 @@ * 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 */ /** ******************************************************************* @@ -41,7 +40,7 @@ form { fieldset { border: 1px solid #ccc; - padding: .4em 1em .8em 1em; + padding: 0 1em .8em 1em; } #g-banner fieldset, @@ -52,7 +51,8 @@ fieldset { legend { font-weight: bold; - margin: 0 0 .4em .8em; + margin: 0; + padding: 0 .2em; } #g-banner legend, @@ -99,7 +99,11 @@ input[type=radio] { form li { margin: 0; - padding: .3em 0; + padding: 0 0 .2em 0; +} + +form ul { + margin-top: 0; } form ul ul { @@ -125,13 +129,22 @@ input[type="reset"] { float: left; } -/* Forms in dialogs ~~~~~~~~~~~~~~~~~~ */ +/* Forms in dialogs and panels ~~~~~~~~~ */ -#g-dialog form fieldset { +#g-dialog ul li { + padding-bottom: .8em; +} + +#g-dialog fieldset, +#g-panel fieldset { border: none; padding: 0; } +#g-panel legend { + display: none; +} + #g-dialog input.textbox, #g-dialog input[type=text], #g-dialog input[type=password], @@ -549,7 +562,7 @@ div#g-action-status { width: 40%; } -/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */ #g-dialog { text-align: left; @@ -563,6 +576,11 @@ div#g-action-status { margin: .4em 1em; } +#g-panel { + display: none; + padding: 1em; +} + /* Inline layout ~~~~~~~~~~ */ .g-inline li { diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 97e0bfd0..9fe3a1fc 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -12,7 +12,6 @@ * 6) jQuery and jQuery UI * 7) Right-to-left language styles * - * @todo Consider moving g-panel to gallery.common * @todo Review g-actions along with g-buttonset-vertical */ @@ -428,19 +427,6 @@ th { /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ -#g-panel { - display: none; - padding: 1em; -} - -#g-panel legend { - display: none; -} - -#g-panel fieldset { - border: none; -} - #g-admin-dashboard .ui-state-highlight, #g-sidebar .ui-state-highlight { height: 2em; -- cgit v1.2.3 From 56c543dbe42ebb77fb3f5742480a186954796837 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 21:41:11 -0700 Subject: Removed todo, it's done :) --- themes/wind/css/screen.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index bd17e0e4..e46ba8e6 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -11,8 +11,6 @@ * 5) Navigation and menus * 6) jQuery and jQuery UI * 7) Right-to-left language styles - * - * @todo Review g-buttonset and it's usage here and admin_wind */ /** ******************************************************************* -- cgit v1.2.3 From 2bd4fa4b43381da997219dbb9d2dd15a8d3af69f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 21:46:09 -0700 Subject: Remove g-actions, it doesn't serve any real purpose in styling or JavaScript. --- modules/user/views/admin_users.html.php | 2 +- themes/admin_wind/css/screen.css | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 661f1532..18ad9403 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -85,7 +85,7 @@
    • -
    - " - class="g-button g-right ui-icon-left ui-state-default ui-corner-all"> -
    last_login == 0) ? "" : gallery::date($user->last_login) ?> + id") ?>" open_text="" class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 9fe3a1fc..83b258f5 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -12,7 +12,7 @@ * 6) jQuery and jQuery UI * 7) Right-to-left language styles * - * @todo Review g-actions along with g-buttonset-vertical + * @todo Review g-buttonset-vertical */ /** ******************************************************************* @@ -358,11 +358,6 @@ th { margin-right: 1em; } -.g-actions a, -.g-actions span { - margin-right: 3em; -} - /* Block admin ~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-admin-blocks-list { -- cgit v1.2.3 From e184b5b6b16eae73d2133819d151b465dbda0c53 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 22:46:26 -0700 Subject: Apply borders and padding back to theme choices. --- themes/admin_wind/css/screen.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 83b258f5..cd15d1dc 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -156,6 +156,12 @@ th { padding: 0; } +#g-content .g-selected, +#g-content .g-available .g-block { + border: 1px solid #ccc; + padding: .8em; +} + .g-selected img, .g-available .g-block img { float: left; -- cgit v1.2.3 From 6ddbef3dcd3ee34e622bc7286ebf138b7ef1ffaa Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 23:13:02 -0700 Subject: Add a bit more space back inbetween admin form inputs on pages --- themes/admin_wind/css/screen.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index cd15d1dc..73ec8ac5 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -91,6 +91,10 @@ fieldset { margin-bottom: 1em; } +#g-content form ul li { + padding: .4em 0; +} + #g-dialog form { width: 270px; } -- cgit v1.2.3