summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-29 18:12:31 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-29 18:12:31 +0200
commit467d7f6720c6b85d2b1559bb7263dde0f448402e (patch)
treeb7f3e69aa4995de9112567a9f4f4673413cdbcfc
parenta3b60982e59b7a3be052a62b5d89393d12c64562 (diff)
downloadgitlab-ce-467d7f6720c6b85d2b1559bb7263dde0f448402e.tar.gz
Improve UI of project sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/pages/projects.scss9
-rw-r--r--app/views/layouts/_head_panel.html.haml12
-rw-r--r--app/views/projects/_aside.html.haml2
3 files changed, 14 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index ee8c746d2df..12489ccc2d7 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -210,8 +210,13 @@ ul.nav.nav-projects-tabs {
}
.panel {
+ @include border-radius(3px);
+
.panel-heading, .panel-footer {
- background-color: #fcfcfc;
+ font-weight: normal;
+ background-color: transparent;
+ color: #666;
+ border-color: #EEE;
}
.actions {
@@ -225,7 +230,7 @@ ul.nav.nav-projects-tabs {
}
.nav {
- margin-bottom: 10px;
+ margin-bottom: 15px;
}
}
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 979755db652..ddf1ffc7616 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -20,23 +20,23 @@
= icon('search')
%li
= link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
- = icon('question-circle')
+ = icon('question-circle fw')
%li
= link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
- = icon('globe')
+ = icon('globe fw')
%li
= link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
- = icon('clipboard')
+ = icon('clipboard fw')
- if current_user.is_admin?
%li
= link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
- = icon('wrench')
+ = icon('wrench fw')
- if current_user.can_create_project?
%li
= link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
- = icon('plus')
+ = icon('plus fw')
%li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
- = icon('cog')
+ = icon('cog fw')
= render 'shared/outdated_browser'
diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml
index 9c2ff8f8402..c9c17110d2b 100644
--- a/app/views/projects/_aside.html.haml
+++ b/app/views/projects/_aside.html.haml
@@ -56,7 +56,7 @@
- unless @project.empty_repo?
.panel.panel-default
.panel-heading
- = icon("archive fw")
+ = icon("folder-o fw")
Repository
.panel-body
%ul.nav.nav-pills