Commit d8fc0c3bb9c9f8b802e62c572caa23bc91238219
1 parent
a41875d2
Exists in
master
and in
4 other branches
fix tests. improve ui-box title
Showing
5 changed files
with
7 additions
and
11 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
| @@ -86,9 +86,9 @@ | @@ -86,9 +86,9 @@ | ||
| 86 | color: #456; | 86 | color: #456; |
| 87 | font-size: 16px; | 87 | font-size: 16px; |
| 88 | text-shadow: 0 1px 1px #fff; | 88 | text-shadow: 0 1px 1px #fff; |
| 89 | - padding: 10px; | 89 | + padding: 0 10px; |
| 90 | font-size: 14px; | 90 | font-size: 14px; |
| 91 | - line-height: 20px; | 91 | + line-height: 40px; |
| 92 | font-weight: normal; | 92 | font-weight: normal; |
| 93 | margin: 0; | 93 | margin: 0; |
| 94 | 94 | ||
| @@ -102,8 +102,7 @@ | @@ -102,8 +102,7 @@ | ||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | .btn { | 104 | .btn { |
| 105 | - position: relative; | ||
| 106 | - margin-top: -2px; | 105 | + vertical-align: middle; |
| 107 | } | 106 | } |
| 108 | 107 | ||
| 109 | .nav-pills { | 108 | .nav-pills { |
app/assets/stylesheets/sections/dashboard.scss
| @@ -10,9 +10,6 @@ | @@ -10,9 +10,6 @@ | ||
| 10 | margin: 0px; | 10 | margin: 0px; |
| 11 | box-shadow: none; | 11 | box-shadow: none; |
| 12 | 12 | ||
| 13 | - .title .btn { | ||
| 14 | - margin: 0; | ||
| 15 | - } | ||
| 16 | .nav-projects-tabs li { padding: 0; } | 13 | .nav-projects-tabs li { padding: 0; } |
| 17 | } | 14 | } |
| 18 | } | 15 | } |
| @@ -33,7 +30,7 @@ | @@ -33,7 +30,7 @@ | ||
| 33 | 30 | ||
| 34 | .dashboard { | 31 | .dashboard { |
| 35 | .dash-filter { | 32 | .dash-filter { |
| 36 | - margin: 0; | 33 | + margin: 7px 0; |
| 37 | padding: 4px 6px; | 34 | padding: 4px 6px; |
| 38 | width: 202px; | 35 | width: 202px; |
| 39 | float: left; | 36 | float: left; |
features/steps/project/project_browse_commits.rb
| @@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps | @@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps | ||
| 48 | page.should have_selector('ul.breadcrumb span.divider', count: 3) | 48 | page.should have_selector('ul.breadcrumb span.divider', count: 3) |
| 49 | page.should have_selector('ul.breadcrumb a', count: 4) | 49 | page.should have_selector('ul.breadcrumb a', count: 4) |
| 50 | 50 | ||
| 51 | - find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/) | 51 | + find('ul.breadcrumb li:nth-child(2) a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/) |
| 52 | find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z}) | 52 | find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z}) |
| 53 | end | 53 | end |
| 54 | 54 |
features/steps/project/project_snippets.rb
| @@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps | @@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps | ||
| 42 | end | 42 | end |
| 43 | 43 | ||
| 44 | And 'I click link "Edit"' do | 44 | And 'I click link "Edit"' do |
| 45 | - within ".file_title" do | 45 | + within ".file-title" do |
| 46 | click_link "Edit" | 46 | click_link "Edit" |
| 47 | end | 47 | end |
| 48 | end | 48 | end |
features/steps/snippets/snippets.rb
| @@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps | @@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps | ||
| 13 | end | 13 | end |
| 14 | 14 | ||
| 15 | And 'I click link "Edit"' do | 15 | And 'I click link "Edit"' do |
| 16 | - within ".file_title" do | 16 | + within ".file-title" do |
| 17 | click_link "Edit" | 17 | click_link "Edit" |
| 18 | end | 18 | end |
| 19 | end | 19 | end |