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. --- themes/wind/css/screen.css | 157 +++------------------------------------------ 1 file changed, 9 insertions(+), 148 deletions(-) (limited to 'themes/wind/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 a249460d63cd0727c0030f2d30f9054bb4589e11 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 19:01:15 -0600 Subject: Widen Superfish submenus to avoid wrapping with current items. --- themes/wind/css/screen.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'themes/wind/css') diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 873f0a47..fc60aabb 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -457,7 +457,22 @@ td { /* Superfish menu overrides ~~~~~~~~~~~~~~ */ -.sf-menu li li, .sf-menu li li ul li { +.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 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 'themes/wind/css') 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 6403becb3f466288192f852d5191d62801e6b6f0 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 25 Oct 2009 23:28:37 -0600 Subject: Remove #g-welcome-message, it's not needed anymore. --- themes/wind/css/screen.css | 50 ---------------------------------------------- 1 file changed, 50 deletions(-) (limited to 'themes/wind/css') diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 2f7dfaf0..4ba56ba1 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -12,8 +12,6 @@ * 6) jQuery and jQuery UI * 7) Right-to-left language styles * - * @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 */ @@ -286,50 +284,6 @@ td { margin: 1em auto; } -#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 ul li #g-recaptcha { - padding: 0; -} - -#g-content #g-comments ul li #g-recaptcha div { - padding: 0; -} - -#g-content #g-comments .g-avatar { - height: 32px; - margin-right: .4em; - width: 32px; -} - -#g-admin-comment-button { - position: absolute; - right: 0; - top: 2px; -} - -#g-content #g-comment-form { - margin-top: 2em; -} - /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */ #g-footer #g-credits li { @@ -447,10 +401,6 @@ td { background-image: url('../images/ico-print.png'); } -#g-welcome-message p { - padding-bottom: 1em; -} - /** ******************************************************************* * 6) jQuery and jQuery UI *********************************************************************/ -- 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 'themes/wind/css') 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 'themes/wind/css') 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