From 84c2fe85b72a0ef2c3b56075316f75153ba07ae7 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 8 Apr 2015 19:25:28 +0200 Subject: [PATCH] add icons to files sidebar, fix shade, fix position of settings icon and text --- apps/files/css/files.css | 21 +++++++++++++++++++++ apps/files/img/delete.png | Bin 0 -> 209 bytes apps/files/img/delete.svg | 4 ++++ apps/files/img/external.png | Bin 0 -> 369 bytes apps/files/img/external.svg | 4 ++++ apps/files/img/folder.png | Bin 0 -> 160 bytes apps/files/img/folder.svg | 6 ++++++ apps/files/img/public.png | Bin 0 -> 297 bytes apps/files/img/public.svg | 7 +++++++ apps/files/img/share.png | Bin 0 -> 365 bytes apps/files/img/share.svg | 6 ++++++ apps/files/img/star.png | Bin 0 -> 373 bytes apps/files/img/star.svg | 6 ++++++ apps/files/templates/appnavigation.php | 9 +++++++-- core/css/apps.css | 9 +++++++-- core/img/actions/info.png | Bin 325 -> 315 bytes core/img/actions/info.svg | 2 +- core/img/actions/search.png | Bin 306 -> 293 bytes core/img/actions/search.svg | 2 +- core/img/actions/settings.png | Bin 257 -> 256 bytes core/img/actions/settings.svg | 6 +++--- core/img/actions/star.png | Bin 565 -> 496 bytes core/img/actions/star.svg | 4 ++-- core/img/places/file.png | Bin 178 -> 174 bytes core/img/places/file.svg | 2 +- core/img/places/home.png | Bin 195 -> 191 bytes core/img/places/home.svg | 2 +- 27 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 apps/files/img/delete.png create mode 100644 apps/files/img/delete.svg create mode 100644 apps/files/img/external.png create mode 100644 apps/files/img/external.svg create mode 100644 apps/files/img/folder.png create mode 100644 apps/files/img/folder.svg create mode 100644 apps/files/img/public.png create mode 100644 apps/files/img/public.svg create mode 100644 apps/files/img/share.png create mode 100644 apps/files/img/share.svg create mode 100644 apps/files/img/star.png create mode 100644 apps/files/img/star.svg diff --git a/apps/files/css/files.css b/apps/files/css/files.css index d34013db499..455ccae3f96 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -103,6 +103,27 @@ min-height: 100%; } +/* icons for sidebar */ +.nav-icon-files { + background-image: url('../img/folder.svg'); +} +.nav-icon-favorites { + background-image: url('../img/star.svg'); +} +.nav-icon-sharingin, +.nav-icon-sharingout { + background-image: url('../img/share.svg'); +} +.nav-icon-sharinglinks { + background-image: url('../img/public.svg'); +} +.nav-icon-extstoragemounts { + background-image: url('../img/external.svg'); +} +.nav-icon-trashbin { + background-image: url('../img/delete.svg'); +} + /* move Deleted Files to bottom of sidebar */ .nav-trashbin { position: fixed !important; diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..b2ab8c5efefab235fa4bfa1eb06afa0106116a21 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ{r~?zkVzysV6}MxP$_>& 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` literal 0 HcmV?d00001 diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg new file mode 100644 index 00000000000..b6dc2cc4173 --- /dev/null +++ b/apps/files/img/delete.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/files/img/external.png b/apps/files/img/external.png new file mode 100644 index 0000000000000000000000000000000000000000..2ac5e9344c33c1abf1b12d115d91d2d3e4240650 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}OMp*^>;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$ literal 0 HcmV?d00001 diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg new file mode 100644 index 00000000000..d1940f2f1b3 --- /dev/null +++ b/apps/files/img/external.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..ada4c4c2f882d05c44d53a592309c44d0c6e31f2 GIT binary patch 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 new file mode 100644 index 0000000000000000000000000000000000000000..f49c5fb1ee555b025a3645238a90515a6baf0f8a GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Uw}`D>;M1%flO+FBb+Y{fo4gS z1o;Isu&{FTib%^TYG`U3I5@jR$7E!eR#aBk)_?D4cn4Hf;OXKRQgN&F^hF^D1(BAA zyqzkOg1`NZpCXyMYh(HSnV%omTX~f9`X;HxX0O*tek>Xgnf1Sd!RC7r#~ruGG_}9~ zzCXVjDHm+CbUxp$cUINGzbhveCjY47=gEG{c#^9kCqOK7YCezqvqx2(LMC + + + + + + diff --git a/apps/files/img/share.png b/apps/files/img/share.png new file mode 100644 index 0000000000000000000000000000000000000000..61c87e78b6cc9f46d9ffec57af4e9961b6a85964 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg new file mode 100644 index 00000000000..97f52f2e783 --- /dev/null +++ b/apps/files/img/share.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/files/img/star.png b/apps/files/img/star.png new file mode 100644 index 0000000000000000000000000000000000000000..6b0ec67ec1c5729ca1d758e271c84ff1a328f707 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}OMp*^>;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 literal 0 HcmV?d00001 diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg new file mode 100644 index 00000000000..fb3eef1e452 --- /dev/null +++ b/apps/files/img/star.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php index 8e72fe63316..5521a5d44fa 100644 --- a/apps/files/templates/appnavigation.php +++ b/apps/files/templates/appnavigation.php @@ -1,7 +1,12 @@
-
    +
    diff --git a/core/css/apps.css b/core/css/apps.css index e8c60bd4773..9b662cc31af 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -457,11 +457,16 @@ width: 100%; padding: 0; margin: 0; - background-color: transparent; background-image: url('../img/actions/settings.svg'); - background-position: 10px center; background-repeat: no-repeat; + background-color: transparent; + background-image: url('../img/actions/settings.svg'); + background-position: 14px center; + background-repeat: no-repeat; box-shadow: none; border: 0; border-radius: 0; + text-align: left; + padding-left: 42px; + font-weight: normal; } .settings-button:hover, .settings-button:focus { diff --git a/core/img/actions/info.png b/core/img/actions/info.png index cb25905a5c5bffcb02d89368153ef738b1fc8433..b280a019ab4beb72c254931fe604c9c1effa1085 100644 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}QGic~>;M1%flPXWLtRmKfcB}C z1o;IsFtc%T^YZbF$*F5-Y3u46o7+1$xwyJ}`h`cvC8TF$mQ+;MH#l%8mH>4GdAc}; zNJ!QmbQNlG5MViQD7UbjZN>lkLVuSMc?IGALn;Ag(*iafJ8FKsdD1*#mg+q_9bO!s zDl2kWUS&Ry!cmietaAZrVS#)PA6$(RXtO=kZEse>Qha&Zgfk%jd%F6$taD0e0s!*4 BKd}G+ literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}MSxF;>;M1%flLJj1yNB^B_$;p z85wD5X(=fwAX`pO4#)*c0U1CbD=RB6FApRkYzPA`4pISA16KwYgfNgvgXIxIAg7cB z`2{nuaPaU835&>SnVDPL*g3iTMnuNOC#Iz3Rn^osw@;ijdC}q(t2S*;xURDms3*kJ z#WAGfR_zH_p#}#Y){75#-mPo?^ZWh;(a@7j_twpho5|-HG4b@o5VOCVWo~}7{9y81 z+E{+={soE;9aL_y+88or2zm7s`DlckI^MV1?8gf;S9v-2r7Y6}^d7PU&1dj*^>bP0 Hl+XkKss2@K diff --git a/core/img/actions/info.svg b/core/img/actions/info.svg index 527c1d3dbd1..3be67826423 100644 --- a/core/img/actions/info.svg +++ b/core/img/actions/info.svg @@ -1,5 +1,5 @@ - + diff --git a/core/img/actions/search.png b/core/img/actions/search.png index 82ebac972553a1cb3920657a37033fd646d9e2d3..5f4767a6f461956689bc15b231cafe91e5690481 100644 GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}NPtg>>;M1%flTUx4SfrRfhNk7 z1o;Ish)c=HDyV4a7}|Jv`bT8s<`ou~mRD3&*VZ>wM9eS(s!Q>7aSW-rmFs_9s6m0} zG8dnSj0VTg|NleY$GCo;l)Y=x8~#HP*++s`cgP0b{VQQIk?-Ry!wc-0GlDlPXyz~z zJyx>RyKm9Md`9)SV{O~!JyiWXTR*~k*#zem6>9zSmQM-(*t?IhO`lEmw`2NGkWW2b L{an^LB{Ts5S9eS3 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}Y=BRQ>;M1%6%-U?z(7$^5y+O8 zmzR~51q#T?$pN`QHjn`XKye5IE`ltGEDL8}_gEpX`aaym~_xs5dfm0Vv7cb-sy0AP!fltU_pTQ69wdEqB_1rq2 zQrG04;xtRHJ1m)fZc0X@_6#Lmt9eGUkMqCqiaukPkGL}bHPAu^Pgg&ebxsLQ0QOB- AfB*mh diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg index 7e7a41a2ea7..6024607dd0a 100644 --- a/core/img/actions/search.svg +++ b/core/img/actions/search.svg @@ -1,5 +1,5 @@ - + diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png index 28f01bc79277d8f2d2fbe2163d10072670abb730..3ab939ca37a4fb3a96846aed3102acef0efd7416 100644 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`>;M1%flTs%#&v-(piYsJ zAirP+MivPLO#@?V2X`M||ES#j^1Avr+SPSH`FKwk$B+uf)P7ICBMuzQir!Y$PS^kc zw{prTDvT8nGukG~JL~Vq(l5e(^5NT`D8)6H?X!(bx$ynvE#)(GEfY@eJP`QL w=IK9%vt|$U9UWa73%{JU#75+xUNya##0)78&qol`;+0FiS-rT_o{ delta 218 zcmZo*YGj(AU$3pLEhi_Zq@*M-FArqM$jAUmAR7*VTnLbrl?4hy*oD6=su&m;L`s7E zf*Baulyt3}Jwl>VvUBq5X3kx{adYdOUsHkd37#&FAr-e$`#t#@40xEOy~HyjFa7)< zAGqSdq@6Asb=3KSCo`$mc=TRc=)LCCJN7E(JEsy)E&B5!X&Os%{PkJ~F1O|!W9QjF zV~qbE%F8`q*(!Wv&f(M@+VA+kuYCRJmX+MzeH^L0Wo!*V%NRUe{an^LB{Ts54c|)Q diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg index 51bd7460389..251bd54c19d 100644 --- a/core/img/actions/settings.svg +++ b/core/img/actions/settings.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/core/img/actions/star.png b/core/img/actions/star.png index 6a04282f3faa01e8ea5bc772925cf1496e8715b1..88e4ad54584fa3cae3d390938aaee9afb0b547fc 100644 GIT binary patch delta 481 zcmV<70UrLf1n>ip8Gi-<006|aY&!q|00eVFNmK|32nc)#WQYI&010qNS#tmY4c7nw z4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs0004PNkl)v?%JIoUnIvt}O{&dbc4KXc~Hys0W(l;jxtRrR4ueyyaA>go)lT%!s(VRd)W21%jGxW(#g_Lr zlYB+1Rn?E+I)83-sC*v1NL5L40k_RJ*KPWV$5r(%lg&$V8h3H@KcS!SpsGGXnk$`T z4fk+jPUw3)tg0`6S<`n#l0NR>d`IXTJgurRg$FKu*h$qv~R`6KIb^DP$ zoN5ak1m5TXo#@ XpJ|rzss#UA5UcGwz_U(%o zF9I1yjvP62=FFu_mrk5Gaqir?lP6D}hJmwZ&jLkGojL_n0B6G_p)^n&2!I@95~v;s zfPxSPgoJQ`%79#C600&~jU=(tuWUL2^s-M$kY6wZBNHM?tjv*3~r3X91nj9EdFNjYIYU%Wx9ldB#$g-un&*C)I-v8f! z+)_q@>qVT)IlT$b3L8XjuHV|F(!FKE7stMd1-=VgcBFIFwoIA4r?U9=p4&k`_HCDb z>K)5!B`3T`FQ8m<^Gc^3Q6Ksv1@~R%tgpN-U{SaDO9{)%3#kXrDkKFM31$Xw5|j)q zu-Dw<5EP~oUz+PtRM~LB(sI4y3ZIiqPT$Tu^X<#YzwUIxP+=zDzwPYbWlVBc`|R2d PbUcHntDnm{r-UW|Mg>Ck diff --git a/core/img/actions/star.svg b/core/img/actions/star.svg index c2b3b60a2b8..36e08170a9a 100644 --- a/core/img/actions/star.svg +++ b/core/img/actions/star.svg @@ -1,6 +1,6 @@ - - + + diff --git a/core/img/places/file.png b/core/img/places/file.png index c2e5db953a805e680647a70fa855337678b001f9..e0f04c31731f10b7881e85d6bcbae6f8b795ff55 100644 GIT binary patch delta 146 zcmdnQxQ=mxO1)x$Pl)UP|Nj~Ag1ZGN;Xno4B|(0{3<8oe@+D;zl~oPuTRY5v!iJtM zjv*Y;$q5b2+d@}|sWwW)I2r)^>OI q0;Qha3$x0C8xL|V+O8zS$l!X{kSmP8j`=%KH-o3EpUXO@geCyZP%l9M diff --git a/core/img/places/file.svg b/core/img/places/file.svg index be6d9866835..7db9a201a9f 100644 --- a/core/img/places/file.svg +++ b/core/img/places/file.svg @@ -1,5 +1,5 @@ - + diff --git a/core/img/places/home.png b/core/img/places/home.png index 5cf94495c34a434b6eb4fb2ddb3de4826f5c243e..2e0313d59a7a5c8502f81dc8806c2429e744b1cc 100644 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!dVo)e>;M1%flPuxX{z5mpd#Lq zAirP+b1NHLJ9`I5C+GSGk1x^oKnW{P7srr_TU*aqaxp0IuwLAeU;O`bm%=QOY5Vf* z6h8^=dCS3f;cS3&l67wTnTzG|zDp9Wls5nSn7u*m%~>`j7Z1@EkQ+Q*{an^LB{Ts5 Dw39L? delta 167 zcmdnbc$jg5O1)NqPl)UP|NrIWv_e z@QBFhn7B=wHET>i0%fc`T^vIyZf!lWQ;@CZ4RM$UxK39R^ xx@1H{WU%<36?c{?+>%n_4WB;w - + -- 2.39.5