From 3dcc441916e3d51ea29e292d7446ac9a1a4787cb Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 9 Jul 2013 20:52:06 +0300 Subject: [PATCH] Cleaner dashboard sidebar --- app/assets/stylesheets/common.scss | 11 ----- .../stylesheets/sections/dashboard.scss | 47 ++++++++++++------- app/assets/stylesheets/sections/events.scss | 8 +--- app/views/dashboard/_groups.html.haml | 12 ++--- app/views/dashboard/_projects.html.haml | 19 ++++---- app/views/groups/_projects.html.haml | 19 ++++---- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 1551af2d697..16d14a3c9e2 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -206,17 +206,6 @@ p.time { } } -.arrow{ - background: #E3E5EA; - padding: 5px; - margin-top: 5px; - @include border-radius(5px); - text-shadow: none; - color: #999; - line-height: 16px; - font-weight: bold; -} - .thin_area{ height: 150px; } diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss index 57088e55079..cab6dd807de 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/sections/dashboard.scss @@ -14,22 +14,6 @@ padding: 2px 15px; } .nav-projects-tabs li { padding: 0; } - .well-list { - li { padding: 15px; } - .arrow { - float: right; - padding: 10px; - margin: 0; - } - .last_activity { - padding-top: 5px; - display: block; - span, strong { - font-size: 12px; - color: #666; - } - } - } } } } @@ -85,3 +69,34 @@ } } } + +.project-row, .group-row { + padding: 15px !important; + + .namespace-name { + color: #666; + font-weight: bold; + } + + .project-name, .group-name { + font-size: 16px; + } + + + .arrow { + float: right; + padding: 10px 5px; + margin: 0; + font-size: 20px; + color: #666; + } + + .last-activity, .owner-info { + color: #AAA; + display: block; + margin-top: 5px; + .date, .owner { + color: #777; + } + } +} diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 0c75ddb8bc8..b1dc597f201 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -41,6 +41,8 @@ } } .event-body { + margin-left: 35px; + .commit p { color: #666; padding-top: 5px; @@ -51,7 +53,6 @@ .event-note { color: #555; margin-top: 5px; - margin-left: 35px; pre { border: none; @@ -77,10 +78,6 @@ margin-right: 5px; } } - .avatar { - position: relative; - top: -3px; - } .event_icon { position: relative; float: right; @@ -95,7 +92,6 @@ } } ul { - margin-left: 35px; margin-bottom: 5px; .avatar { width: 18px; diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index e138b42be47..a072641a074 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -8,15 +8,15 @@ New Group %ul.well-list.dash-list - groups.each do |group| - %li + %li.group-row = link_to group_path(id: group.path), class: dom_class(group) do - %strong.well-title + %span.group-name = truncate(group.name, length: 35) %span.arrow - → - %span.last_activity - %strong Owner: - %span= group.owner_name + %i.icon-angle-right + %span.owner-info + %span Owner: + %span.owner= group.owner_name - if groups.blank? %li %h3.nothing_here_message You have no groups yet. diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index ae1e2e36391..d52f10fa759 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -9,18 +9,19 @@ %ul.well-list.dash-list - projects.each do |project| - %li + %li.project-row = link_to project_path(project), class: dom_class(project) do - - if project.namespace - = project.namespace.human_name - \/ - %strong.well-title + %span.namespace-name + - if project.namespace + = project.namespace.human_name + \/ + %span.project-name = truncate(project.name, length: 25) %span.arrow - → - %span.last_activity - %strong Last activity: - %span= project_last_activity(project) + %i.icon-angle-right + %span.last-activity + %span Last activity: + %span.date= project_last_activity(project) - if projects.blank? %li %h3.nothing_here_message There are no projects here. diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index bf1a624b48f..ff6b71b9ec0 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -1,22 +1,21 @@ .ui-box %h5.title - Projects - %small - (#{projects.count}) + Projects (#{projects.count}) - if can? current_user, :manage_group, @group %span.pull-right - = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do + = link_to new_project_path(namespace_id: @group.id), class: "btn" do %i.icon-plus New Project %ul.well-list - if projects.blank? %p.nothing_here_message This groups has no projects yet - projects.each do |project| - %li + %li.project-row = link_to project_path(project), class: dom_class(project) do - %strong.well-title= truncate(project.name, length: 25) + %span.project-name + = truncate(project.name, length: 25) %span.arrow - → - %span.last_activity - %strong Last activity: - %span= project_last_activity(project) + %i.icon-angle-right + %span.last-activity + %span Last activity: + %span.date= project_last_activity(project)