From 4c6c24856cc326e26b6f7ac91ee6eae9fcc722f7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 21 Nov 2012 07:14:05 +0300 Subject: [PATCH] Themes refactored --- app/assets/images/gitlab_classic.png | Bin 3054 -> 0 bytes app/assets/images/gitlab_default.png | Bin 6435 -> 0 bytes app/assets/images/gitlab_modern.png | Bin 3892 -> 0 bytes app/assets/images/logo_dark.png | Bin 2858 -> 2589 bytes app/assets/images/logo_white.png | Bin 1681 -> 1517 bytes app/assets/stylesheets/common.scss | 19 ------ app/assets/stylesheets/main.scss | 9 ++- app/assets/stylesheets/sections/header.scss | 10 +-- app/assets/stylesheets/sections/themes.scss | 53 +++++++++++++++ app/assets/stylesheets/themes/ui_color.scss | 68 +++++++++++++++++++ app/assets/stylesheets/themes/ui_gray.scss | 68 +++++++++++++++++++ app/assets/stylesheets/themes/ui_mars.scss | 2 +- app/assets/stylesheets/themes/ui_modern.scss | 14 ++-- app/views/profile/design.html.haml | 21 ++++-- lib/gitlab/theme.rb | 6 +- 15 files changed, 224 insertions(+), 46 deletions(-) delete mode 100644 app/assets/images/gitlab_classic.png delete mode 100644 app/assets/images/gitlab_default.png delete mode 100644 app/assets/images/gitlab_modern.png create mode 100644 app/assets/stylesheets/sections/themes.scss create mode 100644 app/assets/stylesheets/themes/ui_color.scss create mode 100644 app/assets/stylesheets/themes/ui_gray.scss diff --git a/app/assets/images/gitlab_classic.png b/app/assets/images/gitlab_classic.png deleted file mode 100644 index 4e189e220abb3d6e08f067802f95cdbe862853bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3054 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 Ofx*+&&t;ucLK6Ulk^3P4 diff --git a/app/assets/images/gitlab_modern.png b/app/assets/images/gitlab_modern.png deleted file mode 100644 index b2d73b7a789f048a9947d68a0b942abe57c0b2e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3892 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 delta 2826 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 VIZq%umw|zS!PC{xWt~$(696eNXF31? diff --git a/app/assets/images/logo_white.png b/app/assets/images/logo_white.png index 3f74025449c2e1a3aa4af6052098366e89ae90c2..366e3f3f3b9f16a15f43a7f3fdd04aa2470a177f 100644 GIT binary patch delta 1488 zcmbQp`<7d=Gr-TCmrII^fq{Y7)59f*fq_Atfq_AVgN=cKfy-QZ_C!T7&i@Sm8U8QW zyL|FQ2l;w#QGPkDw(o^o7#LV{JzX3_A`ZWu5!(@aRrL6EE904x$2&VyC;12+by0h^ zI5R0}(Xkb|$yX*gt+?v3b>Y_5X-YqYy5&2%0^^T(EZn9M*6H+U`-|p~-wOg<7b|VO zfAv_}m9UItXB{W+Blpj#oENcRyFW4G+C~=|@QE>|ax=t{!B_VF+ZuD!`Ly@j!_Fr7S`&wna%Z!=c^+un~zAo(8VW(8aXuWDx)$)x`4mhNp>+N{hA<@-wup?qg z-kCGXMxSSOM2HDiUx^hooHX;dlyK;CQG;f|!nCw^tYL0PmYn(XUt`&_nYL^G*(iMr z3H`eK(zoW02pPftmG!63n7%5UY3W|8Zyev-aa}p7Jni55274=|F!v*$I%d?*ocVs0 zvf#(rMhib1ecpMdX2X~Hf`ZFapB+21XGdxR({`rk4A~8trWeGS^BKM~+z$w6_?w&> zm7Bv~uxJnY|*D;fP_m)u)awtDrc-N9GvS4Ur2Jlp=BUSd@0 zYAeaw=|qU)=?go72G)(tmb zG0(kGr<44+mijg%gK@sSRb%H?74i8&&u?b=8WPd>81ut_Sxz6GKVpr zH`}>0zP^_C2J;{HTK~QB5;=lGi_gD$HEE{&iubF3ziN!1ykU3a)?~dx&zJGc!Ltv{ zU$bxNzP0z3+AVv>JTI_4dX3xkUF!la#C^4Ta7ZZLx^bS`Z{sVuXJ@RMwdBjHXyr#8 zYq(#jU!VPoUGU?=s$3TvIl4a>AdKD#dmGedZs+aJT2zsEAHwx*)-m4eJZ}X zeAWK^DekFH|1ZpAnZ}@fWhJk*slVyJQS+;&zPRvU_0>Xj^6F} zYkS}4b5uyrTIFBj_wkbFtIN5Z`~MY|?*8?*$bLKD2Ht+(ysCF^mk7P`S->8#wBGLS zA-CI?b}qkCcDZriqRq*Tuk|->bF`Iy@mk@}@fFTl@*j3sndo({VT=i7@MG*_nzq$= zfgby}RmunUdo8`qcO&G1#a8hh;t}?FvAMrq{5&A0&=~pZPgV_qzOzrkyxTG!7!!QaVOEMI-OwL9-C&)4c#FH=`r%sS~>yKhOJ zcIvMs&Rv@~YKeX2Nod~{HkaE+pJmno0R#WJfyz(h5)?N?-CekD{s-j=%O+(_+a>!$ zY=g(zsIU50>Nju6NthSVpFeG_U%1?w*~Z2VCj~c}8vmCRJnwSk+?hWcKJH_Pm^M@T zlwE0Y+B?Rm`K>il>OrpT@{DF?-!`^}nTbrjS!0oR#+h}-%-+v^s;?>q4K0=8x;t8D z{tR@nnL1P7B&IT<^M~Zz*Nk^x?L6RrHJ@qk{O;oYRh%I$HtLcsYD$li+3IF={#{U1 R&cMLH;OXk;vd$@?2>_-@+NA&h delta 1653 zcmaFMJ&{+jGr-TCmrII^fq{Y7)59f*fq_Affq_ArgN=cKfxTo`%S1&nP6iP8>Abss zqJw-rhlsEgf5k=ic?=9}f}SppArXh)&Wy~t5-M`+eaSALh1{u{ty-7FBs8{gT6;7y zcuiDbbv|-qnd*cM8LZ5S!aa@cMs0UH4D~V?0s|HYc6KQpQx%gA2r%pI2w*K-+iCaX z)90tV3uOOozA9!?6rc94?%mGkHP3fH&p)%ZXzic=daem9DGZFax22t(wOXbLO1~tR93e5PTu(`{CpPZwI3dGC#N^GJiWS zypUSF=N5zg2eS?A791tzzq`4(^ky69zl$mVC-NXWq3_k#0}nEqrZej^x2_Urux?Cm zs7db8l()Zkxuw3L?tsaIxCg=sjkmOy_E`&U#??AX#M^z)31IKJsJn;n4D+sv`nBR*tv*MeoP1dQ zgyHI?H{A}b9|S%u`MUDw=jXRKIyVX)I9Xv+wcR9!=}X~ykqFK|OnVqbm`-kdbN6lW z@2Bjs4R0NU4YYk;G@Qwi+Hg%Gxv02k5m%k^2G{@Yuf!%b@b2oJ71ppnIz{cfW$xrJ zyM;A6(gp1|h@W7)wK~`KgXDzz+n0X4vq)q6Ah+Sv$L&s*+t#}W2F6IuV0v@;KYN3+ zgPTrqM&8CWmL&}AOIB<3%W%liD*Ej8Dig0tNM-9P8H<{TF?JMGFXe#`Y6bMv~8 z7v&BL@;ByR*mv&9?1s0IFJFq^R+{Nqtl233NF{dH$FB!$k4a3PJa_Jdl`@-e@mbdg zEMz(>>>zsKT;ItvCpwOcOlp)n@b|#w133y;lmDON3R~I9Var)@eevGi9yj<8^dGt} zeBhKt{zicttaI4^G1RfvvCS)IU1MK&r|&+OPxp0~AlC`IDmd(7o$A^5=qpOKzTe$o zlH3!yt77AHqbkPu6F1K@1~-Pzs=rdSaD%0*ReeZMh>P&|8=NLC5g8^0j2668m|kAG z6TR!x-7?|+1!W=}T+{0>-x0Jr;i#|2w8ZnZ>Bb7Loh#mSaU^eYopO$uyTsaEXT9LX zRot_anNKHP^**w(_JHz%?+2O%zn#7`>v=ORX^?oybQfhl^hodwf^Sa>Q zYm+9(@8)N(&-|)B^9Yw^th?-=@&^wyWaM9HJzRcf-MVi!vDP*nNCoyy>s8LwNe#r=Pk%OVx+9Tdd`H+r2;`SjmfNRTv6zl@o8!8gd-;wekr&&Q@!C%g29jed7+YrE+$=F zzx|N=ChOK$wg<%snRFHaB@PRF%r2A8SC-9jg5)VdL+fV)wK?9 zm7MWFZq2rB*VMu%H*gl+d$;zNn$O;p&x{xE*SjATaA%(T=*)vY!P+=o_IEd;ZZ>C} zd7F1Ib(ux?{v|tZ6#E4SPyX7S^1wG??%RA}j+mWKe&=>gdh~(!fX~DgTQmeB7jFzb zCJ`JNSs7|4)3W)9>;Y|u_ygi;a<+}jT@*L{Go7C>hr=SCBT&{&*p4A=d&;kK*ST(; zH$IkQcr3+EI(b%);oDxr%{6xSSN=cMzCr7E=ps|EqU;5H2{m^2`??LXdVX$h{r;2t Xf5YufuX`P~fNBp li > a { + color: #fff; + text-shadow: 0 1px 0 #111; + } + } + } + + .search { + float: right; + margin-right: 45px; + .search-input { + border: 1px solid #aaa; + background-color: #D2D5DA; + background-color: rgba(255, 255, 255, 0.5); + + &:focus { + background-color: white; + } + } + } + .search-input::-webkit-input-placeholder { + color: #666; + } + .app_logo { + a { + h1 { + background: url('logo_white.png') no-repeat 0px 2px; + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + .separator { + display:none; + } + + } + .project_name { + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + /* + * End of Application Header + * + */ +} diff --git a/app/assets/stylesheets/themes/ui_gray.scss b/app/assets/stylesheets/themes/ui_gray.scss new file mode 100644 index 00000000000..5ee2b0ddfe3 --- /dev/null +++ b/app/assets/stylesheets/themes/ui_gray.scss @@ -0,0 +1,68 @@ +/** + * This file represent some UI that can be changed + * during web app restyle or theme select. + * + * Next items should be placed there + * - link colors + * - header restyles + * + */ +.ui_gray { + + /* + * Application Header + * + */ + header { + + &.navbar-gitlab { + .navbar-inner { + background: #708090; + border-bottom: 1px solid #AAA; + + .nav > li > a { + color: #fff; + text-shadow: 0 1px 0 #111; + } + } + } + + .search { + float: right; + margin-right: 45px; + .search-input { + border: 1px solid #aaa; + background-color: #D2D5DA; + background-color: rgba(255, 255, 255, 0.5); + + &:focus { + background-color: white; + } + } + } + .search-input::-webkit-input-placeholder { + color: #666; + } + .app_logo { + a { + h1 { + background: url('logo_white.png') no-repeat 0px 2px; + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + .separator { + display:none; + } + + } + .project_name { + color:#fff; + text-shadow: 0 1px 1px #111; + } + } + /* + * End of Application Header + * + */ +} diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index 3773e61cce6..a9d2124130d 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -46,7 +46,7 @@ .app_logo { a { h1 { - background: url('logo_white.png') no-repeat 0px -3px; + background: url('logo_white.png') no-repeat 0px 2px; color:#eee; text-shadow: 0 1px 1px #111; } diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 73445ec60d3..0bb14cdd7d7 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -17,11 +17,11 @@ &.navbar-gitlab { .navbar-inner { - background: #333; - border-bottom: 1px solid #111; + background: #567; + border-bottom: 1px solid #AAA; .nav > li > a { - color: #eee; + color: #fff; text-shadow: 0 1px 0 #111; } } @@ -31,7 +31,7 @@ float: right; margin-right: 45px; .search-input { - border: 1px solid rgba(0, 0, 0, 0.7); + border: 1px solid #aaa; background-color: #D2D5DA; background-color: rgba(255, 255, 255, 0.5); @@ -46,8 +46,8 @@ .app_logo { a { h1 { - background: url('logo_white.png') no-repeat 0px -3px; - color:#eee; + background: url('logo_white.png') no-repeat 0px 2px; + color:#fff; text-shadow: 0 1px 1px #111; } } @@ -57,7 +57,7 @@ } .project_name { - color:#eee; + color:#fff; text-shadow: 0 1px 1px #111; } } diff --git a/app/views/profile/design.html.haml b/app/views/profile/design.html.haml index 4eace607ec2..5099ea5d60d 100644 --- a/app/views/profile/design.html.haml +++ b/app/views/profile/design.html.haml @@ -3,28 +3,35 @@ %legend Application theme .themes_opts = label_tag do - .prev - = image_tag "gitlab_default.png" + .prev.default = f.radio_button :theme_id, 1 Default = label_tag do - .prev - = image_tag "gitlab_classic.png" + .prev.classic = f.radio_button :theme_id, 2 Classic = label_tag do - .prev - = image_tag "gitlab_modern.png" + .prev.modern = f.radio_button :theme_id, 3 Modern + + = label_tag do + .prev.gray + = f.radio_button :theme_id, 4 + SlateGray + + = label_tag do + .prev.violet + = f.radio_button :theme_id, 5 + Violet %br .clearfix %fieldset %legend Code review - .themes_opts + .code_highlight_opts = label_tag do .prev = image_tag "white.png" diff --git a/lib/gitlab/theme.rb b/lib/gitlab/theme.rb index 6e2be76508a..7f833867e39 100644 --- a/lib/gitlab/theme.rb +++ b/lib/gitlab/theme.rb @@ -1,10 +1,12 @@ module Gitlab class Theme def self.css_class_by_id(id) - themes = { + themes = { 1 => "ui_basic", 2 => "ui_mars", - 3 => "ui_modern" + 3 => "ui_modern", + 4 => "ui_gray", + 5 => "ui_color" } id ||= 1 -- GitLab