Download as
Browse Code »

Commit e51b2d58e7e751b62d1d924e3c494117fd9d0604

Authored by randx
1 parent 42abdf69
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Restyled last push widget. Increased line-height for td in tables

Showing 12 changed files with 59 additions and 23 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @e51b2d5
... ... @@ -24,6 +24,22 @@
24 24 }
25 25 }
26 26  
  27 + &.btn-info {
  28 + background:#5aB9C3;
  29 + border-color: $blue_link;
  30 + color:#fff;
  31 + text-shadow: 0 1px 1px #268;
  32 + &:hover {
  33 + background:$blue_link;
  34 + color:#fff;
  35 + }
  36 +
  37 + &.disabled {
  38 + color:#fff;
  39 + background:#29B;
  40 + }
  41 + }
  42 +
27 43 &.success {
28 44 @extend .btn-success;
29 45  
... ...
app/assets/stylesheets/gitlab_bootstrap/tables.scss
  Diff comments   View file @e51b2d5
... ... @@ -5,6 +5,12 @@ table {
5 5 border:1px solid #bbb;
6 6 width:100%;
7 7  
  8 + &.low {
  9 + td {
  10 + line-height:18px;
  11 + }
  12 + }
  13 +
8 14 th {
9 15 font-weight: bold;
10 16 vertical-align: middle;
... ... @@ -26,6 +32,8 @@ table {
26 32  
27 33 td {
28 34 border-color:#f1f1f1;
  35 + line-height:28px;
  36 +
29 37 &:first-child {
30 38 border-left:1px solid #bbb;
31 39 }
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @e51b2d5
... ... @@ -97,14 +97,21 @@
97 97 *
98 98 */
99 99 .event_lp {
100   - @extend .ui-box;
101 100 color:#777;
102   - margin-bottom:20px;
103   - padding:8px;
104   - @include border-radius(4px);
  101 + padding:10px;
105 102 min-height:22px;
  103 + border-left: 5px solid #5AB9C3;
  104 + margin-bottom:20px;
  105 + background:#f9f9f9;
106 106  
107 107 .avatar {
108 108 width:24px;
109 109 }
  110 +
  111 + .btn-new-mr {
  112 + @extend .btn-info;
  113 + @extend .small;
  114 + @extend .right;
  115 + margin: -3px;
  116 + }
110 117 }
... ...
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @e51b2d5
... ... @@ -48,6 +48,7 @@
48 48 padding: 2px 10px;
49 49 }
50 50 td {
  51 + line-height:20px;
51 52 background:#fafafa;
52 53 }
53 54 }
... ...
app/views/admin/groups/index.html.haml
  Diff comments   View file @e51b2d5
1 1 = render 'admin/shared/projects_head'
2 2 %h3.page_title
3 3 Groups
  4 + %small
  5 + allows you to keep projects organized.
  6 + Use groups for uniting related projects.
  7 +
4 8 = link_to 'New Group', new_admin_group_path, class: "btn small right"
5 9 %br
6 10 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
... ...
app/views/dashboard/index.html.haml
  Diff comments   View file @e51b2d5
1 1 - if @projects.any?
2 2 .projects
3 3 .activities.span8
  4 + = render "events/event_last_push", event: @last_push
4 5 = render 'shared/no_ssh'
5 6 - if @events.any?
6 7 .content_list= render @events
... ... @@ -8,7 +9,6 @@
8 9 %h4.nothing_here_message Projects activity will be displayed here
9 10 .loading.hide
10 11 .side
11   - = render "events/event_last_push", event: @last_push
12 12 - if @groups.present?
13 13 = render "groups", groups: @groups
14 14 = render "projects", projects: @projects
... ...
app/views/events/_event_last_push.html.haml
  Diff comments   View file @e51b2d5
1 1 - if show_last_push_widget?(event)
2 2 .event_lp
3   - %div
4   - = image_tag gravatar_icon(event.author_email), class: "avatar"
5   - %span You pushed to
6   - = event.ref_type
7   - = link_to project_commits_path(event.project, event.ref_name) do
8   - %strong= truncate(event.ref_name, length: 28)
9   - at
10   - %strong= link_to event.project.name, event.project
  3 + = image_tag "event_push.png"
  4 +  
  5 + %span You pushed to
  6 + = link_to project_commits_path(event.project, event.ref_name) do
  7 + %strong= truncate(event.ref_name, length: 28)
  8 + at
  9 + %strong= link_to event.project.name, event.project
  10 + %span
  11 + = time_ago_in_words(event.created_at)
  12 + ago.
11 13  
12   - = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small" do
13   - Create Merge Request
  14 + = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-new-mr" do
  15 + Create Merge Request
... ...
app/views/groups/show.html.haml
  Diff comments   View file @e51b2d5
1 1 .projects
2 2 .activities.span8
  3 + = render "events/event_last_push", event: @last_push
3 4 = link_to dashboard_path, class: 'btn very_small' do
4 5 ← To dashboard
5 6  
... ... @@ -12,7 +13,6 @@
12 13 %h4.nothing_here_message Projects activity will be displayed here
13 14 .loading.hide
14 15 .side
15   - = render "events/event_last_push", event: @last_push
16 16 = render "projects", projects: @projects
17 17 %div
18 18 %span.rss-icon
... ...
app/views/keys/_show.html.haml
  Diff comments   View file @e51b2d5
1 1 %tr
2 2 %td
3 3 = link_to key_path(key) do
4   - %p
5   - %strong= key.title
  4 + %strong= key.title
6 5 %td
7 6 %span.cgray
8 7 Added
... ...
app/views/projects/files.html.haml
  Diff comments   View file @e51b2d5
... ... @@ -4,14 +4,13 @@
4 4 %thead
5 5 %tr
6 6 %th File name
7   - %th
  7 + %th
8 8  
9 9 - @notes.each do |note|
10 10 %tr
11 11 %td
12 12 %a{href: note.attachment.url}
13   - = image_tag gravatar_icon(note.author_email), class: "left", width: 16
14   -  
  13 + = image_tag gravatar_icon(note.author_email), class: "avatar s24"
15 14 = note.attachment_identifier
16 15 %td
17 16 Added
... ...
app/views/team_members/_team.html.haml
  Diff comments   View file @e51b2d5
1 1 - grouper_project_members(@project).each do |access, members|
2   - %table
  2 + %table.low
3 3 %thead
4 4 %tr
5 5 %th.span7
... ...
features/steps/dashboard/dashboard.rb
  Diff comments   View file @e51b2d5
... ... @@ -16,7 +16,7 @@ class Dashboard < Spinach::FeatureSteps
16 16 end
17 17  
18 18 Then 'I should see last push widget' do
19   - page.should have_content "You pushed to branch new_design"
  19 + page.should have_content "You pushed to new_design"
20 20 page.should have_link "Create Merge Request"
21 21 end
22 22  
... ...