From 1dd938d20cb51a8068c9b3ab9041068292d97a9b Mon Sep 17 00:00:00 2001
From: randx <dmitriy.zaporozhets@gmail.com>
Date: Wed, 29 Aug 2012 21:23:43 +0300
Subject: SCSS refactoring & cleanup. First iteration

---
 app/assets/stylesheets/common.scss                 | 159 ++--
 app/assets/stylesheets/gitlab_bootstrap.scss       | 817 ---------------------
 .../stylesheets/gitlab_bootstrap/blocks.scss       | 145 ++++
 .../stylesheets/gitlab_bootstrap/buttons.scss      |  72 ++
 .../stylesheets/gitlab_bootstrap/common.scss       |  51 ++
 app/assets/stylesheets/gitlab_bootstrap/files.scss | 156 ++++
 app/assets/stylesheets/gitlab_bootstrap/lists.scss |  30 +
 .../stylesheets/gitlab_bootstrap/tables.scss       |  41 ++
 .../stylesheets/gitlab_bootstrap/typography.scss   |  71 ++
 app/assets/stylesheets/main.scss                   |  31 +-
 app/assets/stylesheets/projects.css.scss           | 385 ----------
 app/assets/stylesheets/sections/commits.scss       |   5 +
 .../stylesheets/sections/merge_requests.scss       |  11 +
 app/views/keys/_form.html.haml                     |   4 +-
 app/views/merge_requests/show/_mr_title.html.haml  |   4 +-
 app/views/profile/password.html.haml               |   2 +-
 app/views/profile/show.html.haml                   |   2 +-
 17 files changed, 717 insertions(+), 1269 deletions(-)
 delete mode 100644 app/assets/stylesheets/gitlab_bootstrap.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/blocks.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/buttons.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/common.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/files.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/lists.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/tables.scss
 create mode 100644 app/assets/stylesheets/gitlab_bootstrap/typography.scss
 delete mode 100644 app/assets/stylesheets/projects.css.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 68f862b8d2a..4fa65ac7502 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1,11 +1,9 @@
-.diff_file_header a,
-.file_stats a {
-  color:$style_color;
-}
-
-
 /** LAYOUT **/
 
+body {
+  margin-bottom:20px;
+}
+
 .container {
   padding-top:0;
   z-index:5;
@@ -40,30 +38,6 @@
   color: $link_color;
 }
 
-.widget {
-  @include shade;
-  padding:20px;
-  margin-bottom:20px;
-  border: 1px solid #DDD;
-  border-radius: 5px;
-  background:#fafafa;
-
-  .link_holder {
-    background:#eee;
-    position:relative;
-    left:-20px;
-    top:20px;
-    padding:10px 20px;
-    width:100%;
-    border-top:1px solid #ccc;
-
-    a {
-      font-size:14px;
-      color:#666;
-    }
-  }
-}
-
 .help li { color:#111 }
 
 .back_link {
@@ -88,16 +62,6 @@
   padding-left:20px;
 }
 
-.number {
-  border-radius: 4px;
-  text-shadow: none;
-  background: rgba(0,0,0,.12);
-  text-align: center;
-  padding: 2px 4px;
-  line-height:18px;
-  margin-left:2px;
-}
-
 table a code {
   position: relative;
   top: -2px;
@@ -174,10 +138,6 @@ span.update-author {
   display:block;
 }
 /** END UPDATE ITEM **/
-.ajax-tab-loading {
-  padding:40px;
-  display:none;
-}
 .dashboard-loader {
   float:left;
   margin:10px;
@@ -200,6 +160,117 @@ a.project-update.titled {
   }
 }
 
+.neib {
+  margin-right:10px;
+}
+
+.label {
+  background-color: #474D57;
+
+  &.label-issue {
+    background-color: #eee;
+    border: 1px solid #ccc;
+    padding:4px 6px;
+    color:#444;
+    text-shadow:0 0 1px #fff;
+
+    &.grouped {
+      float: left;
+      margin-right: 6px;
+      padding: 6px;
+    }
+  }
+}
+
+.event_label {
+  @extend .label;
+  background-color: #999;
+
+  &.pushed {
+    background-color: #3A87AD;
+  }
+
+  &.opened {
+    background-color: #468847;
+  }
+
+  &.closed {
+    background-color: #B94A48;
+  }
+
+  &.merged {
+    background-color: #2A2;
+  }
+}
+
+form {
+  @extend .form-horizontal;
+
+  .actions {
+    @extend .form-actions;
+  }
+
+  .clearfix {
+    @extend .control-group;
+  }
+
+  .input {
+    @extend .controls;
+  }
+
+  label {
+    @extend .control-label;
+  }
+  .xlarge {
+    @extend .input-xlarge;
+  }
+  .xxlarge {
+    @extend .input-xxlarge;
+  }
+}
+
+
+
+
+
+
+.field_with_errors {
+  display:inline;
+}
+
+ul.breadcrumb {
+  background:white;
+  border:none;
+  li {
+    display: inline;
+    text-shadow: 0 1px 0 white
+  }
+
+  a {
+    color:#474D57;
+    font-weight:bold;
+    font-size:14px;
+  }
+
+  .arrow {
+    background: url("images.png") no-repeat -85px -77px;
+    width: 19px;
+    height: 16px;
+    float: left;
+    position: relative;
+    left: -10px;
+    padding:0;
+    margin:0;
+  }
+}
+
+input[type=text] {
+  &.large_text {
+    padding:6px;
+    font-size:16px;
+  }
+}
+
 input.git_clone_url {
   width:325px;
 }
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
deleted file mode 100644
index a1faf0601cb..00000000000
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ /dev/null
@@ -1,817 +0,0 @@
-body {
-  margin-bottom:20px;
-}
-
-pre {
-  font-family:'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
-
-  &.dark {
-    background: #333;
-    color:#f5f5f5;
-  }
-}
-
-a {
-  outline: none;
-  color: $link_color;
-  &:hover {
-    text-decoration:none;
-    color: $blue_link;
-  }
-
-  &.btn {
-    color: $style_color;
-  }
-
-  &.dark {
-    color: $style_color;
-  }
-
-  &.lined {
-    text-decoration:underline;
-    &:hover { text-decoration:underline; }
-  }
-
-  &.gray {
-    color:gray;
-  }
-
-  &.supp_diff_link {
-    text-align:center;
-    padding:20px 0;
-    background:#f1f1f1;
-    width:100%;
-    float:left;
-  }
-
-  &.neib  {
-    margin-right:15px;
-  }
-}
-
-.neib {
-  margin-right:10px;
-}
-
-.alert-message {
-  @extend .alert;
-
-  &.success {
-    @extend .alert-success;
-  }
-
-  &.error {
-    @extend .alert-error;
-  }
-}
-
-.alert {
-  &.alert-well {
-    background:#ddd;
-    border:1px solid #ccc;
-    background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #ddd), to(#dfdfdf));
-    background-image: -webkit-linear-gradient(#ddd 6.6%, #dfdfdf);
-    background-image: -moz-linear-gradient(#ddd 6.6%, #dfdfdf);
-    background-image: -o-linear-gradient(#ddd 6.6%, #dfdfdf);
-    color:#111;
-  }
-}
-
-h3, h4, h5, h6 {
-  line-height: 36px;
-}
-
-h5 {
-  font-size:14px;
-}
-
-
-table {
-  width:100%;
-  th {
-    padding-top: 9px;
-    font-weight: bold;
-    vertical-align: middle;
-  }
-  th, td {
-    padding: 10px 10px 9px;
-    line-height: 18px;
-    text-align: left;
-  }
-
-  &.bordered-table {
-    border: 1px solid #DDD;
-    border-collapse: separate;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-  }
-
-  &.zebra-striped {
-    @extend .table-striped;
-  }
-}
-
-.btn {
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), color-stop(25%, #f1f1f1), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #f1f1f1, #f1f1f1 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
-  background-image: -o-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
-  background-image: linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
-
-  &:hover {
-  }
-
-  &.btn-primary {
-    background:$link_color;
-    border-color: #2A79A3;
-    &:hover {
-      background:$blue_link;
-    }
-  }
-  &.primary {
-    @extend .btn-primary;
-  }
-
-  &.success {
-    color: #fff;
-    text-shadow: 0 0 1px #111;
-    background: #5bb75b;;
-    font-weight: bold;
-
-    &:hover {
-      background-color: #51a351;
-      color: #fff;
-    }
-  }
-
-  &.danger,
-  &.btn-danger {
-    color:#fff;
-    background: #DA4E49;
-    border-color: #BD362F;
-
-    &:hover {
-      color:#fff;
-      background: #EE4E49;
-    }
-  }
-
-  &.danger {
-    @extend .btn-danger;
-  }
-
-  &.small {
-    @extend .btn-small;
-  }
-
-  &.active {
-    border-color:#aaa;
-    background-color:#ccc;
-  }
-}
-
-a:focus {
-  outline: none;
-}
-
-.nav-pills a:hover {
-  background-color:#888;
-}
-
-.nav-pills .active a {
-  background-color: $style_color;
-}
-
-.label {
-  background-color: #474D57;
-  &.label-important {
-    background-color: #B94A48;
-  }
-
-  &.label-issue {
-    background-color: #eee;
-    border: 1px solid #ccc;
-    padding:4px 6px;
-    color:#444;
-    text-shadow:0 0 1px #fff;
-
-    &.grouped {
-      float: left;
-      margin-right: 6px;
-      padding: 6px;
-    }
-  }
-}
-
-.nav-tabs > li > a, .nav-pills > li > a {
-  color:$style_color;
-}
-
-.nav-tabs > .active > a {
-  font-weight:bold;
-}
-
-/** COLORS **/
-.cgray { color:gray; }
-.cred { color:#D12F19; }
-.cgreen { color:#44aa22; }
-.cblack { color:#111; }
-.cdark { color:#444 }
-.cwhite { color:#fff !important }
-.bgred { background: #F2DEDE !important}
-
-/** COMMON STYLES **/
-.left {
-  float:left;
-}
-.right {
-  float:right !important;
-}
-.width-50p{
-  width:50%;
-}
-.width-49p{
-  width:49%;
-}
-.width-30p{
-  width:30%;
-}
-.width-65p{
-  width:65%;
-}
-.width-100p{
-  width:100%;
-}
-.append-bottom-10 {
-  margin-bottom:10px;
-}
-.append-bottom-20 {
-  margin-bottom:20px;
-}
-.prepend-top-10 {
-  margin-top:10px;
-}
-
-.prepend-top-20 {
-  margin-top:20px;
-}
-
-.padded {
-  padding:20px;
-}
-
-.ipadded {
-  padding:20px !important;
-}
-.lborder {
-  border-left:1px solid #eee;
-}
-
-.borders {
-  border: 1px solid #ccc;
-  @include shade;
-}
-.no-borders {
-  border:none;
-}
-table.no-borders {
-  border:none;
-  tr, td { border:none }
-}
-.no-padding {
-  padding:0 !important;
-}
-.underlined {
-  border-bottom: 1px solid $border_color;
-}
-.vlink {
-  color: $link_color !important;
-}
-
-.pretty_label {
-  @include round-borders-all(4px);
-  padding:2px 4px;
-  background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
-  background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
-  background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
-  background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
-  color: #777;
-  border: 1px solid #DEDFE1;
-
-  &.branch {
-    border:none;
-    font-size:13px;
-    background: #474D57;
-    color:#fff;
-    font-weight:bold;
-    font-family: monospace;
-  }
-}
-
-.event_label {
-  @extend .label;
-  background-color: #999;
-
-  &.pushed {
-    background-color: #3A87AD;
-  }
-
-  &.opened {
-    background-color: #468847;
-  }
-
-  &.closed {
-    background-color: #B94A48;
-  }
-
-  &.merged {
-    background-color: #2A2;
-  }
-}
-
-img.avatar {
-  float:left;
-  margin-right:15px;
-  width:40px;
-  border:1px solid #ddd;
-  padding:1px;
-
-  &.s16 {
-    width:16px;
-    height:16px;
-  }
-  &.s24 {
-    width:24px;
-    height:24px;
-  }
-  &.s32 {
-    width:32px;
-    height:32px;
-  }
-}
-
-img.lil_av {
-  padding-left: 4px;
-  padding-right:3px;
-}
-
-form {
-  @extend .form-horizontal;
-
-  .actions {
-    @extend .form-actions;
-  }
-
-  .clearfix {
-    @extend .control-group;
-  }
-
-  .input {
-    @extend .controls;
-  }
-
-  label {
-    @extend .control-label;
-  }
-  .xlarge {
-    @extend .input-xlarge;
-  }
-  .xxlarge {
-    @extend .input-xxlarge;
-  }
-}
-
-/**
- * List li block element #1
- *
- */
-.wll {
-  background-color: #FFF;
-  padding: 10px 5px;
-  min-height: 20px;
-  border-bottom: 1px solid #eee;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-  &.smoke {
-    background-color:#f5f5f5;
-  }
-  &:hover {
-    background:$hover;
-  }
-  &:last-child { border:none }
-  p { padding-top:5px; margin:0; color:$style_color;}
-  .author { color: #999; }
-  p {
-    color:#222;
-    margin-bottom: 0;
-    img {
-      position:relative;
-      top:3px;
-    }
-  }
-}
-
-
-/**
- * Block element #2
- *
- */
-.entry {
-  position: relative;
-  padding: 7px 15px;
-  margin-bottom: 18px;
-  color: #404040;
-  filter:none;
-
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-
-  background:#F1F1F1;
-  border: 1px solid #ccc;
-
-
-  p {
-    color:$style_color;
-    margin-bottom: 0;
-    img {
-      position:relative;
-      top:3px;
-    }
-  }
-}
-
-
-/**
- * Big UI Block for show page content
- *
- */
-.ui-box {
-  background:#F9F9F9;
-  margin-bottom: 25px;
-  @include round-borders-all(4px);
-  border-color: #CCC;
-  @include solid_shade;
-
-  ul {
-    margin:0;
-  }
-
-  h5, .title {
-    padding: 0 10px;
-    @include round-borders-top(4px);
-    @include bg-gray-gradient;
-    border-bottom: 1px solid #bbb;
-
-    &.small {
-      line-height: 28px;
-      font-size: 14px;
-      line-height:28px;
-      text-shadow: 0 1px 1px white;
-    }
-
-    form {
-      padding:9px 0;
-      margin:0px;
-    }
-
-    .nav-pills {
-      li {
-        padding:3px 0;
-        &.active a { background-color:$style_color; }
-        a {
-          border-radius:7px;
-        }
-      }
-    }
-  }
-
-  .bottom {
-    @include bg-gray-gradient;
-    @include round-borders-bottom(4px);
-    border-bottom:none;
-    border-top: 1px solid #bbb;
-  }
-
-  &.padded {
-    h5, .title {
-      margin: -20px;
-      margin-bottom: 0;
-      padding: 5px 20px;
-    }
-    .middle_title {
-      background:#f5f5f5;
-      margin:20px -20px;
-      padding: 0 20px;
-      border-top:1px solid #eee;
-      border-bottom:1px solid #eee;
-      font-size:14px;
-      color:#777;
-    }
-  }
-  .row_title {
-    font-weight:bold;
-    color:#444;
-    &:hover {
-      color:#444;
-      text-decoration:underline;
-    }
-  }
-
-  li, .wll {
-    padding:10px;
-    &:first-child {
-      @include round-borders-top(4px);
-      border-top:none;
-    }
-
-    &:last-child {
-      @include round-borders-bottom(4px);
-      border:none;
-    }
-  }
-
-}
-
-table.admin-table {
-  @extend .table-bordered;
-  @extend .zebra-striped;
-  @include solid_shade;
-  th {
-    border-color: #CCC;
-    border-bottom: 1px solid #bbb;
-    @include bg-gray-gradient;
-  }
-}
-
-.field_with_errors {
-  display:inline;
-}
-
-ul.breadcrumb {
-  background:white;
-  border:none;
-  li {
-    display: inline;
-    text-shadow: 0 1px 0 white
-  }
-
-  a {
-    color:#474D57;
-    font-weight:bold;
-    font-size:14px;
-  }
-
-  .arrow {
-    background: url("images.png") no-repeat -85px -77px;
-    width: 19px;
-    height: 16px;
-    float: left;
-    position: relative;
-    left: -10px;
-    padding:0;
-    margin:0;
-  }
-}
-
-.nothing_here_message {
-  text-align:center;
-  padding:20px;
-  color:#777;
-}
-
-/**
- *  UI box element
- *  contains top, middle, bottom blocks
- *
- */
-.main_box {
-  @extend .borders;
-  @extend .prepend-top-20;
-  @extend .append-bottom-20;
-  border-width:1px;
-  @include solid_shade;
-
-
-  img { max-width: 100%; }
-
-  pre {
-    code {
-      background: none !important;
-    }
-  }
-
-  .top_box_content,
-  .middle_box_content,
-  .bottom_box_content {
-    padding:15px;
-
-    pre {
-      background: none !important;
-      margin:0;
-      border:none;
-      padding:0;
-    }
-  }
-
-  .middle_box_content {
-    border-radius:0;
-    border:none;
-    font-size:12px;
-    background-color:#f5f5f5;
-    border:none;
-    border-top:1px solid #eee;
-  }
-
-  .bottom_box_content {
-    border-top:1px solid #eee;
-  }
-}
-
-input[type=text] {
-  &.large_text {
-    padding:6px;
-    font-size:16px;
-  }
-}
-
-p {
-  &.slead {
-    color:#456;
-    font-size:16px;
-    margin-bottom: 12px;
-    font-weight: 200;
-    line-height: 24px;
-  }
-}
-
-h3.page_title {
-  color:#456;
-  font-size:20px;
-  font-weight: normal;
-  line-height: 28px;
-}
-
-/**
- * File content holder
- *
- */
-.file_holder {
-  border:1px solid #CCC;
-  margin-bottom:1em;
-  @include solid_shade;
-
-  .file_title {
-    border-bottom: 1px solid #bbb;
-    @include bg-gray-gradient;
-    margin: 0;
-    font-weight: normal;
-    font-weight: bold;
-    text-align: left;
-    color: #666;
-    padding: 9px 10px;
-    height:18px;
-
-    .options {
-      float:right;
-      margin-top: -5px;
-    }
-
-    .file_name {
-      color:$style_color;
-      font-size:14px;
-      text-shadow: 0 1px 1px #fff;
-      small {
-        color:#999;
-        font-size:13px;
-      }
-    }
-  }
-  .file_content {
-    background:#fff;
-    font-size: 11px;
-
-    &.wiki {
-      font-size: 13px;
-      code {
-        padding:0 4px;
-      }
-      padding:20px;
-      h1, h2 {
-        line-height: 46px;
-      }
-      h3, h4 {
-        line-height: 40px;
-      }
-    }
-
-    &.image_file {
-      background:#eee;
-      text-align:center;
-      img {
-        padding:100px;
-        max-width:300px;
-      }
-    }
-
-    &.blob_file {
-
-    }
-
-    /**
-     *  Blame file
-     */
-    &.blame {
-      tr {
-        border-bottom: 1px solid #eee;
-      }
-      td {
-        padding:5px;
-      }
-      .author,
-      .blame_commit {
-        background:#f5f5f5;
-        vertical-align:top;
-      }
-      .lines {
-        pre {
-          padding:0;
-          margin:0;
-          background:none;
-          border:none;
-        }
-      }
-    }
-
-    &.logs {
-      background:#eee;
-      max-height: 700px;
-      overflow-y: auto;
-
-      ol {
-        margin-left:40px;
-        padding: 10px 0;
-        border-left: 1px solid #CCC;
-        margin-bottom:0;
-        background: white;
-        li {
-          color:#888;
-          p {
-            margin:0;
-            color:#333;
-            line-height:24px;
-            padding-left: 10px;
-          }
-
-          &:hover {
-            background:$hover;
-          }
-        }
-      }
-    }
-
-    /**
-     *  Code file
-     */
-    &.code {
-      padding:0;
-      td.code {
-        width: 100%;
-        .highlight {
-          margin-left: 55px;
-          overflow:auto;
-          overflow-y:hidden;
-        }
-      }
-      .highlight pre {
-        white-space: pre;
-        word-wrap:normal;
-      }
-
-      table.highlighttable {
-        border: none;
-      }
-      body.project-page table.highlighttable td { border: none }
-      table.highlighttable tr:hover { background:none;}
-
-      table.highlighttable pre{
-        line-height:16px !important;
-        font-size:12px !important;
-      }
-
-      table.highlighttable .linenodiv pre {
-        text-align: right;
-        padding-right: 4px;
-        color:#666;
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
new file mode 100644
index 00000000000..894cb3044fa
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/blocks.scss
@@ -0,0 +1,145 @@
+/**
+ * ===================================
+ * Contain 3 main UI block elements: 
+ *   .main_box - for show pages
+ *   .ui-box   - for simple block & widgets
+ * ===================================
+ */
+
+/**
+ *  UI box element
+ *  contains top, middle, bottom blocks
+ *
+ */
+.main_box {
+  @extend .borders;
+  @extend .prepend-top-20;
+  @extend .append-bottom-20;
+  border-width:1px;
+  @include solid_shade;
+
+
+  img { max-width: 100%; }
+
+  pre {
+    code {
+      background: none !important;
+    }
+  }
+
+  .top_box_content,
+  .middle_box_content,
+  .bottom_box_content {
+    padding:15px;
+
+    pre {
+      background: none !important;
+      margin:0;
+      border:none;
+      padding:0;
+    }
+  }
+
+  .middle_box_content {
+    border-radius:0;
+    border:none;
+    font-size:12px;
+    background-color:#f5f5f5;
+    border:none;
+    border-top:1px solid #eee;
+  }
+
+  .bottom_box_content {
+    border-top:1px solid #eee;
+  }
+}
+
+/**
+ * Big UI Block for show page content
+ *
+ */
+.ui-box {
+  background:#F9F9F9;
+  margin-bottom: 25px;
+  @include round-borders-all(4px);
+  border-color: #CCC;
+  @include solid_shade;
+
+  ul {
+    margin:0;
+  }
+
+  h5, .title {
+    padding: 0 10px;
+    @include round-borders-top(4px);
+    @include bg-gray-gradient;
+    border-bottom: 1px solid #bbb;
+
+    &.small {
+      line-height: 28px;
+      font-size: 14px;
+      line-height:28px;
+      text-shadow: 0 1px 1px white;
+    }
+
+    form {
+      padding:9px 0;
+      margin:0px;
+    }
+
+    .nav-pills {
+      li {
+        padding:3px 0;
+        &.active a { background-color:$style_color; }
+        a {
+          border-radius:7px;
+        }
+      }
+    }
+  }
+
+  .bottom {
+    @include bg-gray-gradient;
+    @include round-borders-bottom(4px);
+    border-bottom:none;
+    border-top: 1px solid #bbb;
+  }
+
+  &.padded {
+    h5, .title {
+      margin: -20px;
+      margin-bottom: 0;
+      padding: 5px 20px;
+    }
+    .middle_title {
+      background:#f5f5f5;
+      margin:20px -20px;
+      padding: 0 20px;
+      border-top:1px solid #eee;
+      border-bottom:1px solid #eee;
+      font-size:14px;
+      color:#777;
+    }
+  }
+  .row_title {
+    font-weight:bold;
+    color:#444;
+    &:hover {
+      color:#444;
+      text-decoration:underline;
+    }
+  }
+
+  li, .wll {
+    padding:10px;
+    &:first-child {
+      @include round-borders-top(4px);
+      border-top:none;
+    }
+
+    &:last-child {
+      @include round-borders-bottom(4px);
+      border:none;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
new file mode 100644
index 00000000000..8a01230c738
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -0,0 +1,72 @@
+.btn {
+  @include bg-dark-gray-gradient;
+  border-color:#aaa;
+  &:hover {
+    @include bg-gray-gradient;
+    border-color:#bbb;
+    color:#333;
+  }
+
+  &.btn-primary {
+    background:$link_color;
+    border-color: #2A79A3;
+    &:hover {
+      background:$blue_link;
+      color:#fff;
+    }
+  }
+  &.primary {
+    @extend .btn-primary;
+  }
+
+  &.success {
+    color: #fff;
+    text-shadow: 0 0 1px #111;
+    background: #5bb75b;;
+    font-weight: bold;
+
+    &:hover {
+      background-color: #51a351;
+      color: #fff;
+    }
+  }
+
+  &.save-btn { 
+    @extend .wide;
+    @extend .primary;
+  }
+
+  &.cancel-btn { 
+    float:right;
+  }
+
+  &.wide { 
+    padding-left:30px;
+    padding-right:30px;
+  }
+
+  &.danger,
+  &.btn-danger {
+    color:#fff;
+    background: #DA4E49;
+    border-color: #BD362F;
+
+    &:hover {
+      color:#fff;
+      background: #EE4E49;
+    }
+  }
+
+  &.danger {
+    @extend .btn-danger;
+  }
+
+  &.small {
+    @extend .btn-small;
+  }
+
+  &.active {
+    border-color:#aaa;
+    background-color:#ccc;
+  }
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
new file mode 100644
index 00000000000..30f16472f6d
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -0,0 +1,51 @@
+/** COLORS **/
+.cgray { color:gray }
+.cred { color:#D12F19 }
+.cgreen { color:#4a2 }
+.cblack { color:#111 }
+.cdark { color:#444 }
+.cwhite { color:#fff!important }
+.bgred { background:#F2DEDE!important }
+
+/** COMMON CLASSES **/
+.left { float:left }
+.right { float:right!important }
+.width-50p { width:50% }
+.width-49p { width:49% }
+.width-30p { width:30% }
+.width-65p { width:65% }
+.width-100p { width:100% }
+.append-bottom-10 { margin-bottom:10px }
+.append-bottom-20 { margin-bottom:20px }
+.prepend-top-10 { margin-top:10px }
+.prepend-top-20 { margin-top:20px }
+.padded { padding:20px }
+.ipadded { padding:20px!important }
+.lborder { border-left:1px solid #eee }
+.no-padding { padding:0 !important; }
+.underlined { border-bottom: 1px solid #CCC; }
+.no-borders { border:none; }
+.vlink { color: $link_color !important; }
+.borders { border: 1px solid #ccc; @include shade; }
+
+/** PILLS & TABS**/
+.nav-pills a:hover { background-color:#888; }
+.nav-pills .active a { background-color: $style_color; }
+.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; }
+.nav-tabs > .active > a { font-weight:bold; }
+
+/** ALERT MESSAGES **/
+.alert-message { @extend .alert; }
+.alert-messag.success { @extend .alert-success; }
+.alert-message.error { @extend .alert-error; }
+
+/** AVATARS **/
+img.avatar { float:left; margin-right:15px; width:40px; border:1px solid #ddd; padding:1px; }
+img.avatar.s16 { width:16px; height:16px; }
+img.avatar.s24 { width:24px; height:24px; }
+img.avatar.s32 { width:32px; height:32px; }
+img.lil_av { padding-left: 4px; padding-right:3px; }
+
+/** HELPERS **/
+.nothing_here_message { text-align:center; padding:20px; color:#777; }
+p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
new file mode 100644
index 00000000000..4ea5ed02ada
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -0,0 +1,156 @@
+/**
+ * File content holder
+ *
+ */
+.file_holder {
+  border:1px solid #CCC;
+  margin-bottom:1em;
+  @include solid_shade;
+
+  .file_title {
+    border-bottom: 1px solid #bbb;
+    @include bg-gray-gradient;
+    margin: 0;
+    font-weight: normal;
+    font-weight: bold;
+    text-align: left;
+    color: #666;
+    padding: 9px 10px;
+    height:18px;
+
+    .options {
+      float:right;
+      margin-top: -5px;
+    }
+
+    .file_name {
+      color:$style_color;
+      font-size:14px;
+      text-shadow: 0 1px 1px #fff;
+      small {
+        color:#999;
+        font-size:13px;
+      }
+    }
+  }
+  .file_content {
+    background:#fff;
+    font-size: 11px;
+
+    &.wiki {
+      font-size: 13px;
+      code {
+        padding:0 4px;
+      }
+      padding:20px;
+      h1, h2 {
+        line-height: 46px;
+      }
+      h3, h4 {
+        line-height: 40px;
+      }
+    }
+
+    &.image_file {
+      background:#eee;
+      text-align:center;
+      img {
+        padding:100px;
+        max-width:300px;
+      }
+    }
+
+    &.blob_file {
+
+    }
+
+    /**
+     *  Blame file
+     */
+    &.blame {
+      tr {
+        border-bottom: 1px solid #eee;
+      }
+      td {
+        padding:5px;
+      }
+      .author,
+      .blame_commit {
+        background:#f5f5f5;
+        vertical-align:top;
+      }
+      .lines {
+        pre {
+          padding:0;
+          margin:0;
+          background:none;
+          border:none;
+        }
+      }
+    }
+
+    &.logs {
+      background:#eee;
+      max-height: 700px;
+      overflow-y: auto;
+
+      ol {
+        margin-left:40px;
+        padding: 10px 0;
+        border-left: 1px solid #CCC;
+        margin-bottom:0;
+        background: white;
+        li {
+          color:#888;
+          p {
+            margin:0;
+            color:#333;
+            line-height:24px;
+            padding-left: 10px;
+          }
+
+          &:hover {
+            background:$hover;
+          }
+        }
+      }
+    }
+
+    /**
+     *  Code file
+     */
+    &.code {
+      padding:0;
+      td.code {
+        width: 100%;
+        .highlight {
+          margin-left: 55px;
+          overflow:auto;
+          overflow-y:hidden;
+        }
+      }
+      .highlight pre {
+        white-space: pre;
+        word-wrap:normal;
+      }
+
+      table.highlighttable {
+        border: none;
+      }
+      body.project-page table.highlighttable td { border: none }
+      table.highlighttable tr:hover { background:none;}
+
+      table.highlighttable pre{
+        line-height:16px !important;
+        font-size:12px !important;
+      }
+
+      table.highlighttable .linenodiv pre {
+        text-align: right;
+        padding-right: 4px;
+        color:#666;
+      }
+    }
+  }
+}
+
diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
new file mode 100644
index 00000000000..402ba04bd00
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/lists.scss
@@ -0,0 +1,30 @@
+/** LISTS **/
+
+ul { 
+  /**
+   * List li block element #1
+   *
+   */
+  .wll {
+    background-color: #FFF;
+    padding: 10px 5px;
+    min-height: 20px;
+    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+
+    &.smoke { background-color:#f5f5f5; }
+    &:hover { background:$hover; }
+    &:last-child { border:none }
+    .author { color: #999; }
+
+    p {
+      padding-top:5px; 
+      margin:0;
+      color:#222;
+      img {
+        position:relative;
+        top:3px;
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
new file mode 100644
index 00000000000..f78b1dee4fa
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss
@@ -0,0 +1,41 @@
+table {
+  width:100%;
+  th {
+    padding-top: 9px;
+    font-weight: bold;
+    vertical-align: middle;
+  }
+  th, td {
+    padding: 10px 10px 9px;
+    line-height: 18px;
+    text-align: left;
+  }
+
+  &.bordered-table {
+    border: 1px solid #DDD;
+    border-collapse: separate;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+  }
+
+  &.zebra-striped {
+    @extend .table-striped;
+  }
+}
+
+table.admin-table {
+  @extend .table-bordered;
+  @extend .zebra-striped;
+  @include solid_shade;
+  th {
+    border-color: #CCC;
+    border-bottom: 1px solid #bbb;
+    @include bg-gray-gradient;
+  }
+}
+
+table.no-borders {
+  border:none;
+  tr, td { border:none }
+}
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
new file mode 100644
index 00000000000..c93a64bdbb8
--- /dev/null
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -0,0 +1,71 @@
+/** 
+ * Headers
+ * 
+ */
+h3, h4, h5, h6 { line-height: 36px; }
+h5 { font-size:14px; }
+h3.page_title { 
+  color:#456;
+  font-size:20px;
+  font-weight: normal;
+  line-height: 28px;
+}
+
+/** CODE **/
+pre {
+  font-family:'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
+
+  &.dark {
+    background: #333;
+    color:#f5f5f5;
+  }
+}
+
+/** 
+ * Links
+ * 
+ */
+a {
+  outline: none;
+  color: $link_color;
+  &:hover {
+    text-decoration:none;
+    color: $blue_link;
+  }
+
+  &.btn {
+    color: $style_color;
+    &:hover { 
+      color: $style_color;
+    }
+  }
+
+  &.dark {
+    color: $style_color;
+  }
+
+  &.lined {
+    text-decoration:underline;
+    &:hover { text-decoration:underline; }
+  }
+
+  &.gray {
+    color:gray;
+  }
+
+  &.supp_diff_link {
+    text-align:center;
+    padding:20px 0;
+    background:#f1f1f1;
+    width:100%;
+    float:left;
+  }
+
+  &.neib  {
+    margin-right:15px;
+  }
+}
+
+a:focus {
+  outline: none;
+}
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index b4f0ebf8ba0..4b7c0171891 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -2,24 +2,8 @@
 @import "bootstrap-responsive";
 
 /** GITLAB colors **/
-$text_color:#222;
-$lite_text_color: #666;
 $link_color:#2A79A3;
-$active_link_color:#2FA0BB;
-$active_bg_color:#79C3E0;
-$active_bd_color: #2FA0BB;
-$border_color:#CCC;
-$lite_border_color:#EEE;
-$min_app_width:980px;
-$max_app_width:980px;
-$app_padding:20px;
-$bg_color: #FFF;
-$styled_border_color: #2FA0BB;
-$color: "#4BB8D2";
 $blue_link: #2fa0bb;
-
-
-/** Style colors **/
 $style_color: #474D57;
 $hover: #FDF5D9;
 
@@ -80,6 +64,13 @@ $hover: #FDF5D9;
   background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
 }
 
+@mixin bg-dark-gray-gradient { 
+  background:#eee;
+  background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
+}
+
 /**
  * Header of application.
  * Contain application logo, search panel, profile icon
@@ -119,7 +110,13 @@ $hover: #FDF5D9;
  * Overrides some styles of twitter bootstrap.
  * Also give some common classes for gitlab app
  */
-@import "gitlab_bootstrap.scss";
+@import "gitlab_bootstrap/common.scss";
+@import "gitlab_bootstrap/typography.scss";
+@import "gitlab_bootstrap/buttons.scss";
+@import "gitlab_bootstrap/blocks.scss";
+@import "gitlab_bootstrap/files.scss";
+@import "gitlab_bootstrap/tables.scss";
+@import "gitlab_bootstrap/lists.scss";
 
 
 /**
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
deleted file mode 100644
index 4bdf5dee2f5..00000000000
--- a/app/assets/stylesheets/projects.css.scss
+++ /dev/null
@@ -1,385 +0,0 @@
-.git_url_wrapper { margin-right:50px }
-
-.sidebar aside a{
-  display: block;
-  position: relative; 
-  padding: 15px 10px; 
-  margin: 10px 0 0 0;
-
-  font-size:13px;
-  font-weight:bold;
-  color:#333;
-
-  &.current {
-    color: white;
-    background: $active_bg_color;
-    border: 1px solid $active_bd_color;
-    border-radius:5px;
-
-    -webkit-border-top-right-radius: 0;
-    -webkit-border-bottom-right-radius: 0;
-    -moz-border-radius-topright: 0px;
-    -moz-border-radius-bottomright: 0px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    margin-right: -1px;
-  }
-}
-
-body table .commit a{color: #{$blue_link}}
-body table th, body table td{  border-bottom: 1px solid #DEE2E3;}
-body .fixed{position: fixed; }
-
-/** File stat **/
-.file_stats {
-  span {
-    img {
-      width:14px;
-      float:left;
-      margin-right: 6px;
-      padding:2px 0;
-    }
-  }
-}
-
-.round-borders {
-  @include round-borders-all(4px);
-  padding: 4px 0px;
-}
-
-table.round-borders {
-  float:left;
-  text-align: left;
-}
-
-
-
-/** PROJECTS **/
-input.ssh_project_url {
-  padding:5px;
-  margin:0px;
-  float:right;
-  width:400px;
-  text-align:center;
-}
-
-#projects-list .project {
-  height:50px;
-}
-
-#tree-slider .tree-item,
-#projects-list .project,
-#snippets-table .snippet,
-#issues-table .issue{
-  cursor:pointer;
-}
-
-.clear {
-  clear: both;
-}
-
-
-
-#user_projects_limit{
-  width: 60px;
-}
-
-.handle:hover{
-  cursor: move;
-}
-
-.project-refs-form {
-  span {
-    background: none !important;
-    position:static !important;
-    width:auto !important;
-    height: auto !important;
-  }
-}
-
-.project-refs-select {
-  width:200px;
-}
-
-.filter .left { margin-right:15px; }
-
-body table .commit {
-  a.tree-commit-link {
-    color:#444;
-    &:hover {
-      text-decoration:underline;
-    }
-  }
-}
-
-/** NEW PROJECT **/
-.new-project-hodler {
-  .icon span { background-position: -31px -70px; }
-  td { border-bottom: 1px solid #DEE2E3; }
-}
-
-/** Feed entry **/
-.commit,
-.snippet,
-.message {
-  .title {
-    color:#666;
-    a { color:#666 !important; }
-    p { margin-top:0px; }
-  }
-  .author { color: #999 }
-}
-
-/** JQuery UI **/
-.ui-autocomplete { @include round-borders-all(5px); }
-.ui-menu-item { cursor: pointer }
-.ui-selectmenu{
-  @include round-borders-all(4px);
-  margin-right:10px;
-  font-size:1.5em;
-  height:auto;
-  font-weight:bold;
-  .ui-selectmenu-status {
-    padding:3px 10px;
-  }
-}
-
-#holder {
-  background:#FAFAFA;
-  border: 1px solid #EEE;
-  cursor: move;
-  height: 70%;
-  overflow: hidden;
-}
-
-/* Project Dashboard Page */
-html, body { height: 100%; }
-
-.news-feed h2{float: left;}
-.news-feed .project-updates  {margin-bottom: 20px; display: block; width: 100%;}
-.news-feed .project-updates .data{ padding: 0}
-.news-feed .project-updates a.project-update {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
-.news-feed .project-updates a.project-update:last-child{border-bottom: 0}
-.news-feed .project-updates a.project-update img{float: left; margin-right: 10px;}
-.news-feed .project-updates a.project-update span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
-.news-feed .project-updates a.project-update span.update-title{margin-bottom: 10px}
-.news-feed .project-updates a.project-update span.update-author{color: #999; font-weight: normal; font-style: italic;}
-.news-feed .project-updates a.project-update span.update-author strong{font-weight: bold; font-style: normal;}
-/* eo Dashboard Page */
-
-
-/** Update entry **/
-.update-data { padding: 0 }
-.update-data { width:100%; }
-.update-data.ui-box .data { padding:0; }
-a.update-item {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
-a.update-item:last-child{border-bottom: 0}
-a.update-item img{float: left; margin-right: 10px;}
-a.update-item span.update-title, .dashboard-page .news-feed .project-updates li a span.update-author{display: block;}
-a.update-item span.update-title{margin-bottom: 10px}
-a.update-item span.update-author{color: #999; font-weight: normal; font-style: italic;}
-a.update-item span.update-author strong{font-weight: bold; font-style: normal;}
-
-
-body .team_member_new .span-6, .team_member_edit .span-6{ padding:10px 0; }
-
-body.projects-page input.text.git-url.project_list_url { width:165px; }
-
-
-body table.no-borders th { 
-  background:none;
-  border-bottom:1px solid #CCC;
-  color:#333;
-}
-
-body table.no-borders tr,
-body table.no-borders td{
-  border:none;
-}
-
-.ajax-tab-loading {
-  padding:40px;
-  display:none;
-}
-
-#tree-content-holder { float:left; width:100%; }
-
-#tree-readme-holder {
-  float:left;
-  width:100%;
-
-  .readme {
-    @include round-borders-all(4px);
-    padding: 4px 15px;
-    background:#F7F7F7;
-  }
-}
-
-
-
-/* Commit Page */
-.entity-info {float: right;}
-.entity-button{
-  background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4));
-  background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4);
-  background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4);
-  background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4);
-  box-shadow: 0 -1px 0 white inset;
-  display: block;
-  border: 1px solid #eee;
-  border-radius: 5px;
-  margin-bottom: 2px;
-  position: relative;
-  padding: 4px 10px;
-  font-size: 11px;
-  padding-right: 20px;
-}
-
-.entity-button i{
-  background: url('images.png') no-repeat -138px -27px;
-  width: 6px;
-  height: 9px;
-  float: right;
-  position: absolute;
-  top: 6px;
-  right: 5px;
-}
-.box-arrow{float: right; background: #E3E5EA; padding: 10px; border-radius: 5px; margin-top: 2px; text-shadow: none; color: #999; margin: 1.5em 0;}
-
-h4.dash-tabs { 
-  margin: 0; 
-  border-bottom: 1px solid #ccc; 
-  padding: 10px 10px;
-  font-size: 11px;
-  padding-left:20px;
-  font-weight: bold; text-transform: uppercase;
-  background: #F7F7F7;
-  margin-bottom:20px;
-  height:13px;
-
-}
-
-.dash-button { 
-  border-right: 1px solid #ddd;
-  background:none;
-  padding: 10px 15px;
-  float:left;
-  position:relative;
-  top:-10px;
-  left:0px;
-  height:13px;
-
-  &:first-child { 
-    border-left: 1px solid #ddd;
-  }
-  &.active { 
-    background: #eaeaea;
-  }
-}
-
-
-.dashboard-loader { 
-  float:right;
-  margin-right:30px;
-  display:none;
-}
-
-
-.merge-tabs { 
-  margin: 0; 
-  border: 1px solid #ccc; 
-  padding: 5px;
-  font-size: 12px;
-  background: #F7F7F7;
-  margin-bottom:20px;
-  height:26px;
-
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-
-  .tab { 
-    font-weight: bold;
-    border-right: 1px solid #ddd;
-    background:none;
-    padding: 10px;
-    min-width:60px;
-    float:left;
-    position:relative;
-    top:-5px;
-    left:-5px;
-    height:16px;
-    padding-left:34px;
-
-    span { 
-      width: 20px;
-      height: 20px;
-      display: inline-block;
-      position: absolute;
-      left: 8px;
-      top: 8px;
-    }
-
-    &.active {
-      background: #eaeaea;
-    }
-  }
-}
-.merge-tabs.repository .tab span{ background: url("images.png") no-repeat -38px -77px; }
-.activities-tab span {  background: url("images.png") no-repeat -161px -1px; } 
-.stat-tab span,
-.team-tab span,
-.snippets-tab span {  background: url("images.png") no-repeat -38px -77px; } 
-.files-tab span {  background: url("images.png") no-repeat -112px -23px; } 
-
-.merge-notes-tab span {  background: url("images.png") no-repeat -161px -1px; } 
-.merge-commits-tab span {  background: url("images.png") no-repeat -86px 1px; } 
-.merge-diffs-tab span {  background: url("images.png") no-repeat -118px 1px; } 
-.merge-tabs .dashboard-loader { padding:8px; }
-
-.user-mention { 
-  color: #2FA0BB;
-  font-weight: bold;
-}
-
-.author { 
-  color: #999;
-}
-
-
-
-
-.dark_scheme_box { 
-  padding:20px 0;
-
-  label { 
-    float:left;
-    box-shadow: 0 0px 5px rgba(0,0,0,.3);
-
-    img { 
-    }
-  }
-}
-
-a.project-update.titled { 
-  position: relative;
-  padding-left: 235px !important;
-
-  .title-block { 
-    padding: 10px;
-    width: 205px;
-    position: absolute;
-    left: 0;
-    top: 0;
-  }
-}
-
-.add_new { 
-  float: right;
-  background: #A6B807;
-  color: white;
-  padding: 4px 10px;
-  @include round-borders-all(4px);
-  font-size:11px;
-  margin: 10px 0;
-}
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index e2db701db71..d42c00776a1 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -207,3 +207,8 @@
     font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
   }
 }
+
+.diff_file_header a,
+.file_stats a {
+  color:$style_color;
+}
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index ec84a64e23a..d0486dcfb57 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -99,3 +99,14 @@ li.merge_request {
   @extend .padded;
   @extend .append-bottom-10;
 }
+
+.label_branch {
+  @include round-borders-all(4px);
+  padding:2px 4px;
+  border:none;
+  font-size:13px;
+  background: #474D57;
+  color:#fff;
+  font-weight:bold;
+  font-family: monospace;
+}
diff --git a/app/views/keys/_form.html.haml b/app/views/keys/_form.html.haml
index 9c6e229bf49..26700803e61 100644
--- a/app/views/keys/_form.html.haml
+++ b/app/views/keys/_form.html.haml
@@ -19,6 +19,6 @@
 
 
     .actions
-      = f.submit 'Save', class: "primary btn"
-      = link_to "Cancel", keys_path, class: "btn"
+      = f.submit 'Save', class: "btn save-btn"
+      = link_to "Cancel", keys_path, class: "btn cancel-btn"
 
diff --git a/app/views/merge_requests/show/_mr_title.html.haml b/app/views/merge_requests/show/_mr_title.html.haml
index 31fa0779fd2..3ae1050d169 100644
--- a/app/views/merge_requests/show/_mr_title.html.haml
+++ b/app/views/merge_requests/show/_mr_title.html.haml
@@ -1,9 +1,9 @@
 %h3.page_title
   = "Merge Request ##{@merge_request.id}:"
   &nbsp;
-  %span.pretty_label.branch= @merge_request.source_branch
+  %span.label_branch= @merge_request.source_branch
   &rarr;
-  %span.pretty_label.branch= @merge_request.target_branch
+  %span.label_branch= @merge_request.target_branch
 
   %span.right
     - if @merge_request.merged?
diff --git a/app/views/profile/password.html.haml b/app/views/profile/password.html.haml
index 257dacb1ad3..d0aee7ac6b3 100644
--- a/app/views/profile/password.html.haml
+++ b/app/views/profile/password.html.haml
@@ -16,4 +16,4 @@
       = f.label :password_confirmation
       .input= f.password_field :password_confirmation
   .actions
-    = f.submit 'Save', class: "btn primary"
+    = f.submit 'Save', class: "btn save-btn"
diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml
index a7b6a18ad2d..22e840a089f 100644
--- a/app/views/profile/show.html.haml
+++ b/app/views/profile/show.html.haml
@@ -67,4 +67,4 @@
       = link_to "Add Public Key", new_key_path, class: "btn small right"
 
   .form-actions
-    = f.submit 'Save', class: "btn-primary btn"
+    = f.submit 'Save', class: "btn save-btn"
-- 
cgit v1.2.1