Download as
Browse Code »

Commit 26556a5c761b143b4049199cce348834f34333cd

Authored by Dmitriy Zaporozhets
2 parents 8b1d44f7 d8fc0c3b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'improve/scss' of /home/git/repositories/gitlab/gitlabhq

Showing 136 changed files with 281 additions and 339 deletions   Show diff stats

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 136 files displayed.

app/assets/javascripts/admin.js.coffee
  Diff comments   View file @26556a5
... ... @@ -14,7 +14,7 @@ class Admin
14 14  
15 15 $('.log-bottom').click (e) ->
16 16 e.preventDefault()
17   - visible_log = $(".file_content:visible")
  17 + visible_log = $(".file-content:visible")
18 18 visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast")
19 19  
20 20 modal = $('.change-owner-holder')
... ...
app/assets/javascripts/dashboard.js.coffee
  Diff comments   View file @26556a5
... ... @@ -15,7 +15,7 @@ class Dashboard
15 15 uiBox.find(".dash-list li").show()
16 16 else
17 17 uiBox.find(".dash-list li").each (index) ->
18   - name = $(this).find(".well-title").text()
  18 + name = $(this).find(".filter-title").text()
19 19  
20 20 if name.toLowerCase().search(terms.toLowerCase()) == -1
21 21 $(this).hide()
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @26556a5
... ... @@ -23,12 +23,8 @@ body {
23 23  
24 24 .help li { color:$style_color; }
25 25  
26   -.back_link {
27   - text-decoration: underline;
  26 +.back-link {
28 27 font-size: 14px;
29   - font-weight: bold;
30   - padding: 10px 0;
31   - padding-bottom: 0;
32 28 }
33 29  
34 30 table a code {
... ... @@ -412,7 +408,7 @@ img.emoji {
412 408 }
413 409  
414 410 .navless-container {
415   - margin-top: 30px;
  411 + margin-top: 20px;
416 412 }
417 413  
418 414 .description-block {
... ...
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
  Diff comments   View file @26556a5
... ... @@ -17,9 +17,6 @@
17 17 &.s24 { width: 24px; height: 24px; margin-right: 8px; }
18 18 &.s26 { width: 26px; height: 26px; margin-right: 8px; }
19 19 &.s32 { width: 32px; height: 32px; margin-right: 10px; }
  20 + &.s60 { width: 60px; height: 60px; margin-right: 12px; }
20 21 &.s90 { width: 90px; height: 90px; margin-right: 15px; }
21 22 }
22   -
23   -
24   -img.lil_av { padding-left: 4px; padding-right: 3px; }
25   -img.small { width: 80px; }
... ...
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  Diff comments   View file @26556a5
... ... @@ -11,7 +11,7 @@
11 11 */
12 12 .ui-box {
13 13 background: #F9F9F9;
14   - margin-bottom: 25px;
  14 + margin-bottom: 20px;
15 15 border: 1px solid #CCC;
16 16 word-wrap: break-word;
17 17 @include solid-shade;
... ... @@ -86,10 +86,11 @@
86 86 color: #456;
87 87 font-size: 16px;
88 88 text-shadow: 0 1px 1px #fff;
89   - padding: 0px 10px;
90   - line-height: 36px;
  89 + padding: 0 10px;
91 90 font-size: 14px;
  91 + line-height: 40px;
92 92 font-weight: normal;
  93 + margin: 0;
93 94  
94 95 > a {
95 96 text-shadow: 0 1px 1px #fff;
... ... @@ -101,8 +102,7 @@
101 102 }
102 103  
103 104 .btn {
104   - position: relative;
105   - top: -2px;
  105 + vertical-align: middle;
106 106 }
107 107  
108 108 .nav-pills {
... ... @@ -132,15 +132,6 @@
132 132 margin-bottom: 0;
133 133 padding: 5px 20px;
134 134 }
135   - .middle_title {
136   - background: #f5f5f5;
137   - margin:20px -20px;
138   - padding: 0 20px;
139   - border-top: 1px solid #eee;
140   - border-bottom: 1px solid #eee;
141   - font-size: 14px;
142   - color: #777;
143   - }
144 135 }
145 136  
146 137 .row_title {
... ...
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
  Diff comments   View file @26556a5
... ... @@ -43,11 +43,8 @@
43 43 }
44 44 }
45 45  
46   - &.success {
47   - @extend .btn-success;
48   -
  46 + &.btn-success {
49 47 &:hover {
50   - @extend .btn-success;
51 48 background: #51a351;
52 49 }
53 50  
... ... @@ -59,7 +56,7 @@
59 56  
60 57 &.btn-create {
61 58 @extend .wide;
62   - @extend .success;
  59 + @extend .btn-success;
63 60 }
64 61  
65 62 &.btn-save {
... ...
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @26556a5
... ... @@ -68,10 +68,6 @@ input[type='text'].danger {
68 68  
69 69 fieldset legend { font-size: 17px; }
70 70  
71   -/** PAGINATION **/
72   -.gitlab_pagination {
73   -}
74   -
75 71 .tab-content {
76 72 overflow: visible;
77 73 }
... ...
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @26556a5
... ... @@ -2,12 +2,12 @@
2 2 * File content holder
3 3 *
4 4 */
5   -.file_holder {
  5 +.file-holder {
6 6 border: 1px solid #BBB;
7 7 margin-bottom: 1em;
8 8 @include solid-shade;
9 9  
10   - .file_title {
  10 + .file-title {
11 11 border-bottom: 1px solid #bbb;
12 12 @include bg-dark-gray-gradient;
13 13 margin: 0;
... ... @@ -33,7 +33,7 @@
33 33 }
34 34 }
35 35 }
36   - .file_content {
  36 + .file-content {
37 37 background: #fff;
38 38 font-size: 11px;
39 39  
... ... @@ -48,7 +48,8 @@
48 48  
49 49 &.wiki {
50 50 padding: 20px;
51   - font-size: 13px;
  51 + font-size: 14px;
  52 + line-height: 1.6;
52 53  
53 54 .highlight {
54 55 margin-bottom: 9px;
... ...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @26556a5
... ... @@ -70,19 +70,24 @@
70 70 @mixin header-font {
71 71 color: $style_color;
72 72 text-shadow: 0 1px 1px #FFF;
73   - font-size: 18px;
  73 + font-size: 16px;
74 74 line-height: 40px;
75 75 font-weight: normal;
76   - letter-spacing: -1px;
77 76 }
78 77  
79 78 @mixin md-typography {
80 79 code { padding: 0 4px; }
81   - p { font-size: 13px; }
82   - h1 { font-size: 26px; line-height: 40px; margin: 10px 0;}
83   - h2 { font-size: 22px; line-height: 40px; margin: 10px 0;}
84   - h3 { font-size: 18px; line-height: 40px; margin: 10px 0;}
85   - h4 { font-size: 16px; line-height: 20px; margin: 10px 0;}
86   - h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
87   - h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
  80 + h1 { margin-top: 30px;}
  81 + h2 { margin-top: 25px;}
  82 + h3 { margin-top: 20px;}
  83 + h4 { margin-top: 15px;}
  84 +}
  85 +
  86 +@mixin page-title {
  87 + color: #456;
  88 + font-size: 20px;
  89 + font-weight: normal;
  90 + line-height: 1.5;
  91 + margin-top: 0px;
  92 + margin-bottom: 15px;
88 93 }
... ...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @26556a5
... ... @@ -3,15 +3,18 @@
3 3 *
4 4 */
5 5  
6   -h1, h2, h3, h4, h5, h6 { margin: 0; }
7   -h3, h4, h5, h6 { line-height: 36px; }
8   -h5 { font-size: 14px; }
9   -
10   -h3.page_title {
11   - color: #456;
12   - font-size: 20px;
13   - font-weight: normal;
14   - line-height: 28px;
  6 +h1.page-title {
  7 + @include page-title;
  8 + font-size: 28px;
  9 +}
  10 +
  11 +h2.page-title {
  12 + @include page-title;
  13 + font-size: 24px;
  14 +}
  15 +
  16 +h3.page-title {
  17 + @include page-title;
15 18 }
16 19  
17 20 h6 {
... ... @@ -91,11 +94,10 @@ a:focus {
91 94 *
92 95 */
93 96 .wiki {
  97 + font-size: 14px;
  98 + line-height: 1.6;
94 99 @include md-typography;
95 100  
96   - font-size: 13px;
97   - line-height: 20px;
98   -
99 101 .white .highlight pre { background: #f5f5f5; }
100 102 ul { margin: 0 0 9px 25px !important; }
101 103 }
... ...
app/assets/stylesheets/sections/dashboard.scss
  Diff comments   View file @26556a5
... ... @@ -10,9 +10,6 @@
10 10 margin: 0px;
11 11 box-shadow: none;
12 12  
13   - > .title {
14   - padding: 2px 15px;
15   - }
16 13 .nav-projects-tabs li { padding: 0; }
17 14 }
18 15 }
... ... @@ -33,12 +30,10 @@
33 30  
34 31 .dashboard {
35 32 .dash-filter {
36   - margin: 0;
  33 + margin: 7px 0;
37 34 padding: 4px 6px;
38 35 width: 202px;
39 36 float: left;
40   - margin-top: 3px;
41   - margin-left: -2px;
42 37 }
43 38 }
44 39  
... ...
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @26556a5
... ... @@ -31,6 +31,10 @@
31 31 *
32 32 */
33 33 .event-item {
  34 + &:first-child {
  35 + padding-top: 0;
  36 + }
  37 +
34 38 border-bottom: 1px solid #eee;
35 39 .event-title {
36 40 color: #333;
... ...
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @26556a5
... ... @@ -13,7 +13,7 @@ header {
13 13 .nav > li > a {
14 14 color: $style_color;
15 15 text-shadow: 0 1px 0 #fff;
16   - font-size: 16px;
  16 + font-size: 14px;
17 17 padding: 10px;
18 18 }
19 19  
... ... @@ -45,6 +45,7 @@ header {
45 45 margin: 0 6px;
46 46  
47 47 h1 {
  48 + margin: 0;
48 49 background: url('logo-black.png') no-repeat center 1px;
49 50 background-size: 38px;
50 51 float: left;
... ... @@ -68,7 +69,7 @@ header {
68 69 position: relative;
69 70 float: left;
70 71 margin: 0;
71   - margin-left: 10px;
  72 + margin-left: 5px;
72 73 @include header-font;
73 74 }
74 75  
... ... @@ -92,7 +93,7 @@ header {
92 93 margin-left: 10px;
93 94  
94 95 .search-input {
95   - @extend .span2;
  96 + @extend .span3;
96 97 background-image: url("icon-search.png");
97 98 background-repeat: no-repeat;
98 99 background-position: 10px;
... ... @@ -103,7 +104,7 @@ header {
103 104 box-shadow: none;
104 105 @include transition(all 0.15s ease-in 0s);
105 106 &:focus {
106   - @extend .span3;
  107 + @extend .span4;
107 108 }
108 109 }
109 110 }
... ... @@ -160,7 +161,7 @@ header {
160 161 }
161 162 .project_name {
162 163 a {
163   - color: #DDD;
  164 + color: #BBB;
164 165 &:hover {
165 166 color: #FFF;
166 167 }
... ...
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @26556a5
1 1 .main-nav {
2 2 background: #f5f5f5;
3   - margin: 30px 0;
  3 + margin: 20px 0;
4 4 margin-top: 0;
5 5 padding-top: 4px;
6 6 border-bottom: 1px solid #E1E1E1;
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/sections/profile.scss
  Diff comments   View file @26556a5
1   -.profile_history {
2   - .event_feed {
3   - min-height: 20px;
4   - .avatar {
5   - width: 20px;
6   - }
7   - }
8   -}
9   -
10   -.profile_avatar_holder {
11   - float: left;
12   - width: 60px;
13   - height: 60px;
14   - margin-right: 20px;
15   - img {
16   - width: 60px;
17   - height: 60px;
18   - background: #fff;
19   - padding: 1px;
20   - border: 1px solid #ddd;
21   - }
22   -}
23   -
24 1 .save-status-fixed {
25 2 position: fixed;
26 3 left: 20px;
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @26556a5
... ... @@ -48,7 +48,7 @@
48 48 margin-bottom: 50px;
49 49 }
50 50 h3 {
51   - @extend .page_title;
  51 + @extend .page-title;
52 52 }
53 53  
54 54 }
... ...
app/assets/stylesheets/sections/snippets.scss
  Diff comments   View file @26556a5
1   -.snippet.file_holder {
2   - .file_title {
  1 +.snippet.file-holder {
  2 + .file-title {
3 3 .snippet-file-name {
4 4 position: relative;
5 5 top: -4px;
... ...
app/assets/stylesheets/sections/votes.scss
  Diff comments   View file @26556a5
... ... @@ -27,7 +27,7 @@
27 27 }
28 28 }
29 29 .votes-block {
30   - margin: 14px 6px 6px 0;
  30 + margin: 6px;
31 31 .downvotes {
32 32 float: right;
33 33 }
... ...
app/assets/stylesheets/sections/wiki.scss
  Diff comments   View file @26556a5
1   -h3.page_title .edit-wiki-header {
  1 +h3.page-title .edit-wiki-header {
2 2 width: 780px;
3 3 margin-left: auto;
4 4 margin-right: auto;
... ...
app/assets/stylesheets/themes/ui_mars.scss
  Diff comments   View file @26556a5
... ... @@ -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 @26556a5
... ... @@ -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/admin/background_jobs/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title Background Jobs
  1 +%h3.page-title Background Jobs
2 2 %br
3 3 .ui-box
4 4 %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
... ...
app/views/admin/dashboard/index.html.haml
  Diff comments   View file @26556a5
1 1 .admin_dash.row
2 2 .span4
3 3 .ui-box
4   - %h5.title Projects
  4 + .title Projects
5 5 .data.padded
6 6 = link_to admin_projects_path do
7 7 %h1= Project.count
... ... @@ -9,7 +9,7 @@
9 9 = link_to 'New Project', new_project_path, class: "btn btn-small"
10 10 .span4
11 11 .ui-box
12   - %h5.title Users
  12 + .title Users
13 13 .data.padded
14 14 = link_to admin_users_path do
15 15 %h1= User.count
... ... @@ -17,7 +17,7 @@
17 17 = link_to 'New User', new_admin_user_path, class: "btn btn-small"
18 18 .span4
19 19 .ui-box
20   - %h5.title Groups
  20 + .title Groups
21 21 .data.padded
22 22 = link_to admin_groups_path do
23 23 %h1= Group.count
... ...
app/views/admin/groups/edit.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title Edit Group
  1 +%h3.page-title Edit Group
2 2 %hr
3 3 = form_for [:admin, @group] do |f|
4 4 - if @group.errors.any?
... ...
app/views/admin/groups/index.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Groups (#{@groups.total_count})
3 3 %small
4 4 allows you to keep projects organized.
... ...
app/views/admin/groups/new.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title New Group
  1 +%h3.page-title New Group
2 2 %hr
3 3 = form_for [:admin, @group] do |f|
4 4 - if @group.errors.any?
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Group: #{@group.name}
3 3  
4 4 = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
... ... @@ -8,7 +8,7 @@
8 8 .row
9 9 .span6
10 10 .ui-box
11   - %h5.title
  11 + .title
12 12 Group info:
13 13 %ul.well-list
14 14 %li
... ... @@ -50,7 +50,7 @@
50 50 = @group.created_at.stamp("March 1, 1999")
51 51  
52 52 .ui-box
53   - %h5.title
  53 + .title
54 54 Projects
55 55 %small
56 56 (#{@group.projects.count})
... ... @@ -64,7 +64,7 @@
64 64  
65 65 .span6
66 66 .ui-box
67   - %h5.title
  67 + .title
68 68 Add user(s) to the group:
69 69 .ui-box-body.form-holder
70 70 %p.light
... ... @@ -79,7 +79,7 @@
79 79 %hr
80 80 = submit_tag 'Add users into group', class: "btn btn-create"
81 81 .ui-box
82   - %h5.title
  82 + .title
83 83 %strong #{@group.name}
84 84 Group Members
85 85 %small
... ...
app/views/admin/logs/show.html.haml
  Diff comments   View file @26556a5
... ... @@ -11,57 +11,57 @@
11 11 %p.light To prevent performance issues admin logs output the last 2000 lines
12 12 .tab-content
13 13 .tab-pane.active#githost
14   - .file_holder#README
15   - .file_title
  14 + .file-holder#README
  15 + .file-title
16 16 %i.icon-file
17 17 githost.log
18 18 .pull-right
19 19 = link_to '#', class: 'log-bottom' do
20 20 %i.icon-arrow-down
21 21 Scroll down
22   - .file_content.logs
  22 + .file-content.logs
23 23 %ol
24 24 - Gitlab::GitLogger.read_latest.each do |line|
25 25 %li
26 26 %p= line
27 27 .tab-pane#application
28   - .file_holder#README
29   - .file_title
  28 + .file-holder#README
  29 + .file-title
30 30 %i.icon-file
31 31 application.log
32 32 .pull-right
33 33 = link_to '#', class: 'log-bottom' do
34 34 %i.icon-arrow-down
35 35 Scroll down
36   - .file_content.logs
  36 + .file-content.logs
37 37 %ol
38 38 - Gitlab::AppLogger.read_latest.each do |line|
39 39 %li
40 40 %p= line
41 41 .tab-pane#production
42   - .file_holder#README
43   - .file_title
  42 + .file-holder#README
  43 + .file-title
44 44 %i.icon-file
45 45 production.log
46 46 .pull-right
47 47 = link_to '#', class: 'log-bottom' do
48 48 %i.icon-arrow-down
49 49 Scroll down
50   - .file_content.logs
  50 + .file-content.logs
51 51 %ol
52 52 - Gitlab::Logger.read_latest_for('production.log').each do |line|
53 53 %li
54 54 %p= line
55 55 .tab-pane#sidekiq
56   - .file_holder#README
57   - .file_title
  56 + .file-holder#README
  57 + .file-title
58 58 %i.icon-file
59 59 sidekiq.log
60 60 .pull-right
61 61 = link_to '#', class: 'log-bottom' do
62 62 %i.icon-arrow-down
63 63 Scroll down
64   - .file_content.logs
  64 + .file-content.logs
65 65 %ol
66 66 - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
67 67 %li
... ...
app/views/admin/projects/index.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Projects
3 3 = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
4 4  
... ... @@ -41,7 +41,7 @@
41 41 = link_to "Reset", admin_projects_path, class: "btn"
42 42 .span8
43 43 .ui-box
44   - %h5.title
  44 + .title
45 45 Projects (#{@projects.total_count})
46 46 %ul.well-list
47 47 - @projects.each do |project|
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Project: #{@project.name_with_namespace}
3 3 = link_to edit_project_path(@project), class: "btn pull-right" do
4 4 %i.icon-edit
... ... @@ -7,7 +7,7 @@
7 7 .row
8 8 .span6
9 9 .ui-box
10   - %h5.title
  10 + .title
11 11 Project info:
12 12 %ul.well-list
13 13 %li
... ... @@ -76,7 +76,7 @@
76 76 .span6
77 77 - if @group
78 78 .ui-box
79   - %h5.title
  79 + .title
80 80 %strong #{@group.name} Group
81 81 members (#{@group.users_groups.count})
82 82 .pull-right
... ... @@ -87,7 +87,7 @@
87 87 = render 'users_groups/users_group', member: member, show_controls: false
88 88  
89 89 .ui-box
90   - %h5.title
  90 + .title
91 91 Team
92 92 %small
93 93 (#{@project.users.count})
... ...
app/views/admin/users/edit.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 #{@user.name} →
3 3 %i.icon-edit
4 4 Edit user
... ...
app/views/admin/users/index.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Users
3 3 = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
4 4 %br
... ... @@ -32,7 +32,7 @@
32 32  
33 33 .span9
34 34 .ui-box
35   - %h5.title
  35 + .title
36 36 Users (#{@users.total_count})
37 37 %ul.well-list
38 38 - @users.each do |user|
... ...
app/views/admin/users/new.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 %i.icon-plus
3 3 New user
4 4 %hr
... ...
app/views/admin/users/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 User:
3 3 = @user.name
4 4 - if @user.blocked?
... ... @@ -21,7 +21,7 @@
21 21 .row
22 22 .span6
23 23 .ui-box
24   - %h5.title
  24 + .title
25 25 Account:
26 26 .pull-right
27 27 = image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
... ... @@ -65,7 +65,7 @@
65 65  
66 66 - if @user.users_groups.present?
67 67 .ui-box
68   - %h5.title Groups:
  68 + .title Groups:
69 69 %ul.well-list
70 70 - @user.users_groups.each do |user_group|
71 71 - group = user_group.group
... ... @@ -76,7 +76,7 @@
76 76  
77 77 .span6
78 78 .ui-box
79   - %h5.title Projects (#{@projects.count})
  79 + .title Projects (#{@projects.count})
80 80 %ul.well-list
81 81 - @projects.sort_by(&:name_with_namespace).each do |project|
82 82 - tm = project.team.find_tm(@user.id)
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @26556a5
1 1 .ui-box
2   - %h5.title.clearfix
  2 + .title.clearfix
3 3 = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
4 4 - if current_user.can_create_group?
5 5 %span.pull-right
... ... @@ -10,7 +10,7 @@
10 10 - groups.each do |group|
11 11 %li.group-row
12 12 = link_to group_path(id: group.path), class: dom_class(group) do
13   - %span.group-name
  13 + %span.group-name.filter-title
14 14 = truncate(group.name, length: 35)
15 15 %span.arrow
16 16 %i.icon-angle-right
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @26556a5
1 1 .ui-box
2   - %h5.title.clearfix
  2 + .title.clearfix
3 3 = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
4 4 - if current_user.can_create_project?
5 5 %span.pull-right
... ... @@ -15,7 +15,7 @@
15 15 - if project.namespace
16 16 = project.namespace.human_name
17 17 \/
18   - %span.project-name
  18 + %span.project-name.filter-title
19 19 = truncate(project.name, length: 25)
20 20 %span.arrow
21 21 %i.icon-angle-right
... ...
app/views/dashboard/issues.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Issues
3 3 %span.light
4 4 –
5 5 Assigned to you
6 6 %span.pull-right #{@issues.total_count} issues
7 7  
8   -%br
9   -
10 8 .row
11 9 .span3
12 10 = render 'filter', entity: 'issue'
... ... @@ -15,7 +13,7 @@
15 13 - @issues.group_by(&:project).each do |group|
16 14 %div.ui-box
17 15 - project = group[0]
18   - %h5.title
  16 + .title
19 17 = link_to_project project
20 18  
21 19 %i.icon-angle-right
... ...
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Merge Requests
3 3 %span.light
4 4 –
5 5 Authored by or assigned to you
6 6 %span.pull-right #{@merge_requests.total_count} merge requests
7 7  
8   -%br
9 8 .row
10 9 .span3
11 10 = render 'filter', entity: 'merge_request'
... ...
app/views/dashboard/projects.html.haml
  Diff comments   View file @26556a5
... ... @@ -22,7 +22,7 @@
22 22  
23 23 .span9
24 24 .ui-box
25   - %h5.title
  25 + .title
26 26 Projects (#{@projects.total_count})
27 27 .pull-right.light
28 28 %small Last activity
... ...
app/views/devise/passwords/new.html.haml
  Diff comments   View file @26556a5
1 1 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
2   - %h3.page_title Reset password
  2 + %h3.page-title Reset password
3 3 %br
4 4 = devise_error_messages!
5 5 = f.email_field :email, placeholder: "Email", class: "text"
... ...
app/views/devise/registrations/new.html.haml
  Diff comments   View file @26556a5
1 1 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
2   - %h3.page_title Sign Up
  2 + %h3.page-title Sign Up
3 3 %br
4 4 = devise_error_messages!
5 5 %div
... ...
app/views/devise/sessions/new.html.haml
  Diff comments   View file @26556a5
1 1 .login-box
2   - %h3.page_title Sign in
  2 + %h3.page-title Sign in
3 3 %br
4 4 - if ldap_enabled?
5 5 %ul.nav.nav-tabs
... ...
app/views/errors/access_denied.html.haml
  Diff comments   View file @26556a5
1 1 %h1.http_status_code 403
2   -%h3.page_title Access Denied
  2 +%h3.page-title Access Denied
3 3 %hr
4 4 %p You are not allowed to access this page.
5 5 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
... ...
app/views/errors/encoding.html.haml
  Diff comments   View file @26556a5
1 1 %h1.http_status_code 500
2   -%h3.page_title Encoding Error
  2 +%h3.page-title Encoding Error
3 3 %hr
4 4 %p Page can't be loaded because of an encoding error.
... ...
app/views/errors/git_not_found.html.haml
  Diff comments   View file @26556a5
1 1 %h1.http_status_code 404
2   -%h3.page_title Git Resource Not found
  2 +%h3.page-title Git Resource Not found
3 3 %hr
4 4 %p
5 5 Application can't get access to some branch or commit in your repository. It
... ...
app/views/errors/not_found.html.haml
  Diff comments   View file @26556a5
1 1 %h1.http_status_code 404
2   -%h3.page_title The resource you were looking for doesn't exist.
  2 +%h3.page-title The resource you were looking for doesn't exist.
3 3 %hr
4 4 %p You may have mistyped the address or the page may have moved.
... ...
app/views/groups/_filter.html.haml
  Diff comments   View file @26556a5
1 1 = form_tag group_filter_path(entity), method: 'get' do
2   - %fieldset.dashboard-search-filter
3   - = search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
4   - = button_tag type: 'submit', class: 'btn' do
5   - %i.icon-search
6   -
7 2 %fieldset
8   - %legend Status:
9 3 %ul.nav.nav-pills.nav-stacked
10 4 %li{class: ("active" if !params[:status])}
11 5 = link_to group_filter_path(entity, status: nil) do
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @26556a5
1 1 .ui-box
2   - %h5.title
  2 + .title
3 3 Projects (#{projects.count})
4 4 - if can? current_user, :manage_group, @group
5 5 %span.pull-right
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @26556a5
... ... @@ -18,7 +18,7 @@
18 18 .tab-content
19 19 .tab-pane.active#tab-edit
20 20 .ui-box
21   - %h5.title
  21 + .title
22 22 %strong= @group.name
23 23 Group Settings:
24 24 %div.form-holder
... ... @@ -42,7 +42,7 @@
42 42  
43 43 .tab-pane#tab-projects
44 44 .ui-box
45   - %h5.title
  45 + .title
46 46 %strong= @group.name
47 47 Projects:
48 48 - if can? current_user, :manage_group, @group
... ... @@ -67,7 +67,7 @@
67 67  
68 68 .tab-pane#tab-transfer
69 69 .ui-box.ui-box-danger
70   - %h5.title Transfer group
  70 + .title Transfer group
71 71 .ui-box-body
72 72 %p
73 73 Transferring group will cause loss of admin control over group and all child projects
... ... @@ -78,7 +78,7 @@
78 78  
79 79 .tab-pane#tab-remove
80 80 .ui-box.ui-box-danger
81   - %h5.title Remove group
  81 + .title Remove group
82 82 .ui-box-body
83 83 %p
84 84 Remove of group will cause removing all child projects and resources.
... ...
app/views/groups/issues.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Issues
3 3 %small (assigned to you)
4 4 %small.pull-right #{@issues.total_count} issues
... ... @@ -12,7 +12,7 @@
12 12 - @issues.group_by(&:project).each do |group|
13 13 %div.ui-box
14 14 - project = group[0]
15   - %h5.title
  15 + .title
16 16 = link_to_project project
17 17 %ul.well-list.issues-list
18 18 - group[1].each do |issue|
... ...
app/views/groups/members.html.haml
  Diff comments   View file @26556a5
... ... @@ -9,7 +9,7 @@
9 9 Only group owners can manage group members
10 10 .span6
11 11 .ui-box
12   - %h5.title
  12 + .title
13 13 %strong #{@group.name}
14 14 Group Members
15 15 %small
... ...
app/views/groups/merge_requests.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Merge Requests
3 3 %small (authored by or assigned to you)
4 4 %small.pull-right #{@merge_requests.total_count} merge requests
... ...
app/views/help/api.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/api_layout' do
2   - %h3.page_title
  2 + %h3.page-title
3 3 %span.light API
4 4 %span
5 5 \/
6 6 = @category.titleize
7 7 %br
8 8  
9   - .file_holder
10   - .file_title
  9 + .file-holder
  10 + .file-title
11 11 %i.icon-file
12 12 = @category
13   - .file_content.wiki
  13 + .file-content.wiki
14 14 = preserve do
15 15 = markdown File.read(Rails.root.join("doc", "api", "#{@category}.md"))
... ...
app/views/help/index.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
2   - GITLAB
  1 +%h2.page-title
  2 + GitLab
3 3 .pull-right
4 4 %span= Gitlab::VERSION
5 5 %small= Gitlab::REVISION
6   -%hr
7   -%p.lead
  6 +%p.slead
8 7 Self Hosted Git Management
9 8 %br
10 9 Fast, secure and stable solution based on Ruby on Rails.
... ... @@ -15,7 +14,7 @@
15 14 .span4
16 15 .ui-box
17 16 .title
18   - %h5 Quick help
  17 + Quick help
19 18 %ul.well-list
20 19 %li
21 20 Email your
... ... @@ -39,7 +38,7 @@
39 38 .span4
40 39 .ui-box
41 40 .title
42   - %h5 User documentation
  41 + User documentation
43 42 %ul.well-list
44 43 %li
45 44 %strong= link_to "Workflow", help_workflow_path
... ... @@ -68,7 +67,7 @@
68 67 .span4
69 68 .ui-box
70 69 .title
71   - %h5 Admin documentation
  70 + Admin documentation
72 71 %ul.well-list
73 72  
74 73 %li
... ...
app/views/help/markdown.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title GitLab Flavored Markdown
  2 + %h3.page-title GitLab Flavored Markdown
3 3 %br
4 4  
5 5 .help_body
... ...
app/views/help/permissions.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title Permissions
  2 + %h3.page-title Permissions
3 3 %br
4 4  
5 5 %fieldset
... ...
app/views/help/public_access.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title Public Access
  2 + %h3.page-title Public Access
3 3 %br
4 4  
5 5 %p
... ...
app/views/help/raketasks.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title GitLab Rake Tasks
  2 + %h3.page-title GitLab Rake Tasks
3 3 %br
4 4  
5 5 %p.slead
... ... @@ -19,46 +19,46 @@
19 19  
20 20 .tab-content
21 21 .tab-pane.active#features
22   - .file_holder
23   - .file_title
  22 + .file-holder
  23 + .file-title
24 24 %i.icon-file
25 25 Features
26   - .file_content.wiki
  26 + .file-content.wiki
27 27 = preserve do
28 28 = markdown File.read(Rails.root.join("doc", "raketasks", "features.md"))
29 29  
30 30 .tab-pane#maintenance
31   - .file_holder
32   - .file_title
  31 + .file-holder
  32 + .file-title
33 33 %i.icon-file
34 34 Maintenance
35   - .file_content.wiki
  35 + .file-content.wiki
36 36 = preserve do
37 37 = markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md"))
38 38  
39 39 .tab-pane#user_management
40   - .file_holder
41   - .file_title
  40 + .file-holder
  41 + .file-title
42 42 %i.icon-file
43 43 User Management
44   - .file_content.wiki
  44 + .file-content.wiki
45 45 = preserve do
46 46 = markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md"))
47 47  
48 48 .tab-pane#cleanup
49   - .file_holder
50   - .file_title
  49 + .file-holder
  50 + .file-title
51 51 %i.icon-file
52 52 Cleanup
53   - .file_content.wiki
  53 + .file-content.wiki
54 54 = preserve do
55 55 = markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md"))
56 56  
57 57 .tab-pane#backup_restore
58   - .file_holder
59   - .file_title
  58 + .file-holder
  59 + .file-title
60 60 %i.icon-file
61 61 Backup & Restore
62   - .file_content.wiki
  62 + .file-content.wiki
63 63 = preserve do
64 64 = markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md"))
... ...
app/views/help/ssh.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title SSH Keys
  2 + %h3.page-title SSH Keys
3 3 %br
4 4  
5 5 %p.slead
... ...
app/views/help/system_hooks.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title System hooks
  2 + %h3.page-title System hooks
3 3 %br
4 4  
5 5 %p.slead
... ...
app/views/help/web_hooks.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title Web hooks
  2 + %h3.page-title Web hooks
3 3 %br
4 4  
5 5 %p.slead
... ...
app/views/help/workflow.html.haml
  Diff comments   View file @26556a5
1 1 = render layout: 'help/layout' do
2   - %h3.page_title Workflow
  2 + %h3.page-title Workflow
3 3 %br
4 4  
5 5 %ol.help
... ...
app/views/layouts/_page_title.html.haml
  Diff comments   View file @26556a5
1   -- if content_for?(:page_title)
2   - = yield :page_title
  1 +- if content_for?(:page-title)
  2 + = yield :page-title
... ...
app/views/profiles/groups/index.html.haml
  Diff comments   View file @26556a5
1 1 .ui-box
2   - %h5.title
  2 + .title
3 3 %strong Groups
4 4 (#{@groups.count})
5 5 - if current_user.can_create_group?
... ...
app/views/profiles/keys/index.html.haml
  Diff comments   View file @26556a5
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
... ... @@ -12,9 +7,10 @@
12 7  
13 8  
14 9 .ui-box
15   - %h5.title
  10 + .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/profiles/keys/new.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title Add an SSH Key
  1 +%h3.page-title Add an SSH Key
2 2 %hr
3 3 = render 'form'
4 4  
... ...
app/views/profiles/keys/show.html.haml
  Diff comments   View file @26556a5
1 1 .row
2 2 .span4
3 3 .ui-box
4   - %h5.title
  4 + .title
5 5 SSH Key
6 6 %ul.well-list
7 7 %li
... ...
app/views/profiles/notifications/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title Setup your notification level
2   -
3   -%br
  1 +%h3.page-title Setup your notification level
4 2  
5 3 %p.light
6 4 %strong Disabled
... ...
app/views/profiles/show.html.haml
  Diff comments   View file @26556a5
1   -.profile_avatar_holder
2   - = image_tag gravatar_icon(@user.email, 90), alt: ''
3   -%h3.page_title
  1 += image_tag gravatar_icon(@user.email, 60), alt: '', class: 'avatar s60'
  2 +%h3.page-title
4 3 = @user.name
5 4 %br
6 5 %small
... ...
app/views/projects/blame/show.html.haml
  Diff comments   View file @26556a5
... ... @@ -11,14 +11,14 @@
11 11 %li= link
12 12 .clear
13 13  
14   - .file_holder
15   - .file_title
  14 + .file-holder
  15 + .file-title
16 16 %i.icon-file
17 17 %span.file_name
18 18 = @blob.name
19 19 %small= number_to_human_size @blob.size
20 20 %span.options= render "projects/blob/actions"
21   - .file_content.blame
  21 + .file-content.blame
22 22 %table
23 23 - current_line = 1
24 24 - @blame.each do |commit, lines|
... ...
app/views/projects/blob/_blob.html.haml
  Diff comments   View file @26556a5
... ... @@ -17,8 +17,8 @@
17 17 = link_to title, '#'
18 18  
19 19 %div#tree-content-holder.tree-content-holder
20   - .file_holder
21   - .file_title
  20 + .file-holder
  21 + .file-title
22 22 %i.icon-file
23 23 %span.file_name
24 24 = blob.name
... ...
app/views/projects/blob/_download.html.haml
  Diff comments   View file @26556a5
1   -.file_content.blob_file
  1 +.file-content.blob_file
2 2 %center
3 3 = link_to project_blob_path(@project, @id) do
4 4 %div.padded
... ...
app/views/projects/blob/_image.html.haml
  Diff comments   View file @26556a5
1   -.file_content.image_file
  1 +.file-content.image_file
2 2 %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}
... ...
app/views/projects/blob/_text.html.haml
  Diff comments   View file @26556a5
1 1 - if gitlab_markdown?(blob.name)
2   - .file_content.wiki
  2 + .file-content.wiki
3 3 = preserve do
4 4 = markdown(blob.data)
5 5 - elsif markup?(blob.name)
6   - .file_content.wiki
  6 + .file-content.wiki
7 7 = raw GitHub::Markup.render(blob.name, blob.data)
8 8 - else
9   - .file_content.code
  9 + .file-content.code
10 10 - unless blob.empty?
11 11 %div{class: user_color_scheme_class}
12 12 = raw blob.colorize(formatter: :gitlab)
... ...
app/views/projects/commit/_commit_box.html.haml
  Diff comments   View file @26556a5
... ... @@ -15,7 +15,7 @@
15 15 %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff)
16 16 = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
17 17 %span Browse Code »
18   - %h3.commit-title.page_title
  18 + %h3.commit-title.page-title
19 19 = gfm escape_once(@commit.title)
20 20 - if @commit.description.present?
21 21 %pre.commit-description
... ...
app/views/projects/commits/_commits.html.haml
  Diff comments   View file @26556a5
1 1 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
2 2 %div.ui-box
3   - %h5.title
  3 + .title
4 4 %i.icon-calendar
5 5 %span= day.stamp("28 Aug, 2010")
6 6  
... ...
app/views/projects/commits/show.html.haml
  Diff comments   View file @26556a5
... ... @@ -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/compare/index.html.haml
  Diff comments   View file @26556a5
1 1 = render "projects/commits/head"
2 2  
3   -%h3.page_title
  3 +%h3.page-title
4 4 Compare View
5   -%hr
6 5  
7 6 = render "form"
... ...
app/views/projects/compare/show.html.haml
  Diff comments   View file @26556a5
1 1 = render "projects/commits/head"
2 2  
3   -%h3.page_title
  3 +%h3.page-title
4 4 Compare View
5   -%hr
6 5  
7 6 = render "form"
8 7  
... ... @@ -14,7 +13,7 @@
14 13  
15 14 - if @commits.present?
16 15 %div.ui-box
17   - %h5.title
  16 + .title
18 17 Commits (#{@commits.count})
19 18 %ul.well-list= render Commit.decorate(@commits)
20 19  
... ...
app/views/projects/deploy_keys/new.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title New Deploy key
  1 +%h3.page-title New Deploy key
2 2 %hr
3 3  
4 4 = render 'form'
... ...
app/views/projects/deploy_keys/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Deploy key:
3 3 = @key.title
4 4 %small
5 5 created at
6 6 = @key.created_at.stamp("Aug 21, 2011")
7   -.back_link
  7 +.back-link
8 8 = link_to project_deploy_keys_path(@project) do
9 9 ← To keys list
10 10 %hr
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @26556a5
... ... @@ -2,7 +2,7 @@
2 2 .project-edit-errors
3 3 .project-edit-content
4 4 .ui-box.white
5   - %h5.title
  5 + .title
6 6 %strong= @project.name
7 7 Project Settings:
8 8 .form-holder
... ... @@ -102,7 +102,7 @@
102 102  
103 103 - if can?(current_user, :change_namespace, @project)
104 104 .ui-box.ui-box-danger
105   - %h5.title Transfer project
  105 + .title Transfer project
106 106 .errors-holder
107 107 .form-holder
108 108 = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
... ... @@ -122,7 +122,7 @@
122 122 %p.nothing_here_message Only project owner can transfer a project
123 123  
124 124 .ui-box.ui-box-danger
125   - %h5.title Rename repository
  125 + .title Rename repository
126 126 .errors-holder
127 127 .form-holder
128 128 = form_for(@project) do |f|
... ... @@ -140,7 +140,7 @@
140 140  
141 141 - if can?(current_user, :remove_project, @project)
142 142 .ui-box.ui-box-danger
143   - %h5.title Remove project
  143 + .title Remove project
144 144 .ui-box-body
145 145 %p
146 146 Remove of project will cause removing repository and all related resources like issues, merge requests etc.
... ...
app/views/projects/edit_tree/show.html.haml
  Diff comments   View file @26556a5
1 1 .file-editor
2 2 = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
3   - .file_holder
4   - .file_title
  3 + .file-holder
  4 + .file-title
5 5 %i.icon-file
6 6 %span.file_name
7 7 = @path
... ... @@ -11,7 +11,7 @@
11 11 %span.options
12 12 .btn-group.tree-btn-group
13 13 = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message
14   - .file_content.code
  14 + .file-content.code
15 15 %pre#editor= @blob.data
16 16  
17 17 .control-group.commit_message-group
... ... @@ -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
... ... @@ -40,6 +40,6 @@
40 40 disableButtonIfEmptyField("#commit_message", ".js-commit-button");
41 41  
42 42 $(".js-commit-button").click(function(){
43   - $("#file_content").val(editor.getValue());
  43 + $("#file-content").val(editor.getValue());
44 44 $(".file-editor form").submit();
45 45 });
... ...
app/views/projects/graphs/show.html.haml
  Diff comments   View file @26556a5
1 1 .loading-graph
2 2 %center
3 3 .loading
4   - %h3.page_title Building repository graph. Please wait a moment.
  4 + %h3.page-title Building repository graph. Please wait a moment.
5 5  
6 6 .stat-graph
7 7 .header.clearfix
... ... @@ -10,7 +10,7 @@
10 10 %option{:value => "commits"} Commits
11 11 %option{:value => "additions"} Additions
12 12 %option{:value => "deletions"} Deletions
13   - %h3#date_header.page_title
  13 + %h3#date_header.page-title
14 14 %input#brush_change{:type => "hidden"}
15 15 .graphs
16 16 #contributors-master
... ...
app/views/projects/hooks/index.html.haml
  Diff comments   View file @26556a5
... ... @@ -21,7 +21,7 @@
21 21  
22 22 -if @hooks.any?
23 23 .ui-box
24   - %h5.title
  24 + .title
25 25 Hooks (#{@hooks.count})
26 26 %ul.well-list
27 27 - @hooks.each do |hook|
... ...
app/views/projects/issues/_form.html.haml
  Diff comments   View file @26556a5
1 1 %div.issue-form-holder
2   - %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
  2 + %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
3 3 = form_for [@project, @issue] do |f|
4 4 -if @issue.errors.any?
5 5 .alert.alert-error
... ...
app/views/projects/issues/index.html.haml
  Diff comments   View file @26556a5
1 1 = render "head"
2 2 .issues_content
3   - %h3.page_title
  3 + %h3.page-title
4 4 Issues
5 5 %span (<span class=issue_counter>#{@issues.total_count}</span>)
6 6 .pull-right
... ... @@ -16,8 +16,6 @@
16 16 = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
17 17 = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
18 18  
19   - .clearfix
20   -
21 19 .row
22 20 .span3
23 21 = render 'filter', entity: 'issue'
... ...
app/views/projects/issues/show.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 Issue ##{@issue.id}
3 3  
4 4 %small
... ... @@ -22,7 +22,7 @@
22 22 .pull-right
23 23 .span3#votes= render 'votes/votes_block', votable: @issue
24 24  
25   -.back_link
  25 +.back-link
26 26 = link_to project_issues_path(@project) do
27 27 &larr; To issues list
28 28  
... ...
app/views/projects/labels/index.html.haml
  Diff comments   View file @26556a5
1 1 = render "projects/issues/head"
2 2  
3   -%h3.page_title
  3 +%h3.page-title
4 4 Labels
5 5 %br
6 6  
... ...
app/views/projects/merge_requests/edit.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 = "Edit merge request #{@merge_request.id}"
3 3 %hr
4 4 = render 'form'
... ...
app/views/projects/merge_requests/index.html.haml
  Diff comments   View file @26556a5
... ... @@ -2,11 +2,9 @@
2 2 = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
3 3 %i.icon-plus
4 4 New Merge Request
5   -%h3.page_title
  5 +%h3.page-title
6 6 Merge Requests
7 7  
8   -%br
9   -
10 8  
11 9 .row
12 10 .span3
... ...
app/views/projects/merge_requests/new.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title New Merge Request
  1 +%h3.page-title New Merge Request
2 2 %hr
3 3 = render 'form'
... ...
app/views/projects/merge_requests/show/_commits.html.haml
  Diff comments   View file @26556a5
1 1 - if @commits.present?
2 2 .ui-box
3   - %h5.title
  3 + .title
4 4 %i.icon-list
5 5 Commits (#{@commits.count})
6 6 .commits
... ...
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @26556a5
... ... @@ -14,7 +14,7 @@
14 14 %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
15 15 for instructions
16 16 .accept_group
17   - = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
  17 + = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request"
18 18 - unless @project.root_ref? @merge_request.source_branch
19 19 .remove_branch_holder
20 20 = label_tag :should_remove_source_branch, class: "checkbox" do
... ...
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title
  1 +%h3.page-title
2 2 = "Merge Request ##{@merge_request.id}:"
3 3 &nbsp;
4 4 %span.label-branch= @merge_request.source_branch
... ... @@ -26,6 +26,6 @@
26 26 .pull-right
27 27 .span3#votes= render 'votes/votes_block', votable: @merge_request
28 28  
29   -.back_link
  29 +.back-link
30 30 = link_to project_merge_requests_path(@project) do
31 31 &larr; To merge requests
... ...
app/views/projects/milestones/_form.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
2   -.back_link
  1 +%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
  2 +.back-link
3 3 = link_to project_milestones_path(@project) do
4 4 &larr; To milestones
5 5  
... ...
app/views/projects/milestones/_issues.html.haml
  Diff comments   View file @26556a5
1 1 .ui-box
2   - %h5.title= title
  2 + .title= title
3 3 %ul.well-list
4 4 - issues.each do |issue|
5 5 %li
... ...
app/views/projects/milestones/index.html.haml
  Diff comments   View file @26556a5
1 1 = render "projects/issues/head"
2 2 .milestones_content
3   - %h3.page_title
  3 + %h3.page-title
4 4 Milestones
5 5 - if can? current_user, :admin_milestone, @project
6 6 = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @26556a5
1 1 = render "projects/issues/head"
2 2 .row
3 3 .span6
4   - %h3.page_title
  4 + %h3.page-title
5 5 Milestone ##{@milestone.id}
6 6 %small
7 7 = @milestone.expires_at
8   - .back_link
  8 + .back-link
9 9 = link_to project_milestones_path(@project) do
10 10 &larr; To milestones list
11 11 .span6
... ... @@ -84,13 +84,13 @@
84 84 .row
85 85 .span6
86 86 .ui-box
87   - %h5.title Open
  87 + .title Open
88 88 %ul.well-list
89 89 - @merge_requests.opened.each do |merge_request|
90 90 = render 'merge_request', merge_request: merge_request
91 91 .span6
92 92 .ui-box
93   - %h5.title Closed
  93 + .title Closed
94 94 %ul.well-list
95 95 - @merge_requests.closed.each do |merge_request|
96 96 = render 'merge_request', merge_request: merge_request
... ...
app/views/projects/network/_head.html.haml
  Diff comments   View file @26556a5
1   -%h3.page_title Project Network Graph
  1 +%h3.page-title Project Network Graph
2 2 %hr
3 3  
4 4 .clearfix
... ...