From e153fce94e66791a41811915a2e00df71617a1e6 Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Fri, 25 Jun 2010 15:19:42 +0300 Subject: [PATCH 1/5] clean up --- themes/browny_admin_wind/css/screen.css | 76 ++++++++++++--------- themes/browny_wind/css/screen.css | 91 +++++++++++++------------ 2 files changed, 93 insertions(+), 74 deletions(-) diff --git a/themes/browny_admin_wind/css/screen.css b/themes/browny_admin_wind/css/screen.css index b30bcf25..1b0806da 100644 --- a/themes/browny_admin_wind/css/screen.css +++ b/themes/browny_admin_wind/css/screen.css @@ -4,27 +4,19 @@ * @requires YUI reset, font, grids CSS * * Sheet organization: - * 0) ThemeRoller * 1) Basic HTML elements * 2) Reusable content blocks * 3) Page layout containers * 4) Content blocks in specific layout containers * 5) Navigation and menus - * 6) jQuery and jQuery UI - * 7) Right-to-left language styles - * 8) More Browny + * 6) ThemeRoller + * 7) jQuery and jQuery UI + * 8) Right-to-left language styles + * 9) More Browny * * @todo Review g-buttonset-vertical */ -/** ******************************************************************* - * 0) ThemeRoller - **********************************************************************/ -/* ~browny~ */ - -/* ThemeRoller overrides ~~~~~~~~~~~~~~~~~~~ */ -@import "themeroller/ui.tabs.css"; - /** ******************************************************************* * 1) Basic HTML elements **********************************************************************/ @@ -32,7 +24,7 @@ /* ~browny~ */ body, html { background-color: #5a3007; - font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; + font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; } p { @@ -414,7 +406,7 @@ th { padding: .3em .8em; } -/* In-line editing ~~~~~~~~~~~~~~~~~~~~~~ */ +/* In-line editing ~~~~~~~~~~~~~~~~~~~~ */ #g-in-place-edit-message { background-color: #FFF; } @@ -437,10 +429,18 @@ th { } /** ******************************************************************* - * 6) jQuery and jQuery UI + * 6) ThemeRoller Theme + **********************************************************************/ +/* ~browny~ */ + +/* ThemeRoller overrides ~~~~~~~~~~~~~~ */ +@import "themeroller/ui.tabs.css"; + +/** ******************************************************************* + * 7) jQuery and jQuery UI *********************************************************************/ -/* Superfish menu overrides ~~~~~~~~~~~~~~ */ +/* Superfish menu overrides ~~~~~~~~~~~ */ /* ~browny~ */ .sf-menu li li, @@ -453,7 +453,26 @@ th { background-color: #e0cbae; } -/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ +/* ~browny~ */ +.sf-menu a { + border-top: 1px solid #e0cbae; +} + +/* ~browny~ */ +.sf-menu li { + background: #d3b07e url('../images/ui-bg_highlight-soft_45_d3b07e_1x100.png') 50% 50% repeat-x; +} + +/* ~browny~ */ +.sf-menu li:hover, +.sf-menu li.sfHover, +.sf-menu a:focus, +.sf-menu a:hover, +.sf-menu a:active { + background: #e0cbae; +} + +/* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~ */ #g-admin-dashboard .ui-state-highlight, #g-sidebar .ui-state-highlight { @@ -471,7 +490,7 @@ th { } /** ******************************************************************* - * 7) Right to left styles + * 8) Right to left styles *********************************************************************/ .rtl #g-content #g-album-grid .g-item, @@ -513,38 +532,31 @@ th { } /** ******************************************************************* - * 8) More Browny (Extra overrides for better Browny look) + * 9) More Browny (Extra overrides for better Browny look) *********************************************************************/ -/* /lib/superfish/css/superfish.css ~~~~~~~~~ */ -.sf-menu a { - border-top: 1px solid #e0cbae; -} -.sf-menu li { - background: #d3b07e url('../images/ui-bg_highlight-soft_45_d3b07e_1x100.png') 50% 50% repeat-x; -} -.sf-menu li:hover, .sf-menu li.sfHover, -.sf-menu a:focus, .sf-menu a:hover, .sf-menu a:active { - background: #e0cbae; -} +/* /lib/gallery.common.css ~~~~~~~~~~~~ */ -/* /lib/gallery.common.css ~~~~~~~~~~~~~~~~ */ .g-success { background: #fcf9ce url('../images/ico-success.png') no-repeat .4em 50% } + .g-even { background: transparent; } + .g-odd { background-color: #f2e6d4; } /* /modules/gallery/css/l10n_client.css */ + #l10n-client .labels { background:#262626 !important; } -/* /modules/user/css/user.css */ +/* /modules/user/css/user.css ~~~~~~~~~ */ + #g-user-admin-list .g-admin { color: #8d8d3d !important; } \ No newline at end of file diff --git a/themes/browny_wind/css/screen.css b/themes/browny_wind/css/screen.css index 04efc8ad..a8332c42 100644 --- a/themes/browny_wind/css/screen.css +++ b/themes/browny_wind/css/screen.css @@ -4,25 +4,17 @@ * @requires YUI reset, font, grids CSS * * Sheet organization: - * 0) ThemeRoller * 1) Font sizes, base HTML elements * 2) Reusable content blocks * 3) Page layout containers * 4) Content blocks in specific layout containers * 5) Navigation and menus - * 6) jQuery and jQuery UI - * 7) Right-to-left language styles - * 8) More Browny + * 6) ThemeRoller + * 7) jQuery and jQuery UI + * 8) Right-to-left language styles + * 9) More Browny */ -/** ******************************************************************* - * 0) ThemeRoller - **********************************************************************/ -/* ~browny~ */ - -/* ThemeRoller overrides ~~~~~~~~~~~~~~~~~~~ */ -@import "themeroller/ui.tabs.css"; - /** ******************************************************************* * 1) Font sizes, base HTML elements **********************************************************************/ @@ -440,7 +432,16 @@ td { } /** ******************************************************************* - * 6) jQuery and jQuery UI + * 6) ThemeRoller Theme + **********************************************************************/ +/* ~browny~ */ + +/* ThemeRoller overrides ~~~~~~~~~~~~~~~~~ */ + +@import "themeroller/ui.tabs.css"; + +/** ******************************************************************* + * 7) jQuery and jQuery UI *********************************************************************/ /* Superfish menu overrides ~~~~~~~~~~~~~~ */ @@ -473,7 +474,7 @@ td { } /** ******************************************************************* - * 7) Right to left language styles + * 8) Right to left language styles *********************************************************************/ .rtl #g-header #g-login-menu, @@ -498,7 +499,7 @@ td { } /** ******************************************************************* - * 8) More Browny (Extra overrides for better Browny look) + * 9) More Browny (Extra overrides for better Browny look) *********************************************************************/ /* ~browny~ */ @@ -530,7 +531,28 @@ tr.g-success td.g-success { padding: .5em 18px .5em 8px; } -/* /lib/uploadify/uploadify.css ~~~~~~~~~~~ */ +/* /modules/gallery/css/gallery.css ~~~~~~ */ + +#g-add-photos-form p { + margin-bottom: .5em !important; +} + +#g-permissions .g-allowed { + background-color: #fcf9ce !important; +} + +#g-user-profile th, +#g-user-profile td { + border: 1px dotted #ccc !important; +} + +/* /modules/gallery/css/l10n_client.css ~~ */ + +#l10n-client .labels { + background:#262626 !important; +} + +/* Uploadify ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ .uploadifyQueueItem { border: 2px solid #EBEBDF !important; @@ -545,26 +567,15 @@ tr.g-success td.g-success { margin-top: 1em; } -/* /modules/gallery/css/gallery.css */ -#g-add-photos-form p { - margin-bottom: .5em !important; +/* User Profile ~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +.g-avatar g-left { + width: 80px !important; + height: 80px !important; } -#g-permissions .g-allowed { - background-color: #fcf9ce !important; -} +/* Organize ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#g-user-profile th, -#g-user-profile td { - border: 1px dotted #ccc !important; -} - -/* /modules/gallery/css/l10n_client.css */ -#l10n-client .labels { - background:#262626 !important; -} - -/* /modules/organize/css/organize_theme.css */ #g-organize { color: #6E3B1C !important; } @@ -577,13 +588,8 @@ tr.g-success td.g-success { background-color: #F2EEE9 !important; } -/* User Profile ~~~~~~~~~~~ */ -.g-avatar g-left { - width: 80px !important; - height: 80px !important; -} +/* EXIF ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* EXIF Module ~~~~~~~~~~~ */ #g-exif-data { font-size: .85em !important; } @@ -594,7 +600,9 @@ tr.g-success td.g-success { background: #fcf9ce !important; } -/* /modules/calendarview/css/calendarview_calendar.css */ +/* 3rd Party Modules ~~~~~~~~~~~~~~~~~~~~~ */ + +/* CalendarView */ #g-calendar-grid { margin: 8px 8px 8px 8px !important; border: dotted #f2e6d4; @@ -610,12 +618,11 @@ table.calendar td:hover { padding-left: 0px; } -/* ../calendarview_menu.css */ #g-view-menu #g-calendarview-link { background-image: url('../images/ico-view-calendarview.png') !important; } -/* /modules/downloadfullsize/css/downloadfullsize_menu.css */ +/* DownloadFullSize */ #g-view-menu #g-download-fullsize-link { background-image: url('../images/ico-view-downloadfullsize.png') !important; } \ No newline at end of file From 7180b278fe9d5a2d6c9c182d7465d1435d9083f3 Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Fri, 25 Jun 2010 15:44:50 +0300 Subject: [PATCH 2/5] merge Wind Theme updates --- themes/browny_wind/css/screen.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/themes/browny_wind/css/screen.css b/themes/browny_wind/css/screen.css index a8332c42..caa32224 100644 --- a/themes/browny_wind/css/screen.css +++ b/themes/browny_wind/css/screen.css @@ -498,6 +498,16 @@ td { background-image: url('../images/ico-view-slideshow-rtl.png'); } +.rtl #g-sidebar .g-block-content { + padding-right: 1em; + padding-left: 0; +} + +.rtl #g-footer #g-credits li { + padding-left: 1.2em !important; + padding-right: 0; +} + /** ******************************************************************* * 9) More Browny (Extra overrides for better Browny look) *********************************************************************/ From 6f29c5c7425545d8b24c57f6967955216d7d59f0 Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Thu, 22 Jul 2010 13:04:13 +0300 Subject: [PATCH 3/5] remove 'admin' from the name to make it consistant with Wind theme --- themes/browny_admin_wind/theme.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/browny_admin_wind/theme.info b/themes/browny_admin_wind/theme.info index 350f3bd9..e3a020d0 100644 --- a/themes/browny_admin_wind/theme.info +++ b/themes/browny_admin_wind/theme.info @@ -1,4 +1,4 @@ -name = "Browny Admin Wind" +name = "Browny Wind" description = "The default Wind Admin theme with a browny style." version = 1 author = "Ma'moun M. Diraneyya" From 52c85de94e3a955b59050a0478a6b920d4bbc2ac Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Thu, 22 Jul 2010 13:04:54 +0300 Subject: [PATCH 4/5] slight color modifications --- themes/browny_wind/css/screen.css | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/themes/browny_wind/css/screen.css b/themes/browny_wind/css/screen.css index caa32224..3cb05e33 100644 --- a/themes/browny_wind/css/screen.css +++ b/themes/browny_wind/css/screen.css @@ -145,7 +145,7 @@ td { /* ~browny~ */ .g-block h2 { - background-color: #f2e6d4; + background-color: #EDE4D5; padding: .3em .8em; } @@ -174,7 +174,7 @@ td { /* ~browny~ */ #g-banner { - background-color: #f2e6d4; + background-color: #EDE4D5; border-bottom: 1px solid #ccc; min-height: 9em; padding: .5em 20px; @@ -194,7 +194,7 @@ td { /* ~browny~ */ #g-footer { - background-color: #f2e6d4; + background-color: #EDE4D5; border-top: 1px solid #ccc; margin-top: 20px; padding: 10px 20px; @@ -263,7 +263,7 @@ td { /* ~browny~ */ #g-content #g-album-grid .g-album { - background-color: #f2e6d4; + background-color: #EDE4D5; } #g-content #g-album-grid .g-album h2 span.g-album { @@ -530,7 +530,7 @@ tr.g-success td.g-success { } .g-odd { - background-color: #f2e6d4; + background-color: #EDE4D5; } .g-breadcrumbs li { @@ -604,10 +604,10 @@ tr.g-success td.g-success { font-size: .85em !important; } .g-odd { - background: #d6ce6c !important; + background: #BAAD8B !important; } .g-even { - background: #fcf9ce !important; + background: #EDE4D5 !important; } /* 3rd Party Modules ~~~~~~~~~~~~~~~~~~~~~ */ @@ -615,12 +615,12 @@ tr.g-success td.g-success { /* CalendarView */ #g-calendar-grid { margin: 8px 8px 8px 8px !important; - border: dotted #f2e6d4; + border: dotted #EDE4D5; padding-left: 8px; } table.calendar td:hover { - background: #f2e6d4 !important; + background: #EDE4D5 !important; } .rtl #g-calendar-grid { From d922027213c278ea08af5a32db65884ef61614bf Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Thu, 22 Jul 2010 15:12:59 +0300 Subject: [PATCH 5/5] add support to DownloadAlbum module --- themes/browny_wind/css/screen.css | 5 +++++ .../images/ico-view-downloadalbum.png | Bin 0 -> 1097 bytes 2 files changed, 5 insertions(+) create mode 100644 themes/browny_wind/images/ico-view-downloadalbum.png diff --git a/themes/browny_wind/css/screen.css b/themes/browny_wind/css/screen.css index 3cb05e33..3e16f6a6 100644 --- a/themes/browny_wind/css/screen.css +++ b/themes/browny_wind/css/screen.css @@ -635,4 +635,9 @@ table.calendar td:hover { /* DownloadFullSize */ #g-view-menu #g-download-fullsize-link { background-image: url('../images/ico-view-downloadfullsize.png') !important; +} + +/* DownloadAlbum */ +#g-view-menu #g-download-album-link { + background-image: url('../images/ico-view-downloadalbum.png'); } \ No newline at end of file diff --git a/themes/browny_wind/images/ico-view-downloadalbum.png b/themes/browny_wind/images/ico-view-downloadalbum.png new file mode 100644 index 0000000000000000000000000000000000000000..1ea75b89fc4564bf6054b8f69f31534cc32ca40e GIT binary patch literal 1097 zcmV-P1h)H$P)q$gGRCwCNS6ygSM-=|yg zS(bjzOnh2Jk59-N$*KySR>e#4)6^wQjSPb~@N(-;?5KYUsr0deC zZ`yk3g#wtF=-miQTqr87ERQG3AfhWgh%4+;eBE~p|CF?%$hKk44WZ-UhsZ2=1CUMz z>EvIyKR@>;lx(VPdhfUVHASHV{d6RrSY2M6D4`!E;QZ?~C3UdBOi$zax;0tml>c1D zU@XRD?7$Roa}_#c@i<&J^XR;B0K!7o{#_V4^8>a%YZ0w7(1$UT^Jp&|_c9;}oT63) z_DCZNEg^7ba0G81*sc3K7UZKb3ERkkl)U(2pmG&~2}_`(s~M*ThOuS6&|@Y)=@Wp5 z0qMHIyC;*%MI<6Hbb1_n_V3hv9y9t8wpjy?OUgAcz#51|(6RS*d^s?R`VA31X7Xcf zBLgl+DKmklqzl0sIPoL8y4!T0$4q{1CithjwQfP-Z{IHm86lf=}cCV>JsBUe`M<=%2X2=#f))cmmhQy_!E z7O!209ka2%rdhwIZd}%5rWP&*d=M$i2o_suqpD`L?q9oThw=#(fa_$x0#joKMh8C9 zXG|HDZee`<4kBL-@NP`ia#?Wrpt|mbtL7A}t8Bk}{f}v)AXb^EKqQ2?0)7V@49Mb#C6)v#aG}%Gq-Z>4gNAkq$c^Pts%d=(l4%<6r%Hp883p9{g(*2Ef~m zb0)|t{8IF!5+J)v_B&Zx