Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-03 02:47:51 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-03 02:47:51 +0300
commit2bd70b6a01b6b5b3406718d1f539f9f480cf3bec (patch)
treeb3b4d3bde71874530598e45d9c5a67c9cf449c7a
parentc0acb28c4ec710c90eb55dc996251a30001c8e79 (diff)
Improve project icons for dashboard
-rw-r--r--app/assets/stylesheets/sections/dashboard.scss10
-rw-r--r--app/views/dashboard/_groups.html.haml3
-rw-r--r--app/views/dashboard/_project.html.haml4
-rw-r--r--app/views/groups/_projects.html.haml4
-rw-r--r--app/views/users/_groups.html.haml4
5 files changed, 18 insertions, 7 deletions
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index 90010781af0..17c0cd81b93 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -97,7 +97,17 @@
.dash-project-avatar {
float: left;
+
+ .avatar {
+ margin-top: -8px;
+ margin-left: -15px;
+ @include border-radius(0px);
+ }
+ .identicon {
+ line-height: 40px;
+ }
}
+
.dash-project-access-icon {
float: left;
margin-right: 5px;
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index ddabd6e0d52..ddf44270802 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -10,7 +10,8 @@
- groups.each do |group|
%li.group-row
= link_to group_path(id: group.path), class: dom_class(group) do
- = image_tag group_icon(group.path), class: "avatar s24"
+ .dash-project-avatar
+ = image_tag group_icon(group.path), class: "avatar s40"
%span.group-name.filter-title
= truncate(group.name, length: 35)
%span.arrow
diff --git a/app/views/dashboard/_project.html.haml b/app/views/dashboard/_project.html.haml
index 76b95264fd8..e9f411725a3 100644
--- a/app/views/dashboard/_project.html.haml
+++ b/app/views/dashboard/_project.html.haml
@@ -1,8 +1,8 @@
= link_to project_path(project), class: dom_class(project) do
+ .dash-project-avatar
+ = project_icon(project.to_param, alt: '', class: 'avatar s40')
.dash-project-access-icon
= visibility_level_icon(project.visibility_level)
- .dash-project-avatar
- = project_icon(project.to_param, alt: '', class: 'avatar s24')
%span.str-truncated
%span.namespace-name
- if project.namespace
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 34221595fd7..a2f1d28a275 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -12,10 +12,10 @@
- projects.each do |project|
%li.project-row
= link_to project_path(project), class: dom_class(project) do
+ .dash-project-avatar
+ = project_icon(project.to_param, alt: '', class: 'avatar s40')
.dash-project-access-icon
= visibility_level_icon(project.visibility_level)
- .dash-project-avatar
- = project_icon(project.to_param, alt: '', class: 'avatar s24')
%span.str-truncated
%span.project-name
= project.name
diff --git a/app/views/users/_groups.html.haml b/app/views/users/_groups.html.haml
index 32a1dc83b57..b66a8808f87 100644
--- a/app/views/users/_groups.html.haml
+++ b/app/views/users/_groups.html.haml
@@ -1,4 +1,4 @@
.clearfix
- groups.each do |group|
- = link_to group, class: 'profile-groups-avatars', title: group.name do
- = image_tag group_icon(group.path), class: 'avatar avatar-inline s40'
+ = link_to group, class: 'profile-groups-avatars inline', title: group.name do
+ = image_tag group_icon(group.path), class: 'avatar avatar-tile s40'