refactor scss, refove unused classes

Dmitriy Zaporozhets
1 parent 07c82cf7
Showing 8 changed files with 59 additions and 182 deletions Show diff stats
app/assets/javascripts/merge_requests.js.coffee
app/assets/stylesheets/application.scss
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap/avatar.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/sections/admin.scss
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/selects.scss
@@ -76,7 +76,6 @@ class MergeRequest
     $('.ci_widget.ci-' + state).show()
   loadDiff: (event) ->
-    $('.dashboard-loader').show()
     $.ajax
       type: 'GET'
       url: this.$('.nav-tabs .diffs-tab a').attr('href')
@@ -36,6 +36,7 @@
 @import "sections/admin.scss";
 @import "sections/wiki.scss";
 @import "sections/wall.scss";
+@import "sections/dashboard.scss";
 @import "highlight/white.scss";
 @import "highlight/dark.scss";
@@ -17,7 +17,6 @@ body {
   margin: 0 0;
 }
-.visible_link,
 .author_link {
   color: $link_color;
 }
@@ -32,30 +31,12 @@ body {
   padding-bottom: 0;
 }
-.info_link {
-  margin-right: 5px;
-  float: left;
-
-  img {
-    width: 20px;
-  }
-}
-
-.download_repo_link {
-  background: url("images.png") no-repeat 0 -48px;
-  padding-left: 20px;
-}
-
 table a code {
   position: relative;
   top: -2px;
   margin-right: 3px;
 }
-.span12 hr{
- margin-top: 5px;
-}
-
 .loading {
   margin: 20px auto;
   background: url(ajax_loader.gif) no-repeat center center;
@@ -81,10 +62,6 @@ table a code {
   }
 }
-.git_url_wrapper {
-  margin-right:50px
-}
-
 span.update-author {
   display: block;
   color: #999;
@@ -96,20 +73,11 @@ span.update-author {
   }
 }
-.dashboard-loader {
-  float: left;
-  margin: 10px;
-  display: none;
-}
 .user-mention {
   color: #2FA0BB;
   font-weight: bold;
 }
-.neib {
-  margin-right: 10px;
-}
-
 .label {
   padding: 1px 4px;
   font-size: 12px;
@@ -170,27 +138,6 @@ input[type=text] {
   }
 }
-.merge-request-form-holder {
-  select {
-    width: 300px;
-  }
-}
-
-/** Issues **/
-#issue_assignee_id {
-  width: 300px;
-}
-
-#new_issue_dialog textarea{
-    height: 100px;
-}
-
-.project_list_url {
-  width: 250px;
-  background:#fff !important;
-}
-
-
 .line_holder {
   &:hover {
     td {
@@ -222,24 +169,6 @@ p.time {
   margin: 30px 3px 3px 2px;
 }
-
-.styled_image {
-  border: 2px solid #ddd;
-}
-
-
-
-/* Fix for readme code (stopped it from being yellow) */
-.readme {
-  pre {
-    background: white !important;
-
-    code {
-      background: none !important;
-    }
-  }
-}
-
 .search-holder {
   label, input {
      height: 30px;
@@ -333,25 +262,6 @@ li.note {
 }
-
-/**
- * Admin area
- *
- */
-.admin_dash {
-  .data {
-    a {
-      h1 {
-        line-height: 48px;
-        font-size: 48px;
-        padding: 20px;
-        text-align: center;
-        font-weight: normal;
-      }
-    }
-  }
-}
-
 .rss-icon {
   img {
     width: 24px;
@@ -364,18 +274,6 @@ li.note {
 }
-
-/* CHZN reset few styles */
-.chzn-container-single .chzn-single {
-  background: #FFF;
-  border: 1px solid #bbb;
-  box-shadow: none;
-}
-.chzn-container-active .chzn-single {
-  background: #fff;
-}
-
-
 .supp_diff_link,
 .show-all-commits {
   cursor: pointer;
@@ -481,27 +379,6 @@ pre {
   }
 }
-.float-link {
-  float: left;
-  margin-right: 15px;
-  .s16 {
-    margin-right: 5px;
-  }
-}
-
-.dashboard-search-filter {
-  padding:5px;
-
-  .search-text-input {
-    float:left;
-    @extend .span2;
-  }
-  .btn {
-    margin-left: 5px;
-    float:left;
-  }
-}
-
 h1.http_status_code {
   font-size: 56px;
   line-height: 100px;
@@ -532,18 +409,6 @@ img.emoji {
   display: none;
 }
-.label-branch {
-  @include border-radius(4px);
-  padding: 2px 4px;
-  border: none;
-  font-size: 14px;
-  background: #474D57;
-  color: #fff;
-  font-family: $monospace_font;
-  text-shadow: 0 1px 1px #111;
-  font-weight: normal;
-}
-
 .chart {
   overflow: hidden;
   height: 220px;
-/** AVATARS **/
-img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
-img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
-img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
-img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
-img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }
+.avatar {
+  float: left;
+  margin-right: 12px;
+  width: 40px;
+  border: 1px solid #ddd;
+  padding: 1px;
+
+  &.avatar-inline {
+    float: none;
+    margin-left: 3px;
+
+    &.s16 { margin-right: 2px; }
+    &.s24 { margin-right: 2px; }
+  }
+
+  &.s16 { width: 16px; height: 16px; margin-right: 6px; }
+  &.s24 { width: 24px; height: 24px; margin-right: 8px; }
+  &.s32 { width: 32px; height: 32px; margin-right: 10px; }
+  &.s90 { width: 90px; height: 90px; margin-right: 15px; }
+}
+
+
 img.lil_av { padding-left: 4px; padding-right: 3px; }
 img.small { width: 80px; }
@@ -10,11 +10,16 @@
 /** COMMON CLASSES **/
 .left { float:left }
-.append-bottom-10 { margin-bottom:10px }
-.append-bottom-20 { margin-bottom:20px }
+
 .prepend-top-10 { margin-top:10px }
 .prepend-top-20 { margin-top:20px }
-.prepend-left { margin-left:20px }
+.prepend-left-10 { margin-left:10px }
+.prepend-left-20 { margin-left:20px }
+.append-right-10 { margin-right:10px }
+.append-right-20 { margin-right:20px }
+.append-bottom-10 { margin-bottom:10px }
+.append-bottom-20 { margin-bottom:20px }
+
 .padded { padding:20px }
 .ipadded { padding:20px!important }
 .lborder { border-left:1px solid #eee }
@@ -32,8 +37,6 @@
   border-color: #DDD;
 }
-.well { padding: 15px; }
-
 /** HELPERS **/
 .nothing_here_message {
   text-align: center;
+/**
+ * Admin area
+ *
+ */
+.admin_dash {
+  .data {
+    a {
+      h1 {
+        line-height: 48px;
+        font-size: 48px;
+        padding: 20px;
+        text-align: center;
+        font-weight: normal;
+      }
+    }
+  }
+}
+
 .admin-filter form {
   label { width: 110px; }
   .controls { margin-left: 130px; }
-.projects {
-  @extend .row;
-  .activities {
-  }
-
-  .side {
-    @extend .pull-right;
-
-    .ui-box {
-      margin: 3px;
-      > .title {
-        padding: 2px 15px;
-      }
-      .nav-projects-tabs li { padding: 0; }
-      .well-list {
-        li { padding: 15px; }
-        .arrow {
-          float: right;
-          padding: 10px;
-          margin: 0;
-        }
-        .last_activity {
-          padding-top: 5px;
-          display: block;
-          span, strong {
-            font-size: 12px;
-            color: #666;
-          }
-        }
-      }
-      @extend .ui-box;
-    }
-  }
-}
-
 .new_project,
 .edit_project {
   .project_name_holder {
+/* CHZN reset few styles */
+.chzn-container-single .chzn-single {
+  background: #FFF;
+  border: 1px solid #bbb;
+  box-shadow: none;
+}
+.chzn-container-active .chzn-single {
+  background: #fff;
+}
+
 .ajax-users-select {
   width: 400px;
 }
	@@ -76,7 +76,6 @@ class MergeRequest		@@ -76,7 +76,6 @@ class MergeRequest
76	$('.ci_widget.ci-' + state).show()	76	$('.ci_widget.ci-' + state).show()
77		77
78	loadDiff: (event) ->	78	loadDiff: (event) ->
79	- $('.dashboard-loader').show()
80	$.ajax	79	$.ajax
81	type: 'GET'	80	type: 'GET'
82	url: this.$('.nav-tabs .diffs-tab a').attr('href')	81	url: this.$('.nav-tabs .diffs-tab a').attr('href')
	@@ -36,6 +36,7 @@		@@ -36,6 +36,7 @@
36	@import "sections/admin.scss";	36	@import "sections/admin.scss";
37	@import "sections/wiki.scss";	37	@import "sections/wiki.scss";
38	@import "sections/wall.scss";	38	@import "sections/wall.scss";
		39	+@import "sections/dashboard.scss";
39		40
40	@import "highlight/white.scss";	41	@import "highlight/white.scss";
41	@import "highlight/dark.scss";	42	@import "highlight/dark.scss";
	@@ -17,7 +17,6 @@ body {		@@ -17,7 +17,6 @@ body {
17	margin: 0 0;	17	margin: 0 0;
18	}	18	}
19		19
20	-.visible_link,
21	.author_link {	20	.author_link {
22	color: $link_color;	21	color: $link_color;
23	}	22	}
	@@ -32,30 +31,12 @@ body {		@@ -32,30 +31,12 @@ body {
32	padding-bottom: 0;	31	padding-bottom: 0;
33	}	32	}
34		33
35	-.info_link {
36	- margin-right: 5px;
37	- float: left;
38	-
39	- img {
40	- width: 20px;
41	- }
42	-}
43	-
44	-.download_repo_link {
45	- background: url("images.png") no-repeat 0 -48px;
46	- padding-left: 20px;
47	-}
48	-
49	table a code {	34	table a code {
50	position: relative;	35	position: relative;
51	top: -2px;	36	top: -2px;
52	margin-right: 3px;	37	margin-right: 3px;
53	}	38	}
54		39
55	-.span12 hr{
56	- margin-top: 5px;
57	-}
58	-
59	.loading {	40	.loading {
60	margin: 20px auto;	41	margin: 20px auto;
61	background: url(ajax_loader.gif) no-repeat center center;	42	background: url(ajax_loader.gif) no-repeat center center;
	@@ -81,10 +62,6 @@ table a code {		@@ -81,10 +62,6 @@ table a code {
81	}	62	}
82	}	63	}
83		64
84	-.git_url_wrapper {
85	- margin-right:50px
86	-}
87	-
88	span.update-author {	65	span.update-author {
89	display: block;	66	display: block;
90	color: #999;	67	color: #999;
	@@ -96,20 +73,11 @@ span.update-author {		@@ -96,20 +73,11 @@ span.update-author {
96	}	73	}
97	}	74	}
98		75
99	-.dashboard-loader {
100	- float: left;
101	- margin: 10px;
102	- display: none;
103	-}
104	.user-mention {	76	.user-mention {
105	color: #2FA0BB;	77	color: #2FA0BB;
106	font-weight: bold;	78	font-weight: bold;
107	}	79	}
108		80
109	-.neib {
110	- margin-right: 10px;
111	-}
112	-
113	.label {	81	.label {
114	padding: 1px 4px;	82	padding: 1px 4px;
115	font-size: 12px;	83	font-size: 12px;
	@@ -170,27 +138,6 @@ input[type=text] {		@@ -170,27 +138,6 @@ input[type=text] {
170	}	138	}
171	}	139	}
172		140
173	-.merge-request-form-holder {
174	- select {
175	- width: 300px;
176	- }
177	-}
178	-
179	-/ Issues /
180	-#issue_assignee_id {
181	- width: 300px;
182	-}
183	-
184	-#new_issue_dialog textarea{
185	- height: 100px;
186	-}
187	-
188	-.project_list_url {
189	- width: 250px;
190	- background:#fff !important;
191	-}
192	-
193	-
194	.line_holder {	141	.line_holder {
195	&:hover {	142	&:hover {
196	td {	143	td {
	@@ -222,24 +169,6 @@ p.time {		@@ -222,24 +169,6 @@ p.time {
222	margin: 30px 3px 3px 2px;	169	margin: 30px 3px 3px 2px;
223	}	170	}
224		171
225	-
226	-.styled_image {
227	- border: 2px solid #ddd;
228	-}
229	-
230	-
231	-
232	-/* Fix for readme code (stopped it from being yellow) */
233	-.readme {
234	- pre {
235	- background: white !important;
236	-
237	- code {
238	- background: none !important;
239	- }
240	- }
241	-}
242	-
243	.search-holder {	172	.search-holder {
244	label, input {	173	label, input {
245	height: 30px;	174	height: 30px;
	@@ -333,25 +262,6 @@ li.note {		@@ -333,25 +262,6 @@ li.note {
333	}	262	}
334		263
335		264
336	-
337	-/**
338	- * Admin area
339	- *
340	- */
341	-.admin_dash {
342	- .data {
343	- a {
344	- h1 {
345	- line-height: 48px;
346	- font-size: 48px;
347	- padding: 20px;
348	- text-align: center;
349	- font-weight: normal;
350	- }
351	- }
352	- }
353	-}
354	-
355	.rss-icon {	265	.rss-icon {
356	img {	266	img {
357	width: 24px;	267	width: 24px;
	@@ -364,18 +274,6 @@ li.note {		@@ -364,18 +274,6 @@ li.note {
364	}	274	}
365		275
366		276
367	-
368	-/* CHZN reset few styles */
369	-.chzn-container-single .chzn-single {
370	- background: #FFF;
371	- border: 1px solid #bbb;
372	- box-shadow: none;
373	-}
374	-.chzn-container-active .chzn-single {
375	- background: #fff;
376	-}
377	-
378	-
379	.supp_diff_link,	277	.supp_diff_link,
380	.show-all-commits {	278	.show-all-commits {
381	cursor: pointer;	279	cursor: pointer;
	@@ -481,27 +379,6 @@ pre {		@@ -481,27 +379,6 @@ pre {
481	}	379	}
482	}	380	}
483		381
484	-.float-link {
485	- float: left;
486	- margin-right: 15px;
487	- .s16 {
488	- margin-right: 5px;
489	- }
490	-}
491	-
492	-.dashboard-search-filter {
493	- padding:5px;
494	-
495	- .search-text-input {
496	- float:left;
497	- @extend .span2;
498	- }
499	- .btn {
500	- margin-left: 5px;
501	- float:left;
502	- }
503	-}
504	-
505	h1.http_status_code {	382	h1.http_status_code {
506	font-size: 56px;	383	font-size: 56px;
507	line-height: 100px;	384	line-height: 100px;
	@@ -532,18 +409,6 @@ img.emoji {		@@ -532,18 +409,6 @@ img.emoji {
532	display: none;	409	display: none;
533	}	410	}
534		411
535	-.label-branch {
536	- @include border-radius(4px);
537	- padding: 2px 4px;
538	- border: none;
539	- font-size: 14px;
540	- background: #474D57;
541	- color: #fff;
542	- font-family: $monospace_font;
543	- text-shadow: 0 1px 1px #111;
544	- font-weight: normal;
545	-}
546	-
547	.chart {	412	.chart {
548	overflow: hidden;	413	overflow: hidden;
549	height: 220px;	414	height: 220px;
1	-/ AVATARS /
2	-img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
3	-img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
4	-img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
5	-img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
6	-img.avatar.s90 { width: 90px; height: 90px; margin-right: 15px; }	1	+.avatar {
		2	+ float: left;
		3	+ margin-right: 12px;
		4	+ width: 40px;
		5	+ border: 1px solid #ddd;
		6	+ padding: 1px;
		7	+
		8	+ &.avatar-inline {
		9	+ float: none;
		10	+ margin-left: 3px;
		11	+
		12	+ &.s16 { margin-right: 2px; }
		13	+ &.s24 { margin-right: 2px; }
		14	+ }
		15	+
		16	+ &.s16 { width: 16px; height: 16px; margin-right: 6px; }
		17	+ &.s24 { width: 24px; height: 24px; margin-right: 8px; }
		18	+ &.s32 { width: 32px; height: 32px; margin-right: 10px; }
		19	+ &.s90 { width: 90px; height: 90px; margin-right: 15px; }
		20	+}
		21	+
		22	+
7	img.lil_av { padding-left: 4px; padding-right: 3px; }	23	img.lil_av { padding-left: 4px; padding-right: 3px; }
8	img.small { width: 80px; }	24	img.small { width: 80px; }
		1	+/**
		2	+ * Admin area
		3	+ *
		4	+ */
		5	+.admin_dash {
		6	+ .data {
		7	+ a {
		8	+ h1 {
		9	+ line-height: 48px;
		10	+ font-size: 48px;
		11	+ padding: 20px;
		12	+ text-align: center;
		13	+ font-weight: normal;
		14	+ }
		15	+ }
		16	+ }
		17	+}
		18	+
1	.admin-filter form {	19	.admin-filter form {
2	label { width: 110px; }	20	label { width: 110px; }
3	.controls { margin-left: 130px; }	21	.controls { margin-left: 130px; }
1	-.projects {
2	- @extend .row;
3	- .activities {
4	- }
5	-
6	- .side {
7	- @extend .pull-right;
8	-
9	- .ui-box {
10	- margin: 3px;
11	- > .title {
12	- padding: 2px 15px;
13	- }
14	- .nav-projects-tabs li { padding: 0; }
15	- .well-list {
16	- li { padding: 15px; }
17	- .arrow {
18	- float: right;
19	- padding: 10px;
20	- margin: 0;
21	- }
22	- .last_activity {
23	- padding-top: 5px;
24	- display: block;
25	- span, strong {
26	- font-size: 12px;
27	- color: #666;
28	- }
29	- }
30	- }
31	- @extend .ui-box;
32	- }
33	- }
34	-}
35	-
36	.new_project,	1	.new_project,
37	.edit_project {	2	.edit_project {
38	.project_name_holder {	3	.project_name_holder {
		1	+/* CHZN reset few styles */
		2	+.chzn-container-single .chzn-single {
		3	+ background: #FFF;
		4	+ border: 1px solid #bbb;
		5	+ box-shadow: none;
		6	+}
		7	+.chzn-container-active .chzn-single {
		8	+ background: #fff;
		9	+}
		10	+
1	.ajax-users-select {	11	.ajax-users-select {
2	width: 400px;	12	width: 400px;
3	}	13	}