From 9136090a23f47a42e459fc7e9f2b058df649e587 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 16:33:58 -0600 Subject: Quote Trebuchet MS since it contains a space. --- modules/gallery/css/upgrader.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css index 7c377817..64e4ca07 100644 --- a/modules/gallery/css/upgrader.css +++ b/modules/gallery/css/upgrader.css @@ -1,6 +1,6 @@ body { background: #eee; - font-family: Trebuchet MS; + font-family: 'Trebuchet MS'; font-size: 1.1em; } -- cgit v1.2.3 From a5d2af336a94c4cf4fd1a5732b3f64197a3f2dd2 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 16:51:24 -0600 Subject: Move g2_import styles from the theme to the module. --- modules/g2_import/css/g2_import.css | 30 +++++++++++++++++++++++++++ modules/g2_import/helpers/g2_import_theme.php | 28 +++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 modules/g2_import/css/g2_import.css create mode 100644 modules/g2_import/helpers/g2_import_theme.php (limited to 'modules') diff --git a/modules/g2_import/css/g2_import.css b/modules/g2_import/css/g2_import.css new file mode 100644 index 00000000..d53564d7 --- /dev/null +++ b/modules/g2_import/css/g2_import.css @@ -0,0 +1,30 @@ +#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; +} diff --git a/modules/g2_import/helpers/g2_import_theme.php b/modules/g2_import/helpers/g2_import_theme.php new file mode 100644 index 00000000..b1aaac00 --- /dev/null +++ b/modules/g2_import/helpers/g2_import_theme.php @@ -0,0 +1,28 @@ +css("g2_import.css"); + } + + static function admin_head($theme) { + $theme->css("g2_import.css"); + } +} \ No newline at end of file -- cgit v1.2.3 From c5faa3560e53fa8547199f60545ba550c2c60345 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 16:53:54 -0600 Subject: Created gallery.css file, moved simple uploader, move, and permissions CSS there. Removed relocated styles from theme css. --- modules/gallery/css/gallery.css | 118 ++++++++++++++++++++++ modules/gallery/helpers/gallery_theme.php | 1 + themes/wind/css/screen.css | 157 ++---------------------------- 3 files changed, 128 insertions(+), 148 deletions(-) create mode 100644 modules/gallery/css/gallery.css (limited to 'modules') diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css new file mode 100644 index 00000000..a4a52155 --- /dev/null +++ b/modules/gallery/css/gallery.css @@ -0,0 +1,118 @@ +/** + * @todo Make #g-welcome-message p unecessary + * @todo Review permissions dialog, find home + */ + +/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +#g-edit-permissions-form { + clear: both; +} + +#g-edit-permissions-form td { + background-image: none; +} + +#g-edit-permissions-form fieldset { + border: 1px solid #ccc; + padding: 0; +} + +#g-permissions .g-denied, +#g-permissions .g-allowed { + text-align: center; + vertical-align: middle; +} + +#g-permissions .g-denied { + background-color: #fcc; +} + +#g-permissions .g-allowed { + background-color: #cfc; +} + +/* Move items ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +#g-move ul { + padding-left: 1em; +} + +#g-move .selected { + background: #999; +} + +/* Simple uploader ~~~~~~~~~~~~~~~~~~~~~~~ */ + +#g-add-photos #SWFUpload_0 { + position: relative; + top: -200px; + left: 134px; +} + +#g-add-photos .g-breadcrumbs { + border: 0; + margin: 0; + padding-left:10px; +} + +#g-add-photos-canvas { + border: 1px solid #ccc; + margin: .5em 0 .5em 0; + width: 469px; + height: 325px; + overflow: auto; +} + +#g-add-photos button { + margin-bottom: .5em; + float: right; +} +#g-uploadqueue-infobar { + clear: both; +} + +#g-uploadqueue-infobar #g-cancelupload { + display: none; + cursor: pointer; +} + +#g-add-photos-canvas { +} + +#g-add-photos-queue .progressbar { + height: 4px; +} + +#g-add-photos-queue .title { + font-size: 1.25em; +} + +#g-add-photos-queue .status { + font-size: .75em; +} + +#g-add-photos-queue .box { + margin-bottom: 8px; + padding: 4px; +} + +#g-add-photos-queue .pending { + background-color: #e8e8e8; + border: 1px solid #d7d7d7; +} + +#g-add-photos-queue .error { + background-color: #fcc; + border: 1px solid #ebb; +} + +#g-add-photos-queue .uploading { + background-color: #ff9; + border: 1px solid #ee8; +} + +#g-add-photos-queue .complete { + background-color: #cfc; + border: 1px solid #beb; +} diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php index a342b4bd..05b8f59a 100644 --- a/modules/gallery/helpers/gallery_theme.php +++ b/modules/gallery/helpers/gallery_theme.php @@ -21,6 +21,7 @@ class gallery_theme_Core { static function head($theme) { $session = Session::instance(); $buf = ""; + $theme->css("gallery.css"); if ($session->get("debug")) { $theme->css("debug.css"); } diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 84b8b090..873f0a47 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -9,11 +9,12 @@ * 3) Page layout containers * 4) Content blocks in specific layout containers * 5) Navigation and menus - * 6) Browser hacks - * 7) jQuery and jQuery UI - * 8) Right-to-left language styles + * 6) jQuery and jQuery UI + * 7) Right-to-left language styles * - * @todo Move #g-admin-g2-import stuff to g2import module + * @todo Move #g-comments to comment module, recapthca to recaptcha? + * @todo Make #g-welcome-message p unecessary + * @todo Review g-buttonset and it's usage */ /** ******************************************************************* @@ -371,7 +372,7 @@ td { margin-bottom: 0 !important; } -/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-context-menu { background-color: #fff; @@ -503,149 +504,9 @@ td { background-position: -208px -64px; } -/* STUFF THAT NEEDS A HOME */ - -#g-move ul { - padding-left: 1em; -} - -#g-move .selected { - background: #999; -} - -/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-edit-permissions-form { - clear: both; -} - -#g-edit-permissions-form td { - background-image: none; -} - -#g-edit-permissions-form fieldset { - border: 1px solid #ccc; - padding: 0; -} - -#g-permissions .g-denied, -#g-permissions .g-allowed { - text-align: center; - vertical-align: middle; -} - -#g-permissions .g-denied { - background-color: #fcc; -} - -#g-permissions .g-allowed { - background-color: #cfc; -} - -/*************** STUFF THAT NEEDS A HOME ****************/ - -#g-add-photos #SWFUpload_0 { - position: relative; - top: -200px; - left: 134px; -} -#g-add-photos .g-breadcrumbs { - border: 0; - margin: 0; - padding-left:10px; -} -#g-add-photos-canvas { - border: 1px solid #ccc; - margin: .5em 0 .5em 0; - width: 469px; - height: 325px; - overflow: auto; -} -#g-add-photos button { - margin-bottom: .5em; - float: right; -} -#g-uploadqueue-infobar { - clear: both; -} -#g-uploadqueue-infobar #g-cancelupload { - display: none; - cursor: pointer; -} - -#g-add-photos-canvas { - -} - -#g-add-photos-queue .progressbar { - height: 4px; -} - -#g-add-photos-queue .title { - font-size: 1.25em; -} - -#g-add-photos-queue .status { - font-size: .75em; -} - -#g-add-photos-queue .box { - margin-bottom: 8px; - padding: 4px; -} - -#g-add-photos-queue .pending { - background-color: #e8e8e8; - border: 1px solid #d7d7d7; -} - -#g-add-photos-queue .error { - background-color: #fcc; - border: 1px solid #ebb; -} - -#g-add-photos-queue .uploading { - background-color: #ff9; - border: 1px solid #ee8; -} - -#g-add-photos-queue .complete { - background-color: #cfc; - border: 1px solid #beb; -} - -#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; -} - -/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */ +/** ******************************************************************* + * 6) Right to left styles + *********************************************************************/ .rtl { direction: rtl; -- cgit v1.2.3 From 02ecf5749c12967b8a742a734711c9c216592195 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 18:34:36 -0600 Subject: Make menu label adhere to our capitalization standard. --- modules/organize/helpers/organize_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php index a33b2f2e..6aa6da81 100644 --- a/modules/organize/helpers/organize_event.php +++ b/modules/organize/helpers/organize_event.php @@ -25,7 +25,7 @@ class organize_event_Core { $menu->get("options_menu") ->append(Menu::factory("dialog") ->id("organize") - ->label(t("Organize Album")) + ->label(t("Organize album")) ->css_id("g-organize-link") ->url(url::site("organize/dialog/{$item->id}"))); } -- cgit v1.2.3 From eb93e343e21a9f7dc30bc20802790b580000d206 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:02:58 -0600 Subject: Make "move item in photo view" comment a todo. --- modules/gallery/helpers/gallery_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index 39a6f337..67302e26 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -258,7 +258,7 @@ class gallery_event_Core { ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type"))); } - // Don't move photos from the photo page; we don't yet have a good way of redirecting after + // @todo Don't move photos from the photo page; we don't yet have a good way of redirecting after // move if ($page_type == "album") { $options_menu -- 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 'modules') 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 'modules') 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 288e14756d948acecbc98fdd76ddb851f5d3e74b Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:50:24 -0600 Subject: Moved admin-comments styles from admin theme to module. --- modules/comment/css/comment.css | 10 ++++++++++ themes/admin_wind/css/screen.css | 13 ------------- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'modules') diff --git a/modules/comment/css/comment.css b/modules/comment/css/comment.css index d9d9b2f8..f58391b0 100644 --- a/modules/comment/css/comment.css +++ b/modules/comment/css/comment.css @@ -33,3 +33,13 @@ right: 0; top: 2px; } + +#g-admin-comments-menu { + margin: 1em 0; +} + +#g-admin-comments-menu a { + margin: 0; + padding: .2em .6em; +} + diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index a6cfecaf..75652dc3 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -327,15 +327,6 @@ th { width: 90px; } -#g-admin-comments-menu { - margin: 1em 0; -} - -#g-admin-comments-menu a { - margin: 0; - padding: .2em .6em; -} - #g-admin-graphics .g-available .g-block { clear: none; float: left; @@ -387,10 +378,6 @@ th { * 5) Navigation and menus *********************************************************************/ -#g-site-admin-menu { - font-size: 1.2em; -} - /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-header #g-login-menu { -- cgit v1.2.3