Merge branch 'ui_fixes' into 'master'

UI Fixes

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