summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-04 14:13:25 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-04 14:13:25 +0100
commitc5d637b2cad3ad760f54d4aaa398847b4e251524 (patch)
tree55dfd10e732b1e4886b03b479fdba4e4b93c3f5c
parent6d91ee0095d2491ab5d9862d5deba22282d1412d (diff)
downloadgitlab-ce-c5d637b2cad3ad760f54d4aaa398847b4e251524.tar.gz
Improvements to profile page UIimprove-profile-page
* add separator between tabs * show project avatars * fix tooltip offset on user calendar * remove gray hover for tabs Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/javascripts/calendar.js.coffee2
-rw-r--r--app/assets/stylesheets/framework/common.scss22
-rw-r--r--app/assets/stylesheets/framework/mixins.scss1
-rw-r--r--app/assets/stylesheets/pages/profile.scss4
-rw-r--r--app/views/users/show.html.haml6
5 files changed, 26 insertions, 9 deletions
diff --git a/app/assets/javascripts/calendar.js.coffee b/app/assets/javascripts/calendar.js.coffee
index 2b1e20d3225..97621236924 100644
--- a/app/assets/javascripts/calendar.js.coffee
+++ b/app/assets/javascripts/calendar.js.coffee
@@ -25,7 +25,7 @@ class @Calendar
30
]
legendCellPadding: 3
- cellSize: $('.user-calendar').width() / 76
+ cellSize: $('.user-calendar').width() / 73
onClick: (date, count) ->
formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
$.ajax
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 3d0b71e066e..41287d52f69 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -389,12 +389,32 @@ table {
.center-middle-menu {
@include nav-menu;
+ padding: 0;
text-align: center;
margin: -$gl-padding;
- height: auto;
margin-top: 0;
margin-bottom: 0;
+ height: 58px;
border-bottom: 1px solid $border-color;
+
+ li {
+ &:after {
+ content: "|";
+ color: $border-gray-light;
+ }
+
+ &:last-child {
+ &:after {
+ content: none;
+ }
+ }
+
+ > a {
+ display: inline-block;
+ text-transform: uppercase;
+ font-size: 13px;
+ }
+ }
}
.dropzone .dz-preview .dz-progress {
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index fe078d016d7..b9c179f2881 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -137,6 +137,7 @@
&:hover, &:active, &:focus {
text-decoration: none;
+ outline: none;
}
}
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index bc1ad21305a..1d6ca0dfc13 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -75,7 +75,3 @@
text-decoration: none;
}
}
-
-.cal-heatmap-container {
- margin: 0 auto;
-}
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index e22d93aae84..5a15c6c244a 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -73,7 +73,7 @@
.user-calendar-activities
-%ul.nav.center-middle-menu
+%ul.center-middle-menu
%li.active
= link_to "#activity", 'data-toggle' => 'tab' do
Activity
@@ -106,14 +106,14 @@
.contributed-projects
= render 'shared/projects/list',
projects: @contributed_projects.sort_by(&:star_count).reverse,
- projects_limit: 5, stars: true, avatar: false
+ projects_limit: 5, stars: true, avatar: true
- if @projects.present?
.tab-pane#personal
.personal-projects
= render 'shared/projects/list',
projects: @projects.sort_by(&:star_count).reverse,
- projects_limit: 10, stars: true, avatar: false
+ projects_limit: 10, stars: true, avatar: true
:coffeescript
$(".user-calendar").load("#{user_calendar_path}")