Refactoring scss & improving some UI elements

app/assets/stylesheets/common.scss

@@ -105,16 +105,6 @@ table a code {
 .git_url_wrapper {
   margin-right:50px
 }
-.file_stats {
-  span {
-    img {
-      width:14px;
-      float:left;
-      margin-right:6px;
-      padding:2px 0;
-    }
-  }
-}
 
 .handle:hover {
   cursor:move;
@@ -148,18 +138,6 @@ span.update-author {
   font-weight:bold;
 }
 
-a.project-update.titled {
-  position:relative;
-  padding-left:35% !important;
-  .title-block {
-    padding:10px;
-    width:35%;
-    position:absolute;
-    left:0;
-    top:0;
-  }
-}
-
 .neib {
   margin-right:10px;
 }
@@ -230,10 +208,6 @@ form {
 }
 
 
-
-
-
-
 .field_with_errors {
   display:inline;
 }
@@ -343,40 +317,6 @@ p.time {
 }
 
 
-/**
- * Dashboard page
- *
- */
-.dashboard_category {
-  margin-bottom:30px;
-  h3 a {
-    color:#474D57;
-    &:hover {
-      text-decoration:underline;
-    }
-  }
-
-  .dashboard_block {
-    .dash_project_item {
-      margin-bottom:10px;
-      border:none;
-      padding:0px 5px;
-      .project_link {
-        color:#888;
-        &:hover {
-          color:#111;
-          .ico.project {
-            background-position:-209px -21px;
-          }
-        }
-      }
-      h4 {
-        color:#666;
-      }
-    }
-  }
-}
-
 .styled_image {
   border:2px solid #ddd;
 }
@@ -466,39 +406,6 @@ p.time {
   }
 }
 
-.btn {
-  &.very_small {
-    font-size:11px;
-    padding:2px 6px;
-    margin:2px;
-  }
-
-  &.grouped {
-    margin-right:7px;
-    float:left;
-  }
-
-  &.padded {
-    margin-right:3px;
-    padding:4px 10px 4px;
-  }
-}
-
-
-.prettyprint {
-  background-color: #fefbf3;
-  padding: 9px;
-  border: 1px solid rgba(0,0,0,.2);
-  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
-  -moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);
-  box-shadow: 0 1px 2px rgba(0,0,0,.1);
-}
-
-.hint {
-  font-style: italic;
-  color: #999;
-}
-
 .upvotes {
   font-size: 14px;
   font-weight: bold;
@@ -622,14 +529,6 @@ li.note {
 }
 
 
-/**
- * Milestones list
- *
- */
-
-.milestone {
-  @extend .wll;
-}
 
 /**
  * Admin area
@@ -676,11 +575,10 @@ li.note {
  *
  */
 .event_lp {
-  @extend .alert-info;
+  @extend .ui-box;
+  color:#777;
   margin-bottom:20px;
   padding:8px;
-  border-style: solid;
-  border-width: 1px;
   @include border-radius(4px);
   min-height:22px;
 
@@ -694,88 +592,19 @@ li.note {
   cursor:pointer;
 }
 
-/**
- *  Issues, MRs legend
- *
- */
-
-.list_legend {
-  float:left;
-  margin-right:20px;
-  .icon {
-    width:12px;
-    height:12px;
-    float:left;
-    margin-right:5px;
-    margin-top: 2px;
-    @include border-radius(4px);
-    &.today{
-      background: #ADA;
-      border:1px solid #8B8;
-    }
-    &.closed {
-      background: #DDD;
-      border:1px solid  #BBB;
-    }
-    &.yours {
-      background: #AAD;
-      border:1px solid #88B;
-    }
-    &.merged {
-      background: #DAD;
-      border:1px solid #B8B;
-    }
-  }
-  .text {
-    padding-bottom: 10px;
-    float:left;
-  }
-}
-
 .merge_request,
 .issue {
-  .list_legend {
-    margin-right: 5px;
-    margin-top: 14px;
-    .icon {
-      width:8px;
-      height:8px;
-      float:left;
-      margin-right:5px;
-      @include border-radius(4px);
-      border:1px solid #ddd;
-    }
-  }
-
   &.today{
     background: #EFE;
     border-color:#CEC;
-    .icon {
-      background: #ADA;
-      border:1px solid #8B8;
-    }
   }
   &.closed {
     background: #F5f5f5;
     border-color:#E5E5E5;
-    .icon {
-      background: #DDD;
-      border:1px solid  #BBB;
-    }
-  }
-  &.yours {
-    .icon {
-      background: #AAD;
-      border:1px solid #88B;
-    }
   }
   &.merged {
     background: #F5f5f5;
     border-color:#E5E5E5;
-    .icon {
-      background: #DAD;
-      border:1px solid #B8B;
-    }
   }
 }
 

app/assets/stylesheets/gitlab_bootstrap/buttons.scss

@@ -69,4 +69,20 @@
     border-color:#aaa;
     background-color:#ccc;
   }
+
+  &.very_small {
+    font-size:11px;
+    padding:2px 6px;
+    margin:2px;
+  }
+
+  &.grouped {
+    margin-right:7px;
+    float:left;
+  }
+
+  &.padded {
+    margin-right:3px;
+    padding:4px 10px 4px;
+  }
 }

app/assets/stylesheets/gitlab_bootstrap/common.scss

@@ -27,6 +27,7 @@
 .no-borders { border:none; }
 .vlink { color: $link_color !important; }
 .borders { border: 1px solid #ccc; @include shade; }
+.hint { font-style: italic; color: #999; }
 
 /** PILLS & TABS**/
 .nav-pills a:hover { background-color:#888; }

app/assets/stylesheets/sections/commits.scss

@@ -206,9 +206,24 @@
     min-width:65px;
     font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
   }
+  
+  .commit-author-name { 
+    color: #777;
+  }
 }
 
 .diff_file_header a,
 .file_stats a {
   color:$style_color;
 }
+
+.file_stats {
+  span {
+    img {
+      width:14px;
+      float:left;
+      margin-right:6px;
+      padding:2px 0;
+    }
+  }
+}

app/assets/stylesheets/sections/issues.scss

@@ -99,3 +99,11 @@ input.check_all_issues {
 #update_status { 
   width:100px;
 }
+
+/**
+ * Milestones list
+ *
+ */
+.milestone {
+  @extend .wll;
+}

app/assets/stylesheets/sections/merge_requests.scss

@@ -11,23 +11,6 @@
     background:#f1f1f1;
   }
 
-  .commit { 
-    margin:0;
-    padding:0;
-    padding: 5px;
-    margin-bottom: 5px;
-
-    .committed_ago { 
-      display:none;
-    }
-    .browse_code_link_holder { 
-      display:none;
-    }
-    list-style:none;
-    &:hover { 
-      background:none;
-    }
-  }
 }
 
 /**
@@ -110,3 +93,31 @@ li.merge_request {
   font-weight:bold;
   font-family: monospace;
 }
+
+.mr_source_commit, 
+.mr_target_commit { 
+  .commit { 
+    margin:0;
+    padding:0;
+    padding: 5px;
+    margin-bottom: 5px;
+    .avatar { position:relative }
+    .row_title { 
+      color:#444;
+    }
+    .commit-author-name,
+    .dash,
+    .committed_ago,
+    .browse_code_link_holder {
+      display:none;
+    }
+    list-style:none;
+    &:hover { 
+      background:none;
+    }
+  }
+}
+
+.mr_direction_tip { 
+  margin-top:40px
+}

app/assets/stylesheets/sections/projects.scss

@@ -33,11 +33,14 @@
       color:#888;
     }
     .btn {
-      padding:6px;
+      padding:6px 10px;
       margin-left:10px;
       margin-bottom:8px;
     }
   }
+  .adv_settings {
+    h6 { margin-left:40px; } 
+  }
 }
 
 .project_clone_panel {

app/views/commits/_commit.html.haml

@@ -4,8 +4,8 @@
       %strong= link_to "Browse Code »", tree_project_ref_path(@project, commit.id), class: "right"
   %p
     = link_to commit.short_id(8), project_commit_path(@project, id: commit.id), class: "commit_short_id"
-    %strong.cgray= commit.author_name
+    %strong.commit-author-name= commit.author_name
-    –
+    %span.dash –
     = image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
     = link_to_gfm truncate(commit.title, length: 50), project_commit_path(@project, id: commit.id), class: "row_title"
 

app/views/events/_event_last_push.html.haml

@@ -9,5 +9,5 @@
       at
       %strong= link_to event.project.name, event.project
 
-      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small primary" do
+      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn very_small" do
         Create Merge Request

app/views/issues/_form.html.haml

@@ -43,14 +43,15 @@
 
     .actions
       - if @issue.new_record?
-        = f.submit 'Submit new issue', class: "primary btn"
+        = f.submit 'Submit new issue', class: "btn save-btn"
       -else
-        = f.submit 'Save changes', class: "primary btn"
+        = f.submit 'Save changes', class: "save-btn btn"
 
+      - cancel_class = 'btn cancel-btn'
       - if request.xhr?
-        = link_to "Cancel", "#back", onclick: "backToIssues();", class: "btn"
+        = link_to "Cancel", "#back", onclick: "backToIssues();", class: cancel_class
       - else
         - if @issue.new_record?
-          = link_to "Cancel", project_issues_path(@project), class: "btn"
+          = link_to "Cancel", project_issues_path(@project), class: cancel_class
         - else
-          = link_to "Cancel", project_issue_path(@project, @issue), class: "btn"
+          = link_to "Cancel", project_issue_path(@project, @issue), class: cancel_class

app/views/merge_requests/_form.html.haml

@@ -9,7 +9,7 @@
   %br
 
   .row
-    .span6
+    .span5
       .mr_branch_box
         %h5 From (Head Branch)
         .body 
@@ -17,10 +17,11 @@
             = f.label :source_branch, "From", class: "control-label"
             .controls
               = f.select(:source_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
-        .bottom_commit
+      .mr_source_commit
-          .mr_source_commit
 
-    .span6
+    .span2
+      %center= image_tag "merge.png", class: 'mr_direction_tip'
+    .span5
       .mr_branch_box
         %h5 To (Base Branch)
         .body
@@ -28,8 +29,7 @@
             = f.label :target_branch, "To", class: "control-label"
             .controls
               = f.select(:target_branch, @project.heads.map(&:name), { include_blank: "Select branch" }, style: "width:250px")
-        .bottom_commit
+      .mr_target_commit
-          .mr_target_commit
 
   %h4.cdark 2. Fill info
 
@@ -48,12 +48,12 @@
   .control-group
 
   .form-actions
-    = f.submit 'Save', class: "btn-primary btn"
+    = f.submit 'Save', class: "btn save-btn"
     - if @merge_request.new_record?
-      = link_to project_merge_requests_path(@project), class: "btn" do
+      = link_to project_merge_requests_path(@project), class: "btn cancel-btn" do
         Cancel
     - else
-      = link_to project_merge_request_path(@project, @merge_request), class: "btn" do
+      = link_to project_merge_request_path(@project, @merge_request), class: "btn cancel-btn" do
         Cancel
 
 

app/views/projects/_form.html.haml

@@ -10,9 +10,9 @@
     .input
       = f.text_field :name, placeholder: "Example Project", class: "xxlarge"
 
-  %h5.page_title 
+  %hr
-  .alert.alert-info
+  .adv_settings
-    %h5 Advanced settings:
+    %h6 Advanced settings:
     .clearfix
       = f.label :path do
         Path
@@ -34,8 +34,9 @@
         .input= f.select(:default_branch, @project.heads.map(&:name), {}, style: "width:210px;")
 
   - unless @project.new_record?
-    .alert.alert-info
+    %hr
-      %h5 Features:
+    .adv_settings
+      %h6 Features:
 
       .clearfix
         = f.label :issues_enabled, "Issues"
@@ -56,7 +57,7 @@
   %br
 
   .actions
-    = f.submit 'Save', class: "btn primary"
+    = f.submit 'Save', class: "btn save-btn"
     = link_to 'Cancel', @project, class: "btn"
     - unless @project.new_record?
       .right

app/views/projects/_new_form.html.haml

@@ -10,8 +10,8 @@
       = f.submit 'Create project', class: "btn primary"
 
   %hr
-  .alert.alert-info
+  %div.adv_settings
-    %h5 Advanced settings:
+    %h6 Advanced settings:
     .clearfix
       = f.label :path do
         Git Clone