From d8fc0c3bb9c9f8b802e62c572caa23bc91238219 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 13 Jul 2013 20:53:46 +0300 Subject: [PATCH] fix tests. improve ui-box title --- app/assets/stylesheets/gitlab_bootstrap/blocks.scss | 7 +++---- app/assets/stylesheets/sections/dashboard.scss | 5 +---- features/steps/project/project_browse_commits.rb | 2 +- features/steps/project/project_snippets.rb | 2 +- features/steps/snippets/snippets.rb | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss index 3101dfc..c5bbb9b 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss @@ -86,9 +86,9 @@ color: #456; font-size: 16px; text-shadow: 0 1px 1px #fff; - padding: 10px; + padding: 0 10px; font-size: 14px; - line-height: 20px; + line-height: 40px; font-weight: normal; margin: 0; @@ -102,8 +102,7 @@ } .btn { - position: relative; - margin-top: -2px; + vertical-align: middle; } .nav-pills { diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss index 3a69dde..15bfad9 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/sections/dashboard.scss @@ -10,9 +10,6 @@ margin: 0px; box-shadow: none; - .title .btn { - margin: 0; - } .nav-projects-tabs li { padding: 0; } } } @@ -33,7 +30,7 @@ .dashboard { .dash-filter { - margin: 0; + margin: 7px 0; padding: 4px 6px; width: 202px; float: left; diff --git a/features/steps/project/project_browse_commits.rb b/features/steps/project/project_browse_commits.rb index 95d3072..71f4bd7 100644 --- a/features/steps/project/project_browse_commits.rb +++ b/features/steps/project/project_browse_commits.rb @@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps page.should have_selector('ul.breadcrumb span.divider', count: 3) page.should have_selector('ul.breadcrumb a', count: 4) - find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/) + find('ul.breadcrumb li:nth-child(2) a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/) find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z}) end diff --git a/features/steps/project/project_snippets.rb b/features/steps/project/project_snippets.rb index 2634ea1..d390459 100644 --- a/features/steps/project/project_snippets.rb +++ b/features/steps/project/project_snippets.rb @@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps end And 'I click link "Edit"' do - within ".file_title" do + within ".file-title" do click_link "Edit" end end diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb index 1fac8d0..d21ce93 100644 --- a/features/steps/snippets/snippets.rb +++ b/features/steps/snippets/snippets.rb @@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps end And 'I click link "Edit"' do - within ".file_title" do + within ".file-title" do click_link "Edit" end end -- libgit2 0.21.2