diff options
| -rw-r--r-- | modules/gallery/css/gallery.css | 118 | ||||
| -rw-r--r-- | modules/gallery/helpers/gallery_theme.php | 1 | ||||
| -rw-r--r-- | themes/wind/css/screen.css | 157 |
3 files changed, 128 insertions, 148 deletions
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; |