Merge branch 'ui_fixes' into 'master'

app/assets/stylesheets/generic/typography.scss

@@ -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;

app/assets/stylesheets/highlight/dark.scss

@@ -9,6 +9,10 @@
     border-left: 1px solid #444;
   }
 
+  .no-highlight {
+    color: #DDD;
+  }
+
   .line-numbers a {
     color: #666;
   }

app/assets/stylesheets/highlight/monokai.scss

@@ -9,6 +9,10 @@
     background: #558;
   }
 
+  .no-highlight {
+    color: #DDD;
+  }
+
   .line-numbers a {
     color: #666;
   }

app/assets/stylesheets/highlight/solarized_dark.scss

@@ -9,6 +9,10 @@
     background: #000;
   }
 
+  .no-highlight {
+    color: #DDD;
+  }
+
   pre {
     background-color: #002B36;
     color: #eee;

app/assets/stylesheets/sections/issues.scss

@@ -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;
   }

app/assets/stylesheets/sections/notes.scss

@@ -337,7 +337,7 @@ ul.notes {
     box-shadow: none;
     font-size: 14px;
     height: 80px;
-    width: 98.6%;
+    width: 100%;
   }
 
   .form-actions {

app/views/projects/protected_branches/index.html.haml

@@ -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"})
-           
+        .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:

app/views/search/results/_blob.html.haml

@@ -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

app/views/shared/_file_hljs.html.haml

 %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