summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-07-22 16:47:44 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-07-22 16:47:44 +0300
commit87a5d7121bd3ce8362cc75b09566dd3d71f98bd7 (patch)
tree4c3c08da92198c2734b1c7443993dedc9f348cda
parent033e5423a2594e08a7ebcd2379bd2331f4c39032 (diff)
downloadgitlab-ce-87a5d7121bd3ce8362cc75b09566dd3d71f98bd7.tar.gz
Add light border to rounded avatarsdz-avatar-border
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/framework/avatar.scss20
-rw-r--r--app/assets/stylesheets/pages/dashboard.scss4
-rw-r--r--app/views/groups/show.html.haml2
-rw-r--r--app/views/projects/_home_panel.html.haml2
4 files changed, 13 insertions, 15 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 8b6ddf8ba18..c79b22d4d21 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -5,6 +5,7 @@
height: 40px;
padding: 0;
@include border-radius($avatar_radius);
+ border: 1px solid rgba(0, 0, 0, .1);
&.avatar-inline {
float: none;
@@ -15,8 +16,9 @@
&.s24 { margin-right: 4px; }
}
- &.group-avatar, &.project-avatar, &.avatar-tile {
+ &.avatar-tile {
@include border-radius(0);
+ border: none;
}
&.s16 { width: 16px; height: 16px; margin-right: 6px; }
@@ -43,12 +45,12 @@
&.s16 { font-size: 12px; line-height: 1.33; }
&.s24 { font-size: 14px; line-height: 1.8; }
&.s26 { font-size: 20px; line-height: 1.33; }
- &.s32 { font-size: 20px; line-height: 32px; }
- &.s40 { font-size: 16px; line-height: 40px; }
- &.s60 { font-size: 32px; line-height: 60px; }
- &.s70 { font-size: 34px; line-height: 70px; }
- &.s90 { font-size: 36px; line-height: 90px; }
- &.s110 { font-size: 40px; line-height: 112px; font-weight: 300; }
- &.s140 { font-size: 72px; line-height: 140px; }
- &.s160 { font-size: 96px; line-height: 160px; }
+ &.s32 { font-size: 20px; line-height: 30px; }
+ &.s40 { font-size: 16px; line-height: 38px; }
+ &.s60 { font-size: 32px; line-height: 58px; }
+ &.s70 { font-size: 34px; line-height: 68px; }
+ &.s90 { font-size: 36px; line-height: 88px; }
+ &.s110 { font-size: 40px; line-height: 108px; font-weight: 300; }
+ &.s140 { font-size: 72px; line-height: 138px; }
+ &.s160 { font-size: 96px; line-height: 158px; }
}
diff --git a/app/assets/stylesheets/pages/dashboard.scss b/app/assets/stylesheets/pages/dashboard.scss
index cf7567513ec..42928ee279c 100644
--- a/app/assets/stylesheets/pages/dashboard.scss
+++ b/app/assets/stylesheets/pages/dashboard.scss
@@ -36,10 +36,6 @@
.dash-project-avatar {
float: left;
-
- .avatar {
- @include border-radius(50%);
- }
}
.dash-project-access-icon {
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index eddeae98bc4..53ed4fa991d 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,7 +6,7 @@
.cover-block.groups-cover-block
%div{ class: container_class }
- = image_tag group_icon(@group), class: "avatar group-avatar s70"
+ = image_tag group_icon(@group), class: "avatar group-avatar s70 avatar-tile"
.group-info
.cover-title
%h1
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index cf11723dc8e..51f74f3b7ce 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -1,7 +1,7 @@
- empty_repo = @project.empty_repo?
.project-home-panel.text-center{ class: ("empty-project" if empty_repo) }
%div{ class: container_class }
- = project_icon(@project, alt: @project.name, class: 'project-avatar avatar s70')
+ = project_icon(@project, alt: @project.name, class: 'project-avatar avatar s70 avatar-tile')
%h1.project-title
= @project.name
%span.visibility-icon.has-tooltip{data: { container: 'body' }, title: visibility_icon_description(@project)}