Commit 705521f3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ui_fixes' into 'master'

UI Fixes
parents b4662179 d5e8fcb3
...@@ -90,9 +90,6 @@ a:focus { ...@@ -90,9 +90,6 @@ a:focus {
font-size: 14px; font-size: 14px;
line-height: 1.6; line-height: 1.6;
.white .highlight pre {
background: #f5f5f5;
}
ul { ul {
padding: 0; padding: 0;
margin: 0 0 9px 25px !important; margin: 0 0 9px 25px !important;
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
border-left: 1px solid #444; border-left: 1px solid #444;
} }
.no-highlight {
color: #DDD;
}
.line-numbers a { .line-numbers a {
color: #666; color: #666;
} }
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
background: #558; background: #558;
} }
.no-highlight {
color: #DDD;
}
.line-numbers a { .line-numbers a {
color: #666; color: #666;
} }
......
...@@ -9,6 +9,10 @@ ...@@ -9,6 +9,10 @@
background: #000; background: #000;
} }
.no-highlight {
color: #DDD;
}
pre { pre {
background-color: #002B36; background-color: #002B36;
color: #eee; color: #eee;
......
...@@ -60,7 +60,6 @@ input.check_all_issues { ...@@ -60,7 +60,6 @@ input.check_all_issues {
.btn.close_issue { .btn.close_issue {
color: #B94A48; color: #B94A48;
font-weight: bold; font-weight: bold;
@include shade;
&:hover { &:hover {
color: #B94A48; color: #B94A48;
} }
...@@ -68,7 +67,6 @@ input.check_all_issues { ...@@ -68,7 +67,6 @@ input.check_all_issues {
.btn.reopen_issue { .btn.reopen_issue {
color: #468847; color: #468847;
font-weight: bold; font-weight: bold;
@include shade;
&:hover { &:hover {
color: #468847; color: #468847;
} }
......
...@@ -337,7 +337,7 @@ ul.notes { ...@@ -337,7 +337,7 @@ ul.notes {
box-shadow: none; box-shadow: none;
font-size: 14px; font-size: 14px;
height: 80px; height: 80px;
width: 98.6%; width: 100%;
} }
.form-actions { .form-actions {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.col-md-3 .col-md-3
= render "projects/branches/filter" = render "projects/branches/filter"
.col-md-9 .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 Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
%p This ability allows: %p This ability allows:
%ul %ul
...@@ -12,18 +12,18 @@ ...@@ -12,18 +12,18 @@
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"} %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined_link"}
- if can? current_user, :admin_project, @project - 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? -if @protected_branch.errors.any?
.alert.alert-danger .alert.alert-danger
%ul %ul
- @protected_branch.errors.full_messages.each do |msg| - @protected_branch.errors.full_messages.each do |msg|
%li= msg %li= msg
.entry.clearfix .form-group
= f.label :name, "Branch" = f.label :name, "Branch", class: 'control-label'
.col-md-3 .col-sm-10
= f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2 span3"}) = 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" = f.submit 'Protect', class: "btn-create btn"
- unless @branches.empty? - unless @branches.empty?
%h5 Already Protected: %h5 Already Protected:
......
...@@ -6,5 +6,4 @@ ...@@ -6,5 +6,4 @@
%strong %strong
= blob.filename = blob.filename
.file-content.code.term .file-content.code.term
%div{class: user_color_scheme_class} = render 'shared/file_hljs', blob: blob, first_line_number: blob.startline
= raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )
%div.highlighted-data{class: user_color_scheme_class} %div.highlighted-data{class: user_color_scheme_class}
.line-numbers .line-numbers
- blob.data.lines.size.times do |index| - 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 = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
%i.icon-link %i.icon-link
= i = i
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment