Commit 26556a5c761b143b4049199cce348834f34333cd

Authored by Dmitriy Zaporozhets
2 parents 8b1d44f7 d8fc0c3b

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

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