refactor scss, refove unused classes

diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 890ca40..9ab41f9 100644 (file)
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -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')

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index fd15d5c..893cb21 100644 (file)
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -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";

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7d315a1..431b518 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.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;

diff --git a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
index de1fb15..ed6ec77 100644 (file)
--- a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/avatar.scss
@@ -1,8 +1,24 @@
-/** 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; }

diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index c0fa2a2..f061b5d 100644 (file)
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -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;

diff --git a/app/assets/stylesheets/sections/admin.scss b/app/assets/stylesheets/sections/admin.scss
index 18b102d..e189fd2 100644 (file)
--- a/app/assets/stylesheets/sections/admin.scss
+++ b/app/assets/stylesheets/sections/admin.scss
@@ -1,3 +1,21 @@
+/**
+ * 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; }

diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index b6b1423..6c890d3 100644 (file)
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -1,38 +1,3 @@
-.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 {

diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/selects.scss
index 07f7db7..7abbe80 100644 (file)
--- a/app/assets/stylesheets/selects.scss
+++ b/app/assets/stylesheets/selects.scss
@@ -1,3 +1,13 @@
+/* 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;
 }