Fix forms and header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix forms and header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 1b1a408a
Showing 9 changed files with 37 additions and 8 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap/forms.scss
app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/editor.scss
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/wall.scss
@@ -209,7 +209,7 @@ li.note {
 }
  
 .git_error_tips {
-  @extend .span6;
+  @extend .col-md-6;
   text-align: left;
   margin-top: 40px;
   pre {
+input[type="text"], input[type="password"], input[type="search"], input[type="email"] {
+  @extend .form-control;
+}
+
 form {
   @extend .form-horizontal;
  
   label {
     @extend .control-label;
+    @extend .col-sm-2;
  
     &.radio-label {
       text-align: left;
@@ -33,10 +38,14 @@ input.input-xpadding,
 }
  
 .control-group {
+  @extend .form-group;
+
   .control-label {
     padding-top: 6px;
   }
   .controls {
+    @extend .col-sm-10;
+
     input, textarea {
       padding: 6px 10px;
     }
@@ -76,3 +85,12 @@ fieldset legend {
     width: 100px;
   }
 }
+
+.form-actions {
+  padding: 17px 20px 18px;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  background-color: whitesmoke;
+  border-top: 1px solid #e5e5e5;
+  padding-left: 180px;
+}
@@ -43,6 +43,7 @@
  
   ul {
     margin: 0;
+    padding: 0;
   }
  
   .title {
@@ -20,7 +20,7 @@
  
   .search-text-input {
     float:left;
-    @extend .span2;
+    @extend .col-md-2;
   }
   .btn {
     margin-left: 5px;
@@ -42,7 +42,7 @@
       line-height: 20px;
     }
     textarea {
-      @extend .span8;
+      @extend .col-md-8;
     }
   }
 }
@@ -147,7 +147,7 @@
       float: left;
       padding: 9px 6px;
       font-size: 18px;
-      width: 26px;
+      width: 40px;
       @include border-radius(3px);
     }
  
@@ -5,6 +5,9 @@
 header {
   &.navbar-gitlab {
     margin-bottom: 0;
+    height: 40px;
+    overflow: hidden;
+
     .navbar-inner {
       /*height: 40px;*/
       padding: 3px;
@@ -92,12 +95,19 @@ header {
   .search {
     margin-right: 10px;
     margin-left: 10px;
+    margin-top: 5px;
+
+    form {
+      margin: 0;
+    }
  
     .search-input {
-      @extend .span3;
+      width: 300px;
       background-image: url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
+      height: inherit;
+      padding: 4px 6px;
       padding-left: 25px;
       font-size: 13px;
       @include border-radius(3px);
@@ -105,7 +115,7 @@ header {
       box-shadow: none;
       @include transition(all 0.15s ease-in 0s);
       &:focus {
-        @extend .span4;
+        @extend .col-md-4;
       }
     }
   }
@@ -302,7 +302,7 @@ ul.notes {
 }
  
 .note-image-attach {
-  @extend .span4;
+  @extend .col-md-4;
   @extend .thumbnail;
   margin-left: 45px;
 }
 .wall-page {
   .wall-note-form {
-    @extend .span12;
+    @extend .col-md-12;
  
     margin: 0;
     height: 140px;
...	...	@@ -209,7 +209,7 @@ li.note {
209	209	}
210	210
211	211	.git_error_tips {
212		- @extend .span6;
	212	+ @extend .col-md-6;
213	213	text-align: left;
214	214	margin-top: 40px;
215	215	pre {
...	...
	1	+input[type="text"], input[type="password"], input[type="search"], input[type="email"] {
	2	+ @extend .form-control;
	3	+}
	4	+
1	5	form {
2	6	@extend .form-horizontal;
3	7
4	8	label {
5	9	@extend .control-label;
	10	+ @extend .col-sm-2;
6	11
7	12	&.radio-label {
8	13	text-align: left;
...	...	@@ -33,10 +38,14 @@ input.input-xpadding,
33	38	}
34	39
35	40	.control-group {
	41	+ @extend .form-group;
	42	+
36	43	.control-label {
37	44	padding-top: 6px;
38	45	}
39	46	.controls {
	47	+ @extend .col-sm-10;
	48	+
40	49	input, textarea {
41	50	padding: 6px 10px;
42	51	}
...	...	@@ -76,3 +85,12 @@ fieldset legend {
76	85	width: 100px;
77	86	}
78	87	}
	88	+
	89	+.form-actions {
	90	+ padding: 17px 20px 18px;
	91	+ margin-top: 18px;
	92	+ margin-bottom: 18px;
	93	+ background-color: whitesmoke;
	94	+ border-top: 1px solid #e5e5e5;
	95	+ padding-left: 180px;
	96	+}
...	...
...	...	@@ -43,6 +43,7 @@
43	43
44	44	ul {
45	45	margin: 0;
	46	+ padding: 0;
46	47	}
47	48
48	49	.title {
...	...
...	...	@@ -20,7 +20,7 @@
20	20
21	21	.search-text-input {
22	22	float:left;
23		- @extend .span2;
	23	+ @extend .col-md-2;
24	24	}
25	25	.btn {
26	26	margin-left: 5px;
...	...
...	...	@@ -42,7 +42,7 @@
42	42	line-height: 20px;
43	43	}
44	44	textarea {
45		- @extend .span8;
	45	+ @extend .col-md-8;
46	46	}
47	47	}
48	48	}
...	...
...	...	@@ -147,7 +147,7 @@
147	147	float: left;
148	148	padding: 9px 6px;
149	149	font-size: 18px;
150		- width: 26px;
	150	+ width: 40px;
151	151	@include border-radius(3px);
152	152	}
153	153
...	...
...	...	@@ -5,6 +5,9 @@
5	5	header {
6	6	&.navbar-gitlab {
7	7	margin-bottom: 0;
	8	+ height: 40px;
	9	+ overflow: hidden;
	10	+
8	11	.navbar-inner {
9	12	/height: 40px;/
10	13	padding: 3px;
...	...	@@ -92,12 +95,19 @@ header {
92	95	.search {
93	96	margin-right: 10px;
94	97	margin-left: 10px;
	98	+ margin-top: 5px;
	99	+
	100	+ form {
	101	+ margin: 0;
	102	+ }
95	103
96	104	.search-input {
97		- @extend .span3;
	105	+ width: 300px;
98	106	background-image: url("icon-search.png");
99	107	background-repeat: no-repeat;
100	108	background-position: 10px;
	109	+ height: inherit;
	110	+ padding: 4px 6px;
101	111	padding-left: 25px;
102	112	font-size: 13px;
103	113	@include border-radius(3px);
...	...	@@ -105,7 +115,7 @@ header {
105	115	box-shadow: none;
106	116	@include transition(all 0.15s ease-in 0s);
107	117	&:focus {
108		- @extend .span4;
	118	+ @extend .col-md-4;
109	119	}
110	120	}
111	121	}
...	...
...	...	@@ -302,7 +302,7 @@ ul.notes {
302	302	}
303	303
304	304	.note-image-attach {
305		- @extend .span4;
	305	+ @extend .col-md-4;
306	306	@extend .thumbnail;
307	307	margin-left: 45px;
308	308	}
...	...
1	1	.wall-page {
2	2	.wall-note-form {
3		- @extend .span12;
	3	+ @extend .col-md-12;
4	4
5	5	margin: 0;
6	6	height: 140px;
...	...