Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e991230.

app/assets/stylesheets/framework/dropdowns.scss

@@ -154,7 +154,7 @@
     color: $dropdown-header-color;
     font-size: 13px;
     line-height: 22px;
-    padding: 0 10px;
+    padding: 0 10px 10px;
   }
   .separator + .dropdown-header {
@@ -162,10 +162,6 @@
   }
 }
-.dropdown-menu-full-width {
-  width: 100%;
-}
-
 .dropdown-menu-paging {
   .dropdown-page-two,
   .dropdown-menu-back {

app/assets/stylesheets/framework/files.scss

@@ -5,10 +5,6 @@
 .file-holder {
   border: 1px solid $border-color;
-  &.file-holder-no-border {
-    border: 0;
-  }
-
   &.readme-holder {
     margin: $gl-padding-top 0;
   }
@@ -27,17 +23,8 @@
     word-wrap: break-word;
     border-radius: 3px 3px 0 0;
-    &.file-title-clear {
-      padding-left: 0;
-      padding-right: 0;
-      background-color: transparent;
-
-      .file-actions {
-        right: 0;
-      }
-    }
-
     .file-actions {
+      float: right;
       position: absolute;
       top: 5px;
       right: 15px;
@@ -49,6 +36,22 @@
       }
     }
+    .filename {
+      &.old {
+        display: inline-block;
+        span.idiff {
+          background-color: #f8cbcb;
+        }
+      }
+
+      &.new {
+        display: inline-block;
+        span.idiff {
+          background-color: #a6f3a6;
+        }
+      }
+    }
+
     a:not(.btn) {
       color: $gl-dark-link-color;
     }

app/assets/stylesheets/framework/forms.scss

@@ -28,6 +28,10 @@ input[type='text'].danger {
 }
 label {
+  &.control-label {
+    @extend .col-sm-2;
+  }
+
   &.inline-label {
     margin: 0;
   }
@@ -37,10 +41,6 @@ label {
   }
 }
-.control-label {
-  @extend .col-sm-2;
-}
-
 .inline-input-group {
   width: 250px;
 }

app/assets/stylesheets/framework/gitlab-theme.scss

@@ -9,7 +9,8 @@
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
   .page-with-sidebar {
     .header-logo {
-      background: $color-darker;
+      background-color: $color;
+      border-color: $color;
       a {
         color: $color-light;
@@ -20,13 +21,9 @@
       }
       &:hover {
-        background-color: $color-dark;
+        background-color: $color-darker;
         a {
           color: #fff;
-
-          h3 {
-            color: #fff;
-          }
         }
       }
     }
@@ -90,8 +87,8 @@
 }
 $theme-blue: #2980b9;
-$theme-charcoal: #3d454d;
-$theme-graphite: #666;
+$theme-charcoal: #333c47;
+$theme-graphite: #888;
 $theme-gray: #373737;
 $theme-green: #019875;
 $theme-violet: #548;
@@ -102,11 +99,11 @@ body {
   }
   &.ui_charcoal {
-    @include gitlab-theme(#d6d7d9, #485157, $theme-charcoal, #353b41);
+    @include gitlab-theme(#c5d0de, $theme-charcoal, #2b333d, #24272d);
   }
   &.ui_graphite {
-    @include gitlab-theme(#ccc, #777, $theme-graphite, #555);
+    @include gitlab-theme(#ccc, $theme-graphite, #777, #666);
   }
   &.ui_gray {

app/assets/stylesheets/framework/header.scss

@@ -6,12 +6,12 @@ header {
   transition-duration: .3s;
   &.navbar-empty {
-    height: $header-height;
+    height: 58px;
     background: #fff;
-    border-bottom: 1px solid $btn-gray-hover;
+    border-bottom: 1px solid #eee;
     .center-logo {
-      margin: 8px 0;
+      margin: 11px 0;
       text-align: center;
       #tanuki-logo, img {
@@ -22,18 +22,14 @@ header {
   }
   &.navbar-gitlab {
-    padding: 0 16px;
+    padding: 0 20px;
     z-index: 100;
     margin-bottom: 0;
-    height: $header-height;
+    min-height: $header-height;
     background-color: $background-color;
     border: none;
     border-bottom: 1px solid $border-color;
-    @media (max-width: $screen-xs-min) {
-      padding: 0 16px;
-    }
-
     &.with-horizontal-nav {
       border-bottom: none;
     }
@@ -64,44 +60,16 @@ header {
         margin: 6px 0;
         border-radius: 0;
         position: absolute;
-        right: -10px;
-        padding: 6px 10px;
+        right: 2px;
         &:hover {
-          background-color: $btn-gray-hover;
+          background-color: #eee;
         }
-
         &.active {
           color: $gl-icon-color;
         }
       }
     }
-
-    &.header-collapsed {
-      padding: 0 16px;
-    }
-
-    .side-nav-toggle {
-      display: none;
-      position: absolute;
-      left: -10px;
-      margin: 6px 0;
-      padding: 6px 10px;
-      border: none;
-      background-color: $background-color;
-
-      &:hover {
-        background-color: $btn-gray-hover;
-      }
-
-      &:focus {
-        outline: none;
-      }
-
-      @media (max-width: $screen-xs-min) {
-        display: block;
-      }
-    }
   }
   .header-content {
@@ -109,10 +77,6 @@ header {
     height: $header-height;
     padding-right: 40px;
-    @media (max-width: $screen-xs-min) {
-      padding-left: 40px;
-    }
-
     @media (min-width: $screen-sm-min) {
       padding-right: 0;
     }
@@ -181,10 +145,6 @@ header {
   @media (min-width: $screen-md-min) {
     @include collapsed-header;
   }
-
-  @media (max-width: $screen-xs-min) {
-    margin-left: 0;
-  }
 }
 .header-expanded {
@@ -193,10 +153,6 @@ header {
   @media (min-width: $screen-md-min) {
     margin-left: $sidebar_width;
   }
-
-  @media (max-width: $screen-xs-min) {
-    margin-left: 0;
-  }
 }
 @media (max-width: $screen-xs-max) {

app/assets/stylesheets/framework/mobile.scss

@@ -48,6 +48,10 @@
       display: block;
     }
+    .project-home-desc {
+      font-size: 21px;
+    }
+
     .project-repo-buttons,
     .git-clone-holder {
       display: none;

app/assets/stylesheets/framework/nav.scss

-@mixin fade($gradient-direction, $rgba, $gradient-color) {
-  visibility: visible;
-  opacity: 1;
-  position: absolute;
-  bottom: 12px;
-  width: 43px;
-  height: 30px;
-  transition-duration: .3s;
-  -webkit-transform: translateZ(0);
-  background: -webkit-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-  background: -o-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-  background: -moz-linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-  background: linear-gradient($gradient-direction, $rgba, $gradient-color 45%);
-
-  &.end-scroll {
-    visibility: hidden;
-    opacity: 0;
-    transition-duration: .3s;
-  }
-}
-
-@mixin scrolling-links() {
-  white-space: nowrap;
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-  &::-webkit-scrollbar {
-    display: none;
-  }
-}
-
 .nav-links {
   padding: 0;
   margin: 0;
@@ -150,7 +119,7 @@
     }
     input {
-      height: 35px;
+      height: 34px;
       display: inline-block;
       position: relative;
       top: 2px;
@@ -227,22 +196,14 @@
   position: fixed;
   top: $header-height;
   width: 100%;
-  z-index: 11;
+  z-index: 1;
   background: $background-color;
   border-bottom: 1px solid $border-color;
   transition-duration: .3s;
-  .container-fluid {
-    position: relative;
-  }
-
   .controls {
     float: right;
-    padding: 7px 0 0;
-
-    @media (max-width: $screen-xs-max) {
-      display: none;
-    }
+    padding: 7px 5px 0 0;
     i {
       color: $layout-link-gray;
@@ -260,31 +221,14 @@
     .dropdown {
       margin-left: 7px;
-
-      @media (max-width: $screen-xs-min) {
-        margin-left: 0;
-      }
-
-      li.active {
-        font-weight: bold;
-      }
     }
   }
   .nav-links {
-    @include scrolling-links();
     border-bottom: none;
     height: 51px;
-
-    .fade-right {
-      @include fade(left, rgba(250, 250, 250, 0.4), $background-color);
-      right: 0;
-    }
-
-    .fade-left {
-      @include fade(right, rgba(250, 250, 250, 0.4), $background-color);
-      left: 0;
-    }
+    white-space: nowrap;
+    overflow-x: auto;
     li {
@@ -308,62 +252,8 @@
     }
   }
-  .nav-control {
-    .fade-right {
-
-      @media (min-width: $screen-xs-max) {
-        right: 67px;
-      }
-      @media (max-width: $screen-xs-min) {
-        right: 0;
-      }
-    }
-  }
-}
-
-.nav-block {
-  position: relative;
-
-  .nav-links {
-    @include scrolling-links();
-
-    .fade-right {
-      @include fade(left, rgba(255, 255, 255, 0.4), $white-light);
-      right: 0;
-    }
-
-    .fade-left {
-      @include fade(right, rgba(255, 255, 255, 0.4), $white-light);
-      left: 0;
-    }
-
-    &.event-filter {
-      .fade-right {
-        visibility: hidden;
-
-        @media (max-width: $screen-xs-max) {
-          visibility: visible;
-        }
-      }
-    }
-  }
 }
 .page-with-layout-nav {
-  margin-top: $header-height + 2;
-
-  .right-sidebar {
-    top: ($header-height * 2) + 2;
-  }
-}
-
-.activities {
-
-  .nav-block {
-    border-bottom: 1px solid $border-color;
-
-    .nav-links {
-      border-bottom: none;
-    }
-  }
+  margin-top: 50px;
 }

app/assets/stylesheets/framework/sidebar.scss

@@ -98,7 +98,7 @@
   }
   .sidebar-user {
-    padding: 7px 22px;
+    padding: 9px 22px;
     position: fixed;
     bottom: 40px;
     width: $sidebar_width;
@@ -210,33 +210,15 @@
   }
 }
-.sidebar-wrapper {
-  &.hidden-nav {
-    width: 0;
-  }
-}
-
 .page-sidebar-collapsed {
   padding-left: $sidebar_collapsed_width;
-  @media (max-width: $screen-xs-min) {
-    padding-left: 0;
-  }
-
   .sidebar-wrapper {
     width: $sidebar_collapsed_width;
-    @media (max-width: $screen-xs-min) {
-      width: 0;
-    }
-
     .header-logo {
       width: $sidebar_collapsed_width;
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-      }
-
       a {
         padding-left: ($sidebar_collapsed_width - 36) / 2;
@@ -262,22 +244,12 @@
     .collapse-nav a {
       width: $sidebar_collapsed_width;
-
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-      }
     }
     .sidebar-user {
       padding-left: ($sidebar_collapsed_width - 36) / 2;
       width: $sidebar_collapsed_width;
-      @media (max-width: $screen-xs-min) {
-        width: 0;
-        padding-left: 0;
-        padding-right: 0;
-      }
-
       .username {
         display: none;
       }
@@ -286,10 +258,6 @@
   .layout-nav {
     padding-right: $sidebar_collapsed_width;
-
-    @media (max-width: $screen-xs-min) {
-      padding-right: 0;;
-    }
   }
 }
@@ -300,10 +268,6 @@
     padding-left: $sidebar_width;
   }
-  @media (max-width: $screen-xs-min) {
-    padding-left: 0;
-  }
-
   .sidebar-wrapper {
     width: $sidebar_width;
@@ -312,7 +276,7 @@
     }
     .nav-sidebar li a {
-      width: $sidebar_width;
+      width: 230px;
       &.back-link {
         i {
@@ -323,17 +287,7 @@
   }
   .layout-nav {
-    @media (max-width: $screen-xs-min) {
-      padding-right: 0;
-    }
-
-    @media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
-      padding-right: 62px;
-    }
-
-    @media (min-width: $screen-md-min) {
-      padding-right: $sidebar_width;
-    }
+    padding-right: $sidebar_width;
   }
 }

app/assets/stylesheets/framework/typography.scss

@@ -269,11 +269,3 @@ h1, h2, h3, h4 {
     text-align: right;
   }
 }
-
-.idiff.deletion {
-  background: $line-removed-dark;
-}
-
-.idiff.addition {
-  background: $line-added-dark;
-}

app/assets/stylesheets/framework/variables.scss

@@ -2,7 +2,7 @@
  * Layout
  */
 $sidebar_collapsed_width: 62px;
-$sidebar_width: 220px;
+$sidebar_width: 230px;
 $gutter_collapsed_width: 62px;
 $gutter_width: 290px;
 $gutter_inner_width: 258px;
@@ -12,7 +12,7 @@ $gutter_inner_width: 258px;
  */
 $border-color:       #e5e5e5;
 $focus-border-color: #3aabf0;
-$table-border-color: #f0f0f0;
+$table-border-color: #ececec;
 $background-color:   #fafafa;
 /*
@@ -63,8 +63,7 @@ $gl-padding-top: 10px;
 /*
  * Misc
  */
-$row-hover: #f7faff;
-$row-hover-border: #b2d7ff;
+$row-hover: #f4f8fe;
 $progress-color: #c0392b;
 $avatar_radius: 50%;
 $header-height: 50px;
@@ -105,7 +104,7 @@ $blue-medium-light: #3498cb;
 $blue-medium: #2f8ebf;
 $blue-medium-dark: #2d86b4;
-$orange-light: #fc8a51;
+$orange-light: rgba(252, 109, 38, 0.80);
 $orange-normal: #e75e40;
 $orange-dark: #ce5237;
@@ -120,8 +119,8 @@ $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
 $border-white-dark: #c6cacf;
-$border-gray-light: #dcdcdc;
-$border-gray-normal: rgba(0, 0, 0, 0.10);
+$border-gray-light: rgba(0, 0, 0, 0.06);
+$border-gray-normal: rgba(0, 0, 0, 0.10);;
 $border-gray-dark: #c6cacf;
 $border-green-light: #2faa60;
@@ -179,7 +178,6 @@ $table-border-gray: #f0f0f0;
 $line-target-blue: #eaf3fc;
 $line-select-yellow: #fcf8e7;
 $line-select-yellow-dark: #f0e2bd;
-
 /*
  * Fonts
  */
@@ -217,7 +215,6 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
 $btn-active-gray: #ececec;
 $btn-placeholder-gray: #c7c7c7;
 $btn-white-active: #848484;
-$btn-gray-hover: #eee;
 /*
  *  Award emoji

app/assets/stylesheets/framework/zen.scss

@@ -32,7 +32,7 @@
   }
 }
-.zen-control {
+.zen-cotrol {
   padding: 0;
   color: #555;
   background: none;

app/assets/stylesheets/mailers/devise.scss

-// NOTE: This stylesheet is for the exclusive use of the `devise_mailer` layout
-// used for Devise email templates, and _should not_ be included in any
-// application stylesheets.
-//
-// Styles defined here are embedded directly into the resulting email HTML via
-// the `premailer` gem.
-
-$body-background-color:    #363636;
-$message-background-color: #fafafa;
-
-$header-color:             #6b4fbb;
-$body-color:               #444;
-$cta-color:                #e14329;
-$footer-link-color:        #7e7e7e;
-
-$font-family: Helvetica, Arial, sans-serif;
-
-body {
-  background-color: $body-background-color;
-  font-family: $font-family;
-  margin: 0;
-  padding: 0;
-}
-
-table {
-  -premailer-cellpadding: 0;
-  -premailer-cellspacing: 0;
-
-  border: 0;
-  border-collapse: separate;
-
-  &#wrapper {
-    background-color: $body-background-color;
-    width: 100%;
-  }
-
-  &#header {
-    margin: 0 auto;
-    text-align: left;
-    width: 600px;
-  }
-
-  &#body {
-    background-color: $message-background-color;
-    border: 1px solid #000;
-    border-radius: 4px;
-    margin: 0 auto;
-    width: 600px;
-  }
-
-  &#footer {
-    color: $footer-link-color;
-    font-size: 14px;
-    text-align: center;
-    width: 100%;
-  }
-
-  td {
-    &#body-container {
-      padding: 20px 40px;
-    }
-  }
-}
-
-.center {
-  text-align: center;
-}
-
-#logo {
-  border: none;
-  outline: none;
-  min-height: 88px;
-  width: 134px;
-}
-
-#content {
-  h2 {
-    color: $header-color;
-    font-size: 30px;
-    font-weight: 400;
-    line-height: 34px;
-    margin-top: 0;
-  }
-
-  p {
-    color: $body-color;
-    font-size: 17px;
-    line-height: 24px;
-    margin-bottom: 0;
-  }
-}
-
-#cta {
-  border: 1px solid $cta-color;
-  border-radius: 3px;
-  display: inline-block;
-  margin: 20px 0;
-  padding: 12px 24px;
-
-  a {
-    background-color: $message-background-color;
-    color: $cta-color;
-    display: inline-block;
-    text-decoration: none;
-  }
-}
-
-#tanuki {
-  padding: 40px 0 0;
-
-  img {
-    border: none;
-    outline: none;
-    width: 37px;
-    min-height: 36px;
-  }
-}
-
-#tagline {
-  font-size: 22px;
-  font-weight: 100;
-  padding: 4px 0 40px;
-}
-
-#social {
-  padding: 0 10px 20px;
-  width: 600px;
-  word-spacing: 20px;
-
-  a {
-    color: $footer-link-color;
-    text-decoration: none;
-  }
-}

app/assets/stylesheets/mailers/repository_push_email.scss

-@import "framework/variables";
-
-table.code {
-  width: 100%;
-  font-family: monospace;
-  border: none;
-  border-collapse: separate;
-  margin: 0;
-  padding: 0;
-  -premailer-cellpadding: 0;
-  -premailer-cellspacing: 0;
-  -premailer-width: 100%;
-
-  td {
-    line-height: $code_line_height;
-    font-family: monospace;
-    font-size: $code_font_size;
-  }
-
-  td.diff-line-num {
-    margin: 0;
-    padding: 0;
-    border: none;
-    background: $background-color;
-    color: rgba(0, 0, 0, 0.3);
-    padding: 0 5px;
-    border-right: 1px solid $border-color;
-    text-align: right;
-    min-width: 35px;
-    max-width: 50px;
-    width: 35px;
-  }
-
-  td.line_content {
-    display: block;
-    margin: 0;
-    padding: 0 0.5em;
-    border: none;
-    white-space: pre;
-  }
-}
-
-@import "highlight/white";

app/assets/stylesheets/pages/commit.scss

@@ -26,28 +26,8 @@
 .commit-info-row {
   margin-bottom: 10px;
-
-  &.commit-info-row-header {
-    line-height: 34px;
-
-    @media (min-width: $screen-sm-min) {
-      margin-bottom: 0;
-    }
-
-    .commit-options-dropdown-caret {
-      @media (max-width: $screen-sm) {
-        margin-left: 0;
-      }
-    }
-  }
-
   .avatar {
     @extend .avatar-inline;
-    margin-left: 0;
-
-    @media (min-width: $screen-sm-min) {
-      margin-left: 4px;
-    }
   }
   .commit-committer-link,
   .commit-author-link {
@@ -55,6 +35,10 @@
     font-weight: bold;
   }
+  .time_ago {
+    margin-left: 8px;
+  }
+
   .fa-clipboard {
     color: $dropdown-title-btn-color;
   }

app/assets/stylesheets/pages/detail_page.scss

@@ -29,6 +29,8 @@
     margin-top: 6px;
     p {
+      overflow-x: auto;
+
       &:last-child {
         margin-bottom: 0;
       }

app/assets/stylesheets/pages/editor.scss

@@ -23,7 +23,7 @@
   .file-title {
     @extend .monospace;
-    line-height: 35px;
+    line-height: 42px;
     padding-top: 7px;
     padding-bottom: 7px;
@@ -43,7 +43,7 @@
   .editor-file-name {
     @extend .monospace;
-
+    
     float: left;
     margin-right: 10px;
   }
@@ -59,22 +59,7 @@
   }
   .encoding-selector,
-  .license-selector,
-  .gitignore-selector {
+  .license-selector {
     display: inline-block;
-    vertical-align: top;
-    font-family: $regular_font;
-  }
-
-  .gitignore-selector {
-
-    .dropdown {
-      line-height: 21px;
-    }
-
-    .dropdown-menu-toggle {
-      vertical-align: top;
-      width: 220px;
-    }
   }
 }

app/assets/stylesheets/pages/issuable.scss

@@ -125,7 +125,7 @@
 .right-sidebar {
   position: fixed;
-  top: $header-height;
+  top: 58px;
   bottom: 0;
   right: 0;
   z-index: 10;
@@ -150,10 +150,6 @@
       font-weight: 600;
     }
-    .light {
-      font-weight: normal;
-    }
-
     .sidebar-collapsed-icon {
       display: none;
     }

app/assets/stylesheets/pages/issues.scss

@@ -40,6 +40,11 @@
   }
 }
+.issue-search-form {
+  margin: 0;
+  height: 24px;
+}
+
 form.edit-issue {
   margin: 0;
 }
@@ -91,3 +96,8 @@ form.edit-issue {
 .issue-form .select2-container {
   width: 250px !important;
 }
+
+.issue-closed-by-widget {
+  color: $gl-text-color;
+  margin-left: 52px;
+}

app/assets/stylesheets/pages/merge_requests.scss

@@ -41,7 +41,7 @@
       margin: 0;
       margin-left: 20px;
       padding: 5px;
-      padding-top: 8px;
+      padding-top: 12px;
       line-height: 20px;
       &.right {
@@ -110,29 +110,6 @@
     p:last-child {
       margin-bottom: 0;
     }
-
-    @media (max-width: $screen-sm-max) {
-      h4 {
-        font-size: 15px;
-      }
-
-      p {
-        font-size: 13px;
-      }
-
-      .btn,
-      .btn-group,
-      .accept-action {
-        width: 100%;
-        margin-bottom: 4px;
-      }
-
-      .accept-control {
-        width: 100%;
-        text-align: center;
-        margin: 0;
-      }
-    }
   }
   .mr-widget-footer {
@@ -303,5 +280,11 @@
       background-color: $white-light;
       color: $gl-placeholder-color;
     }
+
+    th,
+    td {
+      padding: 16px;
+    }
   }
 }
+

app/assets/stylesheets/pages/notes.scss

@@ -226,7 +226,8 @@ ul.notes {
   }
 }
-.note-action-button {
+.note-action-button,
+.discussion-action-button {
   display: inline-block;
   margin-left: 10px;
   line-height: 24px;