From 6ba60c82de2a4923a9f493de1c599d5933d66588 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 20:53:10 -0600 Subject: Don't make g-editable items bold by default, let the theme or module handle font-weight of editable items. --- lib/gallery.common.css | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index d0d41ecf..860b6164 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -201,7 +201,6 @@ input[type="reset"] { .g-active, .g-enabled, .g-available, -.g-editable, .g-selected, .g-highlight { font-weight: bold; -- cgit v1.2.3 From 0875ad6fd99d0e2cb1904f9550f6407d19f9021c Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 20:55:26 -0600 Subject: Rename g-unselected to g-deselected. --- lib/gallery.common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 860b6164..4bbf5a6d 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -211,7 +211,7 @@ input[type="reset"] { .g-unavailable, .g-uneditable, .g-locked, -.g-unselected, +.g-deselected, .g-understate { color: #ccc; font-weight: normal; -- cgit v1.2.3 From db4379a91d3e2048166336c0a58df0acd535f0c8 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 21:03:33 -0600 Subject: Move Superfish menu width overrides to gallery.common, leave color overrides at the theme-level. --- lib/gallery.common.css | 16 ++++++++++++++++ themes/admin_wind/css/screen.css | 7 ++----- themes/wind/css/screen.css | 14 -------------- 3 files changed, 18 insertions(+), 19 deletions(-) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 4bbf5a6d..be41cab6 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -366,6 +366,22 @@ form .g-error { .g-block-content { } +/* Superfish menu overrides ~~~~~~~~~~~~~~ */ + +.sf-menu ul { + width: 12em; +} + +ul.sf-menu li li:hover ul, +ul.sf-menu li li.sfHover ul { + left: 12em; +} + +ul.sf-menu li li li:hover ul, +ul.sf-menu li li li.sfHover ul { + left: 12em; +} + /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-button { diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 25302407..b3861868 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -439,7 +439,8 @@ tr.g-warning { /* Superfish menu overrides ~~~~~~~~~~~~~~ */ -.sf-menu li li, .sf-menu li li ul li { +.sf-menu li li, +.sf-menu li li ul li { background-color: #bdd2ff; } @@ -462,10 +463,6 @@ tr.g-warning { border: none; } -.ui-draggable { - cursor: move; -} - #g-admin-dashboard .ui-state-highlight, #g-sidebar .ui-state-highlight { height: 2em; diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index fc60aabb..2f7dfaf0 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -457,20 +457,6 @@ td { /* Superfish menu overrides ~~~~~~~~~~~~~~ */ -.sf-menu ul { - width: 12em; -} - -ul.sf-menu li li:hover ul, -ul.sf-menu li li.sfHover ul { - left: 12em; -} - -ul.sf-menu li li li:hover ul, -ul.sf-menu li li li.sfHover ul { - left: 12em; -} - .sf-menu li li, .sf-menu li li ul li { background-color: #bdd2ff; -- cgit v1.2.3 From b3059ab6d6824928445b2a44893fb85f06eb3360 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 22:18:38 -0600 Subject: Move g-editable styles from admin_wind to gallery.common, they'll be useful in themes as well as admin themes. --- lib/gallery.common.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index be41cab6..39124d6e 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -217,6 +217,15 @@ input[type="reset"] { font-weight: normal; } +.g-editable { + padding: .2em .3em; +} + +.g-editable:hover { + background-color: #ffc; + cursor: text; +} + .g-error, .g-info, .g-success, -- cgit v1.2.3 From a1847df83bfddf350fc71fd0e0e1c054bc94ce2d Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:07:56 -0600 Subject: Remove unused and/or redundant admin theme styles. Correct bg's (again) in admin > maintenance tables for IE. --- lib/gallery.common.css | 7 +++- themes/admin_wind/css/screen.css | 80 +++------------------------------------- 2 files changed, 12 insertions(+), 75 deletions(-) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 39124d6e..235c5604 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -273,10 +273,15 @@ tr.g-error td.g-error { } .g-success, -.g-allowed { +.g-allowed, +tr.g-success td.g-success { background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%; } +tr.g-success td.g-success { + background-color: transparent; +} + .g-warning, tr.g-warning td.g-warning { background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%; diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index b3861868..a6cfecaf 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -165,27 +165,24 @@ th { opacity: 0.4; } -tr.g-error, -tr.g-info, -tr.g-success, -tr.g-warning { - background: none; -} - -.g-info td.g-info { +.g-info td { background-color: transparent; + background-image: none; } -.g-success td.g-success { +.g-success td { background-color: transparent; + background-image: none; } .g-error td { background-color: #f6cbca; + background-image: none; } .g-warning td { background-color: #fcf9ce; + background-image: none; } .g-module-status.g-info, @@ -281,19 +278,6 @@ tr.g-warning { /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ -#g-header #g-login-menu li, -#g-footer #g-credits li { - display: inline; -} - -#g-header #g-login-menu li { - padding-left: 1.2em; -} - -#g-footer #g-credits li { - padding-right: 1.2em; -} - #g-content #g-search-results { margin-top: 1em; padding-top: 1em; @@ -332,10 +316,6 @@ tr.g-warning { width: 90px; } -#g-site-status { - margin-bottom: 0; -} - #g-content .g-item { background-color: #fff; border: 1px solid #e8e8e8; @@ -517,14 +497,6 @@ tr.g-warning { /*************** STUFF THAT NEEDS A HOME ****************/ -#g-move ul { - padding-left: 1em; -} - -#g-move .selected { - background: #999; -} - .g-progress-bar { height: 1em; width: 100%; @@ -532,46 +504,6 @@ tr.g-warning { display: inline-block; } -#g-admin-g2-import-notes { - padding-bottom: 20px; -} - -#g-admin-g2-import-details { - padding-top: 20px; -} - -#g-admin-g2-import-details .g-warning { - margin-top: 4px; -} - -#g-admin-g2-import-details .g-info { - padding: 2px; - border: 1px solid #999; - margin-bottom: 10px; -} - -#g-admin-g2-import-notes p, -#g-admin-g2-import-details .g-info p { - padding: 0; - margin: 0; -} - -#g-admin-g2-import-notes ul li, -#g-admin-g2-import .g-info ul li { - padding-left: 0; - margin-left: 20px; - list-style-type: disc; -} - -.g-editable { - padding: .1em .3em .2em .3em; -} - -.g-editable:hover { - background-color: #ffc; - cursor: text; -} - #g-task-log-dialog h1 { font-size: 1.1em; } -- cgit v1.2.3 From 76aa4bd1efc3db62326fa2c008de568b53b8710e Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:32:49 -0600 Subject: Move comment and recaptcha CSS to their respective modules. --- lib/gallery.common.css | 11 ++++++---- modules/comment/css/comment.css | 35 +++++++++++++++++++++++++++++++ modules/comment/helpers/comment.php | 2 +- modules/comment/helpers/comment_theme.php | 6 ++++++ modules/recaptcha/css/recaptcha.css | 7 +++++++ 5 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 modules/comment/css/comment.css create mode 100644 modules/recaptcha/css/recaptcha.css (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 235c5604..be12af55 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -9,6 +9,8 @@ * 4) States and interactions * 5) Positioning and order * 6) Containers/widgets + * + * @todo Remove extra white space at the top of the add comment form, above the first field */ /** ******************************************************************* @@ -58,10 +60,6 @@ input[type="hidden"] { display: none; } -textarea { - height: 12em; -} - input.textbox, input[type="text"], input[type="password"], @@ -74,6 +72,11 @@ textarea { width: 50%; } +textarea { + height: 12em; + width: 97%; +} + input:focus, input.textbox:focus, input[type=text]:focus, diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css new file mode 100644 index 00000000..d9d9b2f8 --- /dev/null +++ b/modules/comment/css/comment.css @@ -0,0 +1,35 @@ +#g-content #g-comment-form { + margin-top: 2em; +} + +#g-content #g-comments { + margin-top: 2em; + position: relative; +} + +#g-content #g-comments ul li { + margin: 1em 0; +} + +#g-content #g-comments .g-author { + border-bottom: 1px solid #ccc; + color: #999; + height: 32px; + line-height: 32px; +} + +#g-content #g-comments ul li div { + padding: 0 8px 8px 43px; +} + +#g-content #g-comments .g-avatar { + height: 32px; + margin-right: .4em; + width: 32px; +} + +#g-admin-comment-button { + position: absolute; + right: 0; + top: 2px; +} diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php index 7b2332a8..bca19282 100644 --- a/modules/comment/helpers/comment.php +++ b/modules/comment/helpers/comment.php @@ -73,7 +73,7 @@ class comment_Core { $group->textarea("text")->label(t("Comment")) ->id("g-text"); $group->hidden("item_id")->value($item->id); module::event("comment_add_form", $form); - $group->submit("")->value(t("Add")); + $group->submit("")->value(t("Add"))->class("ui-state-default ui-corner-all"); $active = user::active(); if (!$active->guest) { diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php index 10c855db..af0e1ca4 100644 --- a/modules/comment/helpers/comment_theme.php +++ b/modules/comment/helpers/comment_theme.php @@ -19,10 +19,16 @@ */ class comment_theme_Core { static function head($theme) { + $theme->css("comment.css"); $theme->script("comment.js"); return ""; } + static function admin_head($theme) { + $theme->css("comment.css"); + return ""; + } + static function photo_bottom($theme) { $block = new Block; $block->css_id = "g-comments"; diff --git a/modules/recaptcha/css/recaptcha.css b/modules/recaptcha/css/recaptcha.css new file mode 100644 index 00000000..27117a55 --- /dev/null +++ b/modules/recaptcha/css/recaptcha.css @@ -0,0 +1,7 @@ +#g-content #g-comments ul li #g-recaptcha { + padding: 0; +} + +#g-content #g-comments ul li #g-recaptcha div { + padding: 0; +} -- cgit v1.2.3 From 2b7a21dcbc39c8e11b46feb36fbf899e0a76bd8e Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:46:09 -0600 Subject: Add clearfix to search results gallery-grid to clear the pager navigation. Other minor search results style updates. Don't display legends in short forms. --- lib/gallery.common.css | 3 ++- modules/search/views/search.html.php | 2 +- themes/wind/css/screen.css | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index be12af55..f6d5bf26 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -55,7 +55,6 @@ legend { #g-banner legend, #g-sidebar legend, -#g-content #g-search-form legend, input[type="hidden"] { display: none; } @@ -132,6 +131,7 @@ input[type="reset"] { /* Short forms ~~~~~~~~~~~~~~~~~~~~~~~ */ +.g-short-form legend, .g-short-form label { display: none; } @@ -151,6 +151,7 @@ input[type="reset"] { .g-short-form input[type=text] { color: #666; padding: .3em .6em; + width: 100%; } .g-short-form .textbox.g-error { diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php index ac9f3c92..af14520b 100644 --- a/modules/search/views/search.html.php +++ b/modules/search/views/search.html.php @@ -21,7 +21,7 @@

-
    +
      is_album()): ?> diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 4ba56ba1..7d304837 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -40,10 +40,6 @@ h1 { font-size: 1.7em; } -#g-search-results h1 { - margin-bottom: 1em; -} - #g-progress h1 { font-size: 1.1em; } -- cgit v1.2.3 From f517ef4baf48ef7e1f8cbf1ed073c13c0cdf131f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:58:54 -0600 Subject: Moved rotate image bg css to gallery.common. --- lib/gallery.common.css | 12 ++++++++++++ themes/admin_wind/css/screen.css | 10 ++-------- themes/wind/css/screen.css | 10 +--------- 3 files changed, 15 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index f6d5bf26..93dd56e8 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -400,6 +400,18 @@ ul.sf-menu li li li.sfHover ul { left: 12em; } +/* jQuery UI ThemeRoller buttons */ + +/* Rotate icon, themerollower only provides one of these */ + +.ui-icon-rotate-ccw { + background-position: -192px -64px; +} + +.ui-icon-rotate-cw { + background-position: -208px -64px; +} + /* Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-button { diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 75652dc3..13174df9 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -11,6 +11,8 @@ * 5) Navigation and menus * 6) jQuery and jQuery UI * 7) Right-to-left language styles + * + * @todo Consider moving g-panel to gallery.common */ /** ******************************************************************* @@ -474,14 +476,6 @@ th { margin-left: .2em; } -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; -} - /*************** STUFF THAT NEEDS A HOME ****************/ .g-progress-bar { diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 7d304837..6e370a7f 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -12,7 +12,7 @@ * 6) jQuery and jQuery UI * 7) Right-to-left language styles * - * @todo Review g-buttonset and it's usage + * @todo Review g-buttonset and it's usage here and admin_wind */ /** ******************************************************************* @@ -443,14 +443,6 @@ td { margin-left: .2em; } -.ui-icon-rotate-ccw { - background-position: -192px -64px; -} - -.ui-icon-rotate-cw { - background-position: -208px -64px; -} - /** ******************************************************************* * 6) Right to left styles *********************************************************************/ -- cgit v1.2.3