fix tests. improve ui-box title

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