diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/ui_mars.scss | 8 | ||||
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/roles/push_observer.rb (renamed from app/roles/project_push.rb) | 2 | ||||
| -rw-r--r-- | app/views/team_members/_show.html.haml | 2 |
6 files changed, 21 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 80b68b0ae21..3a9167661a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,11 @@ v 2.8.0 - Bulk issues update - Issues API - Cucumber coverage increased + - Post-receive files fixed + - UI improved + - Application cleanup + - more cucumber + - capybara-webkit + headless v 2.7.0 - Issue Labels diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index e3f3e7af871..8bc63e257b1 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -330,16 +330,20 @@ img.avatar { float:left; margin-right:15px; width:40px; - border:2px solid #ddd; + border:1px solid #ddd; + padding:1px; &.s16 { width:16px; + height:16px; } &.s24 { width:24px; + height:24px; } &.s32 { width:32px; + height:32px; } } diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index 2808ad32397..c630f388945 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -20,6 +20,10 @@ .fbtn { .btn { + i { + position: relative; + top: 1px; + } margin-left:8px; background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595D63), to(#31363E)); background-image: -webkit-linear-gradient(#595D63 6.6%, #31363E); @@ -32,6 +36,10 @@ background-image: -moz-linear-gradient(#595D63 6.6%, #202227); background-image: -o-linear-gradient(#595D63 6.6%, #202227); background-position:0 0; + color:#fff; + i { + @extend .icon-white; + } } border: 1px solid #31363E; diff --git a/app/models/project.rb b/app/models/project.rb index 714953c64c7..3fe11916504 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2,7 +2,7 @@ require "grit" class Project < ActiveRecord::Base include Repository - include ProjectPush + include PushObserver include Authority include Team diff --git a/app/roles/project_push.rb b/app/roles/push_observer.rb index 02025384e48..1067404d5af 100644 --- a/app/roles/project_push.rb +++ b/app/roles/push_observer.rb @@ -1,4 +1,4 @@ -module ProjectPush +module PushObserver def observe_push(oldrev, newrev, ref, user) data = post_receive_data(oldrev, newrev, ref, user) diff --git a/app/views/team_members/_show.html.haml b/app/views/team_members/_show.html.haml index f47554c1dad..2dc4fb652dd 100644 --- a/app/views/team_members/_show.html.haml +++ b/app/views/team_members/_show.html.haml @@ -9,7 +9,7 @@ %span.label Blocked = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do - = image_tag gravatar_icon(user.email, 40), class: "avatar" + = image_tag gravatar_icon(user.email, 40), class: "avatar s32" = link_to project_team_member_path(@project, member), title: user.name, class: "dark" do %strong= truncate(user.name, lenght: 40) %br |