Download as
Browse Code »

Commit 705521f3e023db6eccda916a31825a65810f62a2

Authored by Dmitriy Zaporozhets
2 parents b4662179 d5e8fcb3
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'ui_fixes' into 'master' 

UI Fixes
Showing 9 changed files with 23 additions and 16 deletions   Show diff stats
app/assets/stylesheets/generic/typography.scss
  Diff comments   View file @705521f
@@ -90,9 +90,6 @@ a:focus { @@ -90,9 +90,6 @@ a:focus {
90 90
91 font-size: 14px; 91 font-size: 14px;
92 line-height: 1.6; 92 line-height: 1.6;
93 - .white .highlight pre {  
94 - background: #f5f5f5;  
95 - }  
96 ul { 93 ul {
97 padding: 0; 94 padding: 0;
98 margin: 0 0 9px 25px !important; 95 margin: 0 0 9px 25px !important;
app/assets/stylesheets/highlight/dark.scss
  Diff comments   View file @705521f
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 border-left: 1px solid #444; 9 border-left: 1px solid #444;
10 } 10 }
11 11
  12 + .no-highlight {
  13 + color: #DDD;
  14 + }
  15 +
12 .line-numbers a { 16 .line-numbers a {
13 color: #666; 17 color: #666;
14 } 18 }
app/assets/stylesheets/highlight/monokai.scss
  Diff comments   View file @705521f
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 background: #558; 9 background: #558;
10 } 10 }
11 11
  12 + .no-highlight {
  13 + color: #DDD;
  14 + }
  15 +
12 .line-numbers a { 16 .line-numbers a {
13 color: #666; 17 color: #666;
14 } 18 }
app/assets/stylesheets/highlight/solarized_dark.scss
  Diff comments   View file @705521f
@@ -9,6 +9,10 @@ @@ -9,6 +9,10 @@
9 background: #000; 9 background: #000;
10 } 10 }
11 11
  12 + .no-highlight {
  13 + color: #DDD;
  14 + }
  15 +
12 pre { 16 pre {
13 background-color: #002B36; 17 background-color: #002B36;
14 color: #eee; 18 color: #eee;
app/assets/stylesheets/sections/issues.scss
  Diff comments   View file @705521f
@@ -60,7 +60,6 @@ input.check_all_issues { @@ -60,7 +60,6 @@ input.check_all_issues {
60 .btn.close_issue { 60 .btn.close_issue {
61 color: #B94A48; 61 color: #B94A48;
62 font-weight: bold; 62 font-weight: bold;
63 - @include shade;  
64 &:hover { 63 &:hover {
65 color: #B94A48; 64 color: #B94A48;
66 } 65 }
@@ -68,7 +67,6 @@ input.check_all_issues { @@ -68,7 +67,6 @@ input.check_all_issues {
68 .btn.reopen_issue { 67 .btn.reopen_issue {
69 color: #468847; 68 color: #468847;
70 font-weight: bold; 69 font-weight: bold;
71 - @include shade;  
72 &:hover { 70 &:hover {
73 color: #468847; 71 color: #468847;
74 } 72 }
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @705521f
@@ -337,7 +337,7 @@ ul.notes { @@ -337,7 +337,7 @@ ul.notes {
337 box-shadow: none; 337 box-shadow: none;
338 font-size: 14px; 338 font-size: 14px;
339 height: 80px; 339 height: 80px;
340 - width: 98.6%; 340 + width: 100%;
341 } 341 }
342 342
343 .form-actions { 343 .form-actions {
app/views/projects/protected_branches/index.html.haml
  Diff comments   View file @705521f
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 .col-md-3 3 .col-md-3
4 = render "projects/branches/filter" 4 = render "projects/branches/filter"
5 .col-md-9 5 .col-md-9
6 - .alert.alert-info 6 + .bs-callout.bs-callout-info
7 %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}. 7 %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
8 %p This ability allows: 8 %p This ability allows:
9 %ul 9 %ul
@@ -12,18 +12,18 @@ @@ -12,18 +12,18 @@
12 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"} 12 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"}
13 13
14 - if can? current_user, :admin_project, @project 14 - if can? current_user, :admin_project, @project
15 - = form_for [@project, @protected_branch] do |f| 15 + = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
16 -if @protected_branch.errors.any? 16 -if @protected_branch.errors.any?
17 .alert.alert-danger 17 .alert.alert-danger
18 %ul 18 %ul
19 - @protected_branch.errors.full_messages.each do |msg| 19 - @protected_branch.errors.full_messages.each do |msg|
20 %li= msg 20 %li= msg
21 21
22 - .entry.clearfix  
23 - = f.label :name, "Branch"  
24 - .col-md-3  
25 - = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2 span3"})  
26 -   22 + .form-group
  23 + = f.label :name, "Branch", class: 'control-label'
  24 + .col-sm-10
  25 + = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"})
  26 + .form-actions
27 = f.submit 'Protect', class: "btn-create btn" 27 = f.submit 'Protect', class: "btn-create btn"
28 - unless @branches.empty? 28 - unless @branches.empty?
29 %h5 Already Protected: 29 %h5 Already Protected:
app/views/search/results/_blob.html.haml
  Diff comments   View file @705521f
@@ -6,5 +6,4 @@ @@ -6,5 +6,4 @@
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}  
10 - = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } ) 9 + = render 'shared/file_hljs', blob: blob, first_line_number: blob.startline
app/views/shared/_file_hljs.html.haml
  Diff comments   View file @705521f
1 %div.highlighted-data{class: user_color_scheme_class} 1 %div.highlighted-data{class: user_color_scheme_class}
2 .line-numbers 2 .line-numbers
3 - blob.data.lines.size.times do |index| 3 - blob.data.lines.size.times do |index|
4 - - i = index + 1 4 + - offset = defined?(first_line_number) ? first_line_number : 1
  5 + - i = index + offset
5 = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do 6 = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
6 %i.icon-link 7 %i.icon-link
7 = i 8 = i