Download as
Browse Code »

Commit e97abfce3b9e4e836aaf9d9ac32a45c6490f8831

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

Fix edit page crash. Minot UI imporvements

Showing 7 changed files with 12 additions and 10 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @e97abfc
... ... @@ -77,7 +77,7 @@
77 77  
78 78 @mixin md-typography {
79 79 code { padding: 0 4px; }
80   - p { font-size: 13px; }
  80 + p { font-size: 14px; }
81 81 h1 { margin-top: 30px;}
82 82 h2 { margin-top: 25px;}
83 83 h3 { margin-top: 20px;}
... ...
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @e97abfc
... ... @@ -7,7 +7,7 @@
7 7  
8 8 ul {
9 9 margin: auto;
10   - height: 40px;
  10 + height: 42px;
11 11 overflow: hidden;
12 12 .count {
13 13 font-weight: normal;
... ... @@ -74,7 +74,7 @@
74 74 text-align: center;
75 75 font-weight: normal;
76 76 height: 38px;
77   - line-height: 34px;
  77 + line-height: 36px;
78 78 color: #777;
79 79 text-shadow: 0 1px 1px white;
80 80 padding: 0 10px;
... ...
app/assets/stylesheets/themes/ui_mars.scss
  Diff comments   View file @e97abfc
... ... @@ -31,4 +31,8 @@
31 31 border-left: 1px solid #666;
32 32 }
33 33 }
  34 +
  35 + .main-nav {
  36 + box-shadow: 0 -1px 0 white inset;
  37 + }
34 38 }
... ...
app/helpers/commits_helper.rb
  Diff comments   View file @e97abfc
... ... @@ -134,7 +134,7 @@ module CommitsHelper
134 134 parts = @path.split('/')
135 135  
136 136 parts.each_with_index do |part, i|
137   - crumbs += content_tag(:span, '/', class: 'divider')
  137 + crumbs += content_tag(:span, ' / ', class: 'divider')
138 138 crumbs += content_tag(:li) do
139 139 # The text is just the individual part, but the link needs all the parts before it
140 140 link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
... ...
app/views/profiles/keys/index.html.haml
  Diff comments   View file @e97abfc
1   -%h3.page-title
2   - SSH Keys
3   - = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
4   -
5   -%br
6 1 %p.light
7 2 SSH key allows you to establish a secure connection between your computer and GitLab
8 3 %p.light
... ... @@ -15,6 +10,7 @@
15 10 %h5.title
16 11 SSH Keys (#{@keys.count})
17 12 .pull-right
  13 + = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
18 14 %ul.well-list#keys-table
19 15 = render @keys
20 16 - if @keys.blank?
... ...
app/views/projects/commits/show.html.haml
  Diff comments   View file @e97abfc
... ... @@ -2,6 +2,8 @@
2 2  
3 3 - if @path.present?
4 4 %ul.breadcrumb
  5 + %li.light
  6 + History for
5 7 = commits_breadcrumbs
6 8  
7 9 %div{id: dom_id(@project)}
... ...
app/views/projects/edit_tree/show.html.haml
  Diff comments   View file @e97abfc
... ... @@ -21,7 +21,7 @@
21 21 = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
22 22 .form-actions
23 23 = hidden_field_tag 'last_commit', @last_commit
24   - = hidden_field_tag 'content', '', id: :file-content
  24 + = hidden_field_tag 'content', '', id: "file-content"
25 25 .commit-button-annotation
26 26 = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
27 27 .message
... ...