Download as
Browse Code »

Commit 3dcc441916e3d51ea29e292d7446ac9a1a4787cb

Authored by Dmitriy Zaporozhets
1 parent 03586c6c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Cleaner dashboard sidebar

Showing 6 changed files with 58 additions and 58 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @3dcc441
... ... @@ -206,17 +206,6 @@ p.time {
206 206 }
207 207 }
208 208  
209   -.arrow{
210   - background: #E3E5EA;
211   - padding: 5px;
212   - margin-top: 5px;
213   - @include border-radius(5px);
214   - text-shadow: none;
215   - color: #999;
216   - line-height: 16px;
217   - font-weight: bold;
218   -}
219   -
220 209 .thin_area{
221 210 height: 150px;
222 211 }
... ...
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @3dcc441
... ... @@ -14,22 +14,6 @@
14 14 padding: 2px 15px;
15 15 }
16 16 .nav-projects-tabs li { padding: 0; }
17   - .well-list {
18   - li { padding: 15px; }
19   - .arrow {
20   - float: right;
21   - padding: 10px;
22   - margin: 0;
23   - }
24   - .last_activity {
25   - padding-top: 5px;
26   - display: block;
27   - span, strong {
28   - font-size: 12px;
29   - color: #666;
30   - }
31   - }
32   - }
33 17 }
34 18 }
35 19 }
... ... @@ -85,3 +69,34 @@
85 69 }
86 70 }
87 71 }
  72 +
  73 +.project-row, .group-row {
  74 + padding: 15px !important;
  75 +
  76 + .namespace-name {
  77 + color: #666;
  78 + font-weight: bold;
  79 + }
  80 +
  81 + .project-name, .group-name {
  82 + font-size: 16px;
  83 + }
  84 +
  85 +
  86 + .arrow {
  87 + float: right;
  88 + padding: 10px 5px;
  89 + margin: 0;
  90 + font-size: 20px;
  91 + color: #666;
  92 + }
  93 +
  94 + .last-activity, .owner-info {
  95 + color: #AAA;
  96 + display: block;
  97 + margin-top: 5px;
  98 + .date, .owner {
  99 + color: #777;
  100 + }
  101 + }
  102 +}
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @3dcc441
... ... @@ -41,6 +41,8 @@
41 41 }
42 42 }
43 43 .event-body {
  44 + margin-left: 35px;
  45 +
44 46 .commit p {
45 47 color: #666;
46 48 padding-top: 5px;
... ... @@ -51,7 +53,6 @@
51 53 .event-note {
52 54 color: #555;
53 55 margin-top: 5px;
54   - margin-left: 35px;
55 56  
56 57 pre {
57 58 border: none;
... ... @@ -77,10 +78,6 @@
77 78 margin-right: 5px;
78 79 }
79 80 }
80   - .avatar {
81   - position: relative;
82   - top: -3px;
83   - }
84 81 .event_icon {
85 82 position: relative;
86 83 float: right;
... ... @@ -95,7 +92,6 @@
95 92 }
96 93 }
97 94 ul {
98   - margin-left: 35px;
99 95 margin-bottom: 5px;
100 96 .avatar {
101 97 width: 18px;
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @3dcc441
... ... @@ -8,15 +8,15 @@
8 8 New Group
9 9 %ul.well-list.dash-list
10 10 - groups.each do |group|
11   - %li
  11 + %li.group-row
12 12 = link_to group_path(id: group.path), class: dom_class(group) do
13   - %strong.well-title
  13 + %span.group-name
14 14 = truncate(group.name, length: 35)
15 15 %span.arrow
16   - →
17   - %span.last_activity
18   - %strong Owner:
19   - %span= group.owner_name
  16 + %i.icon-angle-right
  17 + %span.owner-info
  18 + %span Owner:
  19 + %span.owner= group.owner_name
20 20 - if groups.blank?
21 21 %li
22 22 %h3.nothing_here_message You have no groups yet.
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @3dcc441
... ... @@ -9,18 +9,19 @@
9 9  
10 10 %ul.well-list.dash-list
11 11 - projects.each do |project|
12   - %li
  12 + %li.project-row
13 13 = link_to project_path(project), class: dom_class(project) do
14   - - if project.namespace
15   - = project.namespace.human_name
16   - \/
17   - %strong.well-title
  14 + %span.namespace-name
  15 + - if project.namespace
  16 + = project.namespace.human_name
  17 + \/
  18 + %span.project-name
18 19 = truncate(project.name, length: 25)
19 20 %span.arrow
20   - →
21   - %span.last_activity
22   - %strong Last activity:
23   - %span= project_last_activity(project)
  21 + %i.icon-angle-right
  22 + %span.last-activity
  23 + %span Last activity:
  24 + %span.date= project_last_activity(project)
24 25 - if projects.blank?
25 26 %li
26 27 %h3.nothing_here_message There are no projects here.
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @3dcc441
1 1 .ui-box
2 2 %h5.title
3   - Projects
4   - %small
5   - (#{projects.count})
  3 + Projects (#{projects.count})
6 4 - if can? current_user, :manage_group, @group
7 5 %span.pull-right
8   - = link_to new_project_path(namespace_id: @group.id), class: "btn btn-tiny info" do
  6 + = link_to new_project_path(namespace_id: @group.id), class: "btn" do
9 7 %i.icon-plus
10 8 New Project
11 9 %ul.well-list
12 10 - if projects.blank?
13 11 %p.nothing_here_message This groups has no projects yet
14 12 - projects.each do |project|
15   - %li
  13 + %li.project-row
16 14 = link_to project_path(project), class: dom_class(project) do
17   - %strong.well-title= truncate(project.name, length: 25)
  15 + %span.project-name
  16 + = truncate(project.name, length: 25)
18 17 %span.arrow
19   - →
20   - %span.last_activity
21   - %strong Last activity:
22   - %span= project_last_activity(project)
  18 + %i.icon-angle-right
  19 + %span.last-activity
  20 + %span Last activity:
  21 + %span.date= project_last_activity(project)
... ...