From e44ee826ac1cb21d3af54381608c225e0644b79b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 Mar 2012 23:52:10 +0200 Subject: [PATCH] tree browse -> file icons --- app/assets/images/comment_add.png | Bin 1189 -> 778 bytes app/assets/images/download.png | Bin 3637 -> 599 bytes app/assets/images/file_bin.png | Bin 0 -> 219 bytes app/assets/images/{dir.png => file_dir.png} | Bin app/assets/images/file_empty.png | Bin 0 -> 319 bytes app/assets/images/file_img.png | Bin 0 -> 536 bytes app/assets/images/{txt.png => file_txt.png} | Bin app/assets/stylesheets/common.scss | 1 - app/assets/stylesheets/tree.scss | 1 + app/views/refs/_tree.html.haml | 2 +- app/views/refs/_tree_file.html.haml | 2 +- app/views/refs/_tree_item.html.haml | 9 +++++++-- 12 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 app/assets/images/file_bin.png rename app/assets/images/{dir.png => file_dir.png} (100%) create mode 100644 app/assets/images/file_empty.png create mode 100644 app/assets/images/file_img.png rename app/assets/images/{txt.png => file_txt.png} (100%) diff --git a/app/assets/images/comment_add.png b/app/assets/images/comment_add.png index 010da9644822d1406a862b931da5d80d597220ac..98291d0d2ec34bb277621675008e7e577fee1d2d 100644 GIT binary patch delta 695 zcmZ3=*~K;?zMh#!RM|vvUEpN~2Bt1g7srr@!*8eCXM{KkwC|7SFq|OrPxFdX$J$mw z!5|40C8P6NtqBVSxOJPlIu@*OJ>aBtu%Tl?6Ni~t*fFR3Tuxhre5NO)DoZG8WifRf zo3OEx{r$A^^7lf4M|fg3?%r&C|6f_zeYrI^{^zYSmvG8pw5n%}cl*O?{QH`T1II#f z35IP<-QFx2jCRcYXWzJGHkkNUtMoFyp02#UdTPP*$tpYV2q?5DJlM5ce)6g|+t20Y z^BI?^*s`WI<|XiNxOmrErBbgh^`3h9{Yfe(ee5!_87tH`tW7YTWWwI#wJR&FnDs;F z67K_LYN0Jdb60=A~tFJmmZkcBzf2b#L4vt>bh4 zoT~f&=!s&>L=#_kXO39Q4%Y?RUV2_@w&WSkyg9LHq4T6Z=GRK9&l+c^CT$l}?e60D zJijQoh;0Vjtvj`Wml_3}_zm*X)*EflK9I1E<22)ulg2Afo=8{uWIwxcem#p8L;Pkt z)1?j%Qx$W&8roFP?)q)%`Sw7p=ljO#mfQQ-cAm~>yf8ms#j{9J`;cQo@9z74lTwtr zF2}PiSb9b*<)oiT$$sW#*(YrF%ux!t@_f>|7J*}DbF{+WT5~(xZeYJ@`li>e!u9xt z#`zPqioS=w`={i4`5v45w~f2spT65v|C8Gz)!xl{lAhR_1()VAv~B7tPcSWzu!xsYE^E#75-q=bFKjQ&+{?=6#<-fxGTat^P(ly@%0P^`lq}0|Nttr>mdKI;Vst E06aZ0<^TWy delta 1109 zcmeBTTgo{hzMhF!)PUu&OP&P-1BjD#F>J?>hfa~($D@08coK|i4(QFt|J0Zu} zD|+|Al)GhjUrFtr{pQ}ynbox?&KOz$7GK)LZ~4LS`SWvg-p{KqeioMyUiQ@NWP!`Lp@;`?{}tYF_^-eyx5^&hA}5d+QxPA^rLvKQ0|?Zhv=s605}_Hy>#S zedEH1%kwX(&;Rx1pRAzA(x9$&uY;#tQam9GZprzwmfj6Q>?>VAoNNs@_#4PH z#bC~#PjX9)mNR&SteS1UOX!1o=64<^4#v3E2_-Kad5#@Ba9ZfhtHY1ZKR-~RzedX4 zN7gB=_UYDj&O7$((OG;kqjtw0x!+&Q?A#>l@BRM88e!)C?^@`MEiKl+z9-B#WXo1= zN%r64xJ$@m`DG)i-b403=T0*F#o&8&W5v(pn3J{rzN8!~2FK6=h z_AX_5J1J<_-K`I#_WK7bC-}5Z;mhh{J-6C`XR#`yss*#0ji8f>%Ez31*`-@f9?upP z*d3+*qW*uJJJY?C>fM~jG?wa4W;^-oWM%U%Wu}8KzrDAau^_fJYVB`#(HGa6{Osym zZwbEhI1t~u;7yCiYO#ucWtT3zID7W2sB2)#^25tR*Ia(+syTJe=c#2Zul66ib4SK& z>7^4lZrnK9*x1;yNMllt_u-?$dnQ;s=d}wBUARh%LotZMvHsN4qNM>EcUHfyQk&^h zw!beuJ-yWT@-mI3)qDQWGGt@;ntj7rL*&+c50zzy9&QkE5@0BhVc!|^PGsp87tOzi zx4kV_Q&U?NtNkHAwXW{pg%2M-JbLgT;mRhRM;3h7u3c+$cXL}ed)dvef7=w#q;38X zcPedj-6Xk;18Pnk*+-KM>o@M&Rdvqftoza_0V1xY*UfzA+q(y|-dQ5jz~#U!z$Q?5 z@v+jgLz|U@P8lToJp24}anPy4!v^aj{jP(8=S<-#(@WW)J2H*#qUvGP}y2H?RbJe#ysh`>Wqg#t1zn z2D6w)T~j6rIkiYq)uXwVzopr00UkZ6aWAK diff --git a/app/assets/images/download.png b/app/assets/images/download.png index 50f672c548008cbadd529ff71d1ac79ff583a3c5..d718e07dea3ea6645a3375291f27446661eeb331 100644 GIT binary patch literal 599 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE{(JaZG%Q-e|yQz{EjrrIztF#hy(aSW-r^=7tjUbBHftMAdhFS<5tqewi?DW00x+63%!;z-B1}qXGj<1A_nqlLG?>h||4m z!+mGJx!lgXYIn_Gs@NC%_Z<5U@j?m48D)HlB7f)STx+oBxUS5$eiz3lH?E5>;*K=S z$Gl@|&M4s*hzn`HewXb#LnC{A+ZtxJkIIU#mPqf(RQw{Tz#>=E8Ob@1x#>fy)Sg_; zGm0UMB37;b`XBU`&F7B|{a%$}98%R_&^2*>j&#veHbcc8t5&{cvU(G1oS$k{bbMyW z_`D?cMFMj}$%OUmn%fx|o+|wO^@+`J>4Lr^F;*w|XFDAiX9$0`vVEP!LVnj=g)e$s zviBK$WS?m4Gj=TJdmRyT+|f$6#EEgiV+HOt4>mHcu<+pH_?pTh|DWfiObTn@ix!TA zlQwf%BubW^neTPdc9l?7rB#tD|AXiTMur{kyQThYGMvZ2z`)??>gTe~DWM4flpF4= literal 3637 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 diff --git a/app/assets/images/file_bin.png b/app/assets/images/file_bin.png new file mode 100644 index 0000000000000000000000000000000000000000..b3feafcce0befa79ffbaa68ac6dda0c549cba911 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4i*LmhONKMUokK+Fct^7J29*~C-ahlfq^N> z+ueoXe|!I#{R|8YoCO|{#S9GG!XV7ZFl&wk0|NtliKnkC`yFN;Q5oq=3*ELcFfhb> zx;TbtoPT>}Bkv&x2Id35)vYfCq_Deu>tSJiy;Rw_CP_+4;Q-T(rT%(>eBa9E8PDF- zRFG5ow(`nq!9ySTqV)KkZnEiK5Bx8>MPkY;_kRqNW<}V) z+ueoXe|!I#{R|8YoCO|{#S9GG!XV7ZFl&wk0|NtliKnkC`yFN;QC<Dx|ql z`}FbseQ!l3edXBDym-x-PZ|F5G7rwIobGD8t3bVS!Vwi6K0iJ_yV{EIn%|!~Ca464 z_`5CEIsI;TcjFb-$yWnHU9X8uXS-yOIXOMjP;1qyonLQzF4CE{dY0Cl^PGD$YIkv+ zJuB9DL7+|bVQ8p{uWRvMw~qbH{_b%C_qNQN{3Pr4;d-7!dQH1-t^2(ER?Sa-u9URE VbK47r85kHCJYD@<);T3K0RRj5c5?s# literal 0 HcmV?d00001 diff --git a/app/assets/images/file_img.png b/app/assets/images/file_img.png new file mode 100644 index 0000000000000000000000000000000000000000..ca554c5aefe554beec3745e0c194ed5f1b1fe34f GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&N| z?e4?qQ@IN@j{=qb6=O@vapHX^N(uLca z6eQexe2%dgdzSCy=w#d6S+`ni#pkQ%AIdOp$({X!{n+D;citIE_4;Ye^HF1X!}>mM z-=mAOug~aiu$5m>&3tBqn=9)=mwim)2gPc3)Ufr-%W?S#-ms}`&};jWZYpKALN74R zNo-K*l)+%bG6jF(v?o~+zDkuS^D2<`F|5-+j_?7{`{EqPtnpkJ&`cwCr&7xz<%(Y${OiplDCZ2s?c|(5g)(yWHyCpy6{ob)<#U>5o2P|O; zEmt?PbVu)6y?w@S)fR^?%Pz^29C={|(G&Nr^@y)a5mLIH1B0ilpUXO@geCy^@!cW- literal 0 HcmV?d00001 diff --git a/app/assets/images/txt.png b/app/assets/images/file_txt.png similarity index 100% rename from app/assets/images/txt.png rename to app/assets/images/file_txt.png diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1faf8f263b7..a13458aabf0 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -272,7 +272,6 @@ nav.main_menu { display: inline-block; color: $style_color; position: relative; - box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1); margin: 0; float:left; text-shadow:0 1px 1px white; diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss index 592992541af..d27a24f0a04 100644 --- a/app/assets/stylesheets/tree.scss +++ b/app/assets/stylesheets/tree.scss @@ -144,6 +144,7 @@ th { background:#f5f5f5; + border-color:#f1f1f1; } } diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml index e5908676ae8..63ff6196a1f 100644 --- a/app/views/refs/_tree.html.haml +++ b/app/views/refs/_tree.html.haml @@ -24,7 +24,7 @@ - if tree.up_dir? %tr{ :class => "tree-item", :url => tree.up_dir_path } %td.tree-item-file-name - = image_tag "dir.png" + = image_tag "file_empty.png" = link_to "..", tree.up_dir_path, :remote => :true %td %td diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index 78662229afa..1077a346e6e 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -2,7 +2,7 @@ .view_file .view_file_header .row - .span1.file_icon= image_tag "txt.png" + .span1.file_icon= image_tag( file.image? ? "file_img.png" : "file_txt.png") .span2.mode_text= file.mode .span7.file_name= name .span4.right diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml index 420307c7635..691a2b97369 100644 --- a/app/views/refs/_tree_item.html.haml +++ b/app/views/refs/_tree_item.html.haml @@ -4,9 +4,14 @@ %tr{ :class => "tree-item", :url => tree_file_project_ref_path(@project, @ref, file) } %td.tree-item-file-name - if content.is_a?(Grit::Blob) - = image_tag "txt.png" + - if content.text? + = image_tag "file_txt.png" + - elsif content.image? + = image_tag "file_img.png" + - else + = image_tag "file_bin.png" - else - = image_tag "dir.png" + = image_tag "file_dir.png" = link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true %td.cgray = time_ago_in_words(content_commit.committed_date) -- GitLab