From bf0c3b3d21cf918b074ffa26c018b022721a3464 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 24 Aug 2015 12:16:55 +0200 Subject: [PATCH] reduce grey tones in app navigation, bubble menu and scrollbar --- apps/files/css/files.css | 2 +- apps/files/img/delete.png | Bin 209 -> 243 bytes apps/files/img/delete.svg | 2 +- apps/files/img/external.png | Bin 369 -> 392 bytes apps/files/img/external.svg | 2 +- apps/files/img/folder.png | Bin 160 -> 303 bytes apps/files/img/folder.svg | 4 ++-- apps/files/img/public.png | Bin 297 -> 307 bytes apps/files/img/public.svg | 6 +++--- apps/files/img/share.png | Bin 365 -> 264 bytes apps/files/img/share.svg | 2 +- apps/files/img/star.png | Bin 373 -> 490 bytes apps/files/img/star.svg | 4 ++-- core/css/apps.css | 41 ++++++++++++++++-------------------- core/css/styles.css | 2 +- 15 files changed, 30 insertions(+), 35 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f8c1d03b666..a1b9312b152 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -133,7 +133,7 @@ position: fixed !important; bottom: 44px; width: inherit !important; - background-color: #f5f5f5; + background-color: #fff; } /* double padding to account for Deleted files entry, issue with Firefox */ .app-files #app-navigation > ul li:nth-last-child(2) { diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png index b2ab8c5efefab235fa4bfa1eb06afa0106116a21..e891b370cca7b3d83e937863dbbc9578c5b8b1bd 100644 GIT binary patch delta 227 zcmcb}_?dBnL_G%^0|SHn=l_X7ilx}eGlT;OYB*9lfPBsZkH}&M2Hxu+%;=;sy8hT|5}cn_Ql40p%1~Zju9umYU7Va)kgAtols@~NjTBH(fv1aOh(+(&Nr7Ak6nLB` zSN{L~L$hMW+xyHZ_NPKLN`%{5>u%aj7V?TYWweEFT!`!Y2ng9#!1`#rm_L|MB^U&(t-XW|T<#w)um70$&irgv53YW{$t-il*cn XUC&$i?88QNpydpnu6{1-oD!M& zkY6wZlbEu;jYmjKLSj;GRm1s7Qv-ogE}kxqAso@YCl~TI7>GC=%(iXwoH0dk#!6)d zt~37P8V_c9`R#pTcq4Cvn@h|jhT{JxOCH2*5?}SEG4|R5iEHaMwygTiaAUH}>5lAv QeUPg>UHx3vIVCg!03d`qr2qf` diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg index b6dc2cc4173..f0a3cd4db88 100644 --- a/apps/files/img/delete.svg +++ b/apps/files/img/delete.svg @@ -1,4 +1,4 @@ - + diff --git a/apps/files/img/external.png b/apps/files/img/external.png index 2ac5e9344c33c1abf1b12d115d91d2d3e4240650..af03dbf3e05397a5aa029b699297933729f55d56 100644 GIT binary patch delta 376 zcmV-;0f+wa0*C{U8Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&010qNS#tmY4c7nw z4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs00036Nkl>6CYCA*FL=j3P6q&7qoWw% z1YNvU^tk{GTq67QDl>Z{Y~dj@j|Yq~kL_V&j^bbucXa?$HN`7<>ML&J9KYjq(85N= zencxXyAkn;J#i>WyueLnsw&Qk-)=Ei_;!kSAv5a%ir5jF6}yeY(jLk|DVcennLicR zG}cOEB)}*sNleT}#PS$5%_6_oBJASJ|7{zjA6PFri1HdEVhS^3bnu;-y*-FY&-oAb WnUGyx?$P7`0000;M1%fy{vgdo_$60$rd} z666=mz{teR!p6bL&BG@sA}S@TpscNHU}9$B;OXV#9}yK3mz126o>Nd#UR~d?(opg* zP+x(ki(^OyW9f->J|;y8wuj=e++vK~H$+`ScKrX#GO53%rS{+11?OvKbGmqIs>;VW z6|rsjXZf5b-Ce3(d(y_0$FHKM=UeKVWP7(8b21!$N4JZrr8@97E_af=nSEWZ m+%HG&k@Si5#+K5Sg%A0U_44K|IP%y96l$KXelF{r5}E*ru~6s$ diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg index d1940f2f1b3..80eba5b9960 100644 --- a/apps/files/img/external.svg +++ b/apps/files/img/external.svg @@ -1,4 +1,4 @@ - + diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png index ada4c4c2f882d05c44d53a592309c44d0c6e31f2..4a8861f25ca0bc4709493b03f005491a0ba571d3 100644 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI13?%1G+4BcTB?S0{xB_XKf?xhGdVvUCa2Xlt=PJ4_n}jdp1=I^ZMU*&0#IqZr;B4q#jUGnZt^)8 z2sm7HoVuti>;3=#OOF_FE_Ql!wAS`y>+U%g(Lz&}#05{8)GKAYRVLYE$wbA8d(=%> z|IFyU(kMNbYwg^kPgByo{yW)}yX~KbLh* G2~7Y(dQVsY literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ{r~?zkckFt+ujrch1g4i z{DK*H6!Hs;>NyroKLZpp_H=O!;fPL7XkeVSC4{3{SC{u30~51^GUEx47OgaI25!p( n5}Xy1o(67GQw~mIyV}RdQ2Rut*RtbFHpmiBS3j3^P6 - - + + diff --git a/apps/files/img/public.png b/apps/files/img/public.png index f49c5fb1ee555b025a3645238a90515a6baf0f8a..772838ad2058e5e6e16c9fcb13e1bb6708155238 100644 GIT binary patch delta 205 zcmV;;05bon0fjm!aBi0001UNkl2atPc;S!O2v{`cqASsqg|rJoMk?mBx@`!jiw zabx&;4-9MV0m%w@Y)}?ym2V73=HhyZ5;T5y1EN6&)&Sqv0{{R307*qoM6N<$f*`(7 A8vp - - - + + + diff --git a/apps/files/img/share.png b/apps/files/img/share.png index 61c87e78b6cc9f46d9ffec57af4e9961b6a85964..fdacbbabebcf013a5a80907b3e62cb2e3c0ee26d 100644 GIT binary patch delta 247 zcmV0*C^T8Gi-<001BJ|6u?C0MAK8K~y-)WBC97KLaJ0c!dlMra-(Ii0=Y% zB@i=_YQRMx{*Q#ch&BKST+lRw@Kk~Z0D&eDuK?nISPXDPF#rf;fjA9_<$+igh!+F# zU#Q~8KwJ*Q%YpbP5GSGpA`rv?@gJz-e@N_SK%5K2?091V2yo7!IqxSB7XdLRQPBtl z$I%S<3dCVR%t)*Oen9*gs`)RHL6?Cz7@tANfyf8M0YEGY#I``Z56PelK%5H1i?9YF xo@jIc;)7VC5HlJH7!*cULZVtyrb=eQg#qdo4PA^R@Y4VQ002ovPDHLkV1nC8U~B*Y literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V}MVH>;M1%fy@B}jq6q!0j<|A z3GxeOU}R!p=i=iR5|NTqP*PRb(AG0BHnFhr3Ji&iPe@8m&&bZpFRHArsjE-fZpR1I zR^aL47*fGl+kaf>kOPmivwq7Y0VePGUHAXjD?FY#cdPyfziE7vV*Vsn?Z~&j*Ky#` zOUna#r%%c)y;6On=a^%~mWO-7V!1ia`)>D$Y4pFnc?0){b+Pw9wH{b&w0ytRnLYt& n-m_Ddhh&G;&G7yIbIwOrTRrXz9ku5iK_TYp>gTe~DWM4flxSBb diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg index 97f52f2e783..d67d35c6e56 100644 --- a/apps/files/img/share.svg +++ b/apps/files/img/share.svg @@ -1,6 +1,6 @@ - + diff --git a/apps/files/img/star.png b/apps/files/img/star.png index 6b0ec67ec1c5729ca1d758e271c84ff1a328f707..3c66c49a8c4e07667790aa1e0597229a67ece20b 100644 GIT binary patch literal 490 zcmVK~zYIwbnmN98na9;b+$vf`V*}g(7ZaArXW$!NM4#jg^fl z7wr_%`vFpTb0<4LINbSj&Uw$h zoSAzG*8rY`22~4yRw6512RK5dOvo$ziEOq^&~^f}Sr%j%w+T=agL#8PnqdvSiTg)b z4v5dC2l(ONY+^gq<)&Clfy6eGCqV^IF@(pcMPvK*GmK^AIKfw3;5-^H+r~3kz^@J! z|F1RCh^v~y_Yxo{c;3DQBiQdEw*>+BcrUQ!-{5xu?Hg^Z^p*~4VQ zXB3}O{OTc~)kNT_)?p;8qZaWq;or#cOVt+cw6^O!N2?k(qL>dMpj}Ld1Vnm)k9nP| g=qUh+^)T(>UjS6k{<;M1%fy{vgdo_$60$rd} z666=mz{teH&dtNiFCZ)`B`qT>ud1n~qibbt=iuQT5g8Smol{U$TvA$IRb5w~a=ahp zu@X-g#}En0(1YwkO$H3E2iX^`SP_ww6Q~pM;r{gTe~DWM4fmiAYc diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg index fb3eef1e452..3207f6f9a46 100644 --- a/apps/files/img/star.svg +++ b/apps/files/img/star.svg @@ -1,6 +1,6 @@ - - + + diff --git a/core/css/apps.css b/core/css/apps.css index 17595479ae2..846eba8e4bf 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -22,7 +22,7 @@ height: 100%; float: left; -moz-box-sizing: border-box; box-sizing: border-box; - background-color: #f5f5f5; + background-color: #fff; padding-bottom: 44px; -webkit-user-select: none; -moz-user-select: none; @@ -42,10 +42,6 @@ width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; } -#app-navigation .active, -#app-navigation .active a { - background-color: #ddd; -} #app-navigation .active.with-menu > a, #app-navigation .with-counter > a { @@ -56,14 +52,6 @@ padding-right: 90px; } -#app-navigation li:hover > a, -#app-navigation li:focus > a, -#app-navigation a:focus, -#app-navigation .selected, -#app-navigation .selected a { - background-color: #ddd; -} - #app-navigation .with-icon a, #app-navigation .app-navigation-entry-loading a { padding-left: 44px; @@ -82,7 +70,17 @@ -moz-box-sizing: border-box; box-sizing: border-box; white-space: nowrap; text-overflow: ellipsis; - color: #333; + color: #000; + opacity: .5; +} +#app-navigation .active, +#app-navigation .active a, +#app-navigation li:hover > a, +#app-navigation li:focus > a, +#app-navigation a:focus, +#app-navigation .selected, +#app-navigation .selected a { + opacity: 1; } #app-navigation .collapse { @@ -296,7 +294,7 @@ .bubble, #app-navigation .app-navigation-entry-menu { position: absolute; - background-color: #eee; + background-color: #fff; color: #333; border-radius: 3px; border-top-right-radius: 0; @@ -324,7 +322,7 @@ .bubble:after, #app-navigation .app-navigation-entry-menu:after { border-color: rgba(238, 238, 238, 0); - border-bottom-color: #eee; + border-bottom-color: #fff; border-width: 10px; margin-left: -10px; } @@ -473,13 +471,10 @@ #app-settings.opened #app-settings-content { display: block; } -#app-settings-header { - background-color: #eee; -} #app-settings-content { display: none; padding: 10px; - background-color: #eee; + background-color: #fff; } #app-settings.open #app-settings-content { display: block; @@ -499,7 +494,7 @@ width: 100%; padding: 0; margin: 0; - background-color: transparent; + background-color: #fff; background-image: url('../img/actions/settings.svg'); background-position: 14px center; background-repeat: no-repeat; @@ -512,11 +507,11 @@ } .settings-button:hover, .settings-button:focus { - background-color: #ddd; + background-color: #fff; } .settings-button.opened:hover, .settings-button.opened:focus { - background-color: transparent; + background-color: #fff; } /* buttons */ diff --git a/core/css/styles.css b/core/css/styles.css index 8b89837bcec..cad407b52ea 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -186,7 +186,7 @@ input img, button img, .button img { background-color: transparent; } ::-webkit-scrollbar-thumb { - background: #ccc; + background: #ddd; }