From 860e3ab526bbcccd64aac45fa377c14e78ef345c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 19 May 2012 12:25:16 +0300 Subject: [PATCH] Event feed: Icons for some events --- app/assets/images/event_mr_merged.png | Bin 0 -> 463 bytes app/assets/images/event_push.png | Bin 0 -> 632 bytes app/assets/stylesheets/common.scss | 7 +++++++ app/assets/stylesheets/ui_basic.scss | 1 - app/assets/stylesheets/ui_mars.scss | 1 - app/views/events/_event_merge_request.html.haml | 2 ++ app/views/events/_event_push.html.haml | 2 ++ 7 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 app/assets/images/event_mr_merged.png create mode 100644 app/assets/images/event_push.png diff --git a/app/assets/images/event_mr_merged.png b/app/assets/images/event_mr_merged.png new file mode 100644 index 0000000000000000000000000000000000000000..30aea0b6e55985cc8e881d952d1f4282cc80a046 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4mJh`hTcwDUIqpR#^NA%Cx&(BWL`2bFt8}yy|8U-VLpPqSfz~KSI49-uPE5GJPT5e{RVa#0c+U9*#E`KreRAb==arWSg zuh|#yhV0$u|MA|#9=7?7t_yS;46+=UYQEK;J~h+mgWS~Pd$*ljF#S^bAOD13;tvYX zMVo%qU$7O1)s{;SZ-1v5D z+h(gh90{zE>kqJP;M~LVRV0I9daSN?dRXJv7Y)%19&PnavC?wTzI0`(@mHPG-k%P7 z8x9cJ<|}o33wDHCxyCQ$lSPe}bb)uK?Qz=D^nU>|@6nUNJB* OFnGH9xvXdMXpo3U0|}%I9l1 zc-TZ_v#ID7!=9BYea8}~HkgP!u8_R>Hk$wZ<$#zqQ||RDU-dB%c25?_;gC0sn%UxZ z=83aZ*F&#q(KGxCG|%09(7!)fJMYSra_;LNS3i26^e5)e*6_m*mYawiH*Kg+o%ie^8yb{$hCOC7WrdY^<|*V(uJQifaDUbx9`WzdP$2&TXe`c871@XC?Th zG$#ITaMd;`mdKI;Vst05qBu7XSbN literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c7112de3120..ca797ed06f4 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -645,6 +645,13 @@ p.time { .avatar { width:32px; } + .event_icon { + float:right; + margin-right:2px; + img { + width:20px; + } + } ul { margin-left:50px; margin-bottom:5px; diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index b60662c0b4b..16517dc73be 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -83,7 +83,6 @@ .project_name { float:left; - width:360px; margin:0; margin-right:30px; font-size:20px; diff --git a/app/assets/stylesheets/ui_mars.scss b/app/assets/stylesheets/ui_mars.scss index 24951991dd3..feb02e1febc 100644 --- a/app/assets/stylesheets/ui_mars.scss +++ b/app/assets/stylesheets/ui_mars.scss @@ -97,7 +97,6 @@ } .project_name { float:left; - width:360px; margin:0; margin-right:30px; font-size:20px; diff --git a/app/views/events/_event_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml index ecb0e9ff394..5c1c66e0afb 100644 --- a/app/views/events/_event_merge_request.html.haml +++ b/app/views/events/_event_merge_request.html.haml @@ -1,3 +1,5 @@ +- if event.action_name == "merged" + .event_icon= image_tag "event_mr_merged.png" = image_tag gravatar_icon(event.author_email), :class => "avatar" %strong #{event.author_name} %span.event_label= event.action_name diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml index a94dc653dd8..aff66385681 100644 --- a/app/views/events/_event_push.html.haml +++ b/app/views/events/_event_push.html.haml @@ -1,7 +1,9 @@ %div + .event_icon= image_tag "event_push.png" = image_tag gravatar_icon(event.author_email), :class => "avatar" %strong #{event.author_name} %span.event_label= event.push_action_name + = event.ref_type = link_to project_commits_path(event.project, :ref => event.ref_name) do %strong= event.ref_name at -- GitLab