Download as
Browse Code »

Commit ac148c50b07e298ff3f54147bd3faa0485f7e0a1

Authored by Dmitriy Zaporozhets
1 parent 9a94f5eb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

style counters on navbar. minor ui changes

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @ac148c5
@@ -10,17 +10,17 @@ @@ -10,17 +10,17 @@
10 top: 3px; 10 top: 3px;
11 overflow: hidden; 11 overflow: hidden;
12 .count { 12 .count {
13 - position: relative;  
14 - top: -1px; 13 + font-weight: normal;
15 display: inline-block; 14 display: inline-block;
16 height: 15px; 15 height: 15px;
17 - margin: 0 0 0 5px;  
18 - padding: 0 8px 1px 8px; 16 + padding: 1px 6px;
19 height: auto; 17 height: auto;
20 font-size: 0.82em; 18 font-size: 0.82em;
21 line-height: 14px; 19 line-height: 14px;
22 text-align: center; 20 text-align: center;
23 color: #777; 21 color: #777;
  22 + background: #eee;
  23 + @include border-radius(8px);
24 } 24 }
25 .label { 25 .label {
26 background: $hover; 26 background: $hover;
app/assets/stylesheets/themes/ui_basic.scss
  Diff comments   View file @ac148c5
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 .ui_basic { 6 .ui_basic {
7 .separator { 7 .separator {
8 - background: white; 8 + background: #F9F9F9;
9 border-left: 1px solid #DDD; 9 border-left: 1px solid #DDD;
10 } 10 }
11 } 11 }
app/views/projects/_clone_panel.html.haml
  Diff comments   View file @ac148c5
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 - unless @project.empty_repo? 7 - unless @project.empty_repo?
8 - if can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace 8 - if can?(current_user, :fork_project, @project) && @project.namespace != current_user.namespace
9 - if current_user.already_forked?(@project) 9 - if current_user.already_forked?(@project)
10 - = link_to project_path(current_user.fork_of(@project)), class: 'btn grouped success' do 10 + = link_to project_path(current_user.fork_of(@project)), class: 'btn grouped btn-primary' do
11 Forked 11 Forked
12 - else 12 - else
13 = link_to fork_project_path(@project), title: "Fork", class: "btn grouped", method: "POST" do 13 = link_to fork_project_path(@project), title: "Fork", class: "btn grouped", method: "POST" do