Merge branch '7-9-rc2' into '7-9-stable'

Code for 7.9.0.rc2

cc @marin

See merge request !1719

app/assets/stylesheets/base/variables.scss

 $style_color: #474D57;
 $hover: #FFF3EB;
+$gl-text-color: #222222;
 $gl-link-color: #446e9b;
 $nprogress-color: #c0392b;
 $gl-font-size: 14px;
@@ -8,23 +9,18 @@ $sidebar_width: 230px;
 $avatar_radius: 50%;
 $code_font_size: 13px;
 $code_line_height: 1.5;
-$border-color: #dce4ec;
-$background-color: #ECF0F1;
+$border-color: #E5E5E5;
+$background-color: #f5f5f5;
 
 /*
  * State colors:
  */
-$gl-success: #019875;
-$gl-danger: #d9534f;
 $gl-primary: #446e9b;
+$gl-success: #019875;
 $gl-info: #029ACF;
 $gl-warning: #EB9532;
+$gl-danger: #d9534f;
 
-$gl-primary:         #2C3E50;
-$gl-success:         #18BC9C;
-$gl-info:            #3498DB;
-$gl-warning:         #F39C12;
-$gl-danger:          #E74C3C;
 /*
  * Commit Diff Colors
  */

app/assets/stylesheets/generic/files.scss

@@ -94,7 +94,7 @@
       }
       .author,
       .blame_commit {
-        background: #f5f5f5;
+        background: $background-color;
         vertical-align: top;
       }
       .lines {

app/assets/stylesheets/generic/forms.scss

@@ -29,8 +29,8 @@ fieldset legend {
   padding: 17px 20px 18px;
   margin-top: 18px;
   margin-bottom: 18px;
-  background-color: #ecf0f1;
-  border-top: 1px solid #e5e5e5;
+  background-color: $background-color;
+  border-top: 1px solid $border-color;
 }
 
 @media (min-width: $screen-sm-min) {

app/assets/stylesheets/generic/lists.scss

@@ -35,7 +35,7 @@
       color: #8a6d3b;
     }
 
-    &.smoke { background-color: #f5f5f5; }
+    &.smoke { background-color: $background-color; }
 
     &:hover {
       background: $hover;
@@ -46,7 +46,7 @@
       border-bottom: none;
 
       &.bottom {
-        background: #f5f5f5;
+        background: $background-color;
       }
     }
 
@@ -61,7 +61,7 @@
     p {
       padding-top: 1px;
       margin: 0;
-      color: #222;
+      color: $gray-dark;
       img {
         position: relative;
         top: 3px;
@@ -74,9 +74,10 @@
     }
 
     .row_title {
-      color: #444;
+      color: $gray-dark;
+
       &:hover {
-        color: #444;
+        color: $text-color;
         text-decoration: underline;
       }
     }

app/assets/stylesheets/generic/nav_sidebar.scss

 .page-with-sidebar {
-  background: #F5F5F5;
+  background: $background-color;
 
   .sidebar-wrapper {
     position: fixed;
     top: 0;
     left: 0;
     height: 100%;
-    border-right: 1px solid #EAEAEA;
+    border-right: 1px solid $border-color;
   }
 }
 
 .sidebar-wrapper {
   z-index: 99;
-  background: #F5F5F5;
+  background: $background-color;
 }
 
 .content-wrapper {
@@ -39,7 +39,7 @@
 
 .nav-sidebar li {
   &.active a {
-    color: #333;
+    color: $text-color;
     background: #FFF !important;
     font-weight: bold;
     border: 1px solid #EEE;
@@ -52,32 +52,31 @@
     }
 
     i {
-      color: #444;
+      color: $text-color;
     }
   }
 }
 
 .nav-sidebar li {
   &.separate-item {
-    border-top: 1px solid #ddd;
+    border-top: 1px solid $border-color;
     padding-top: 10px;
     margin-top: 10px;
   }
 
   a {
-    color: #555;
+    color: $gray;
     display: block;
     text-decoration: none;
     padding: 8px 15px;
     font-size: 13px;
     line-height: 20px;
-    text-shadow: 0 1px 2px #FFF;
     padding-left: 20px;
 
     &:hover {
       text-decoration: none;
-      color: #333;
-      background: #EEE;
+      color: $text-color;
+      background: $border-color;
     }
 
     &:active, &:focus {
@@ -86,7 +85,7 @@
 
     i {
       width: 20px;
-      color: #888;
+      color: $gray-light;
       margin-right: 23px;
     }
   }
@@ -156,18 +155,17 @@
   position: fixed;
   top: 46px;
   padding: 5px 13px 5px 13px;
-  left: 197px;
+  left: 198px;
   font-size: 13px;
-  background: #EEE;
+  background: transparent;
   color: black;
-  border-left: 1px solid rgba(0,0,0,0.035);
-  border-right: 1px solid rgba(0,0,0,0.035);
+  border-left: 1px solid $border-color;
+  border-bottom: 1px solid $border-color;
 }
 
 .collapse-nav a:hover {
   text-decoration: none;
-  color: #333;
-  background: #eaeaea;
+  background: #f2f6f7;
 }
 
 @media (max-width: $screen-md-max) {

app/assets/stylesheets/generic/timeline.scss

@@ -54,7 +54,7 @@
 
       .timeline-content {
         position: relative;
-        background: #f5f5f6;
+        background: $background-color;
         padding: 10px 15px;
         margin-left: 60px;
 
@@ -70,7 +70,7 @@
           height: 0;
           border-style: solid;
           border-width: 9px 9px 9px 0;
-          border-color: transparent #f5f5f6 transparent transparent;
+          border-color: transparent $background-color transparent transparent;
           left: 0;
           top: 10px;
           margin-left: -9px;

app/assets/stylesheets/generic/typography.scss

@@ -4,7 +4,6 @@
  */
 .page-title {
   margin-top: 0px;
-  color: #333;
   line-height: 1.5;
   font-weight: normal;
   margin-bottom: 5px;
@@ -16,7 +15,7 @@ pre {
 
   &.dark {
     background: #333;
-    color: #f5f5f5;
+    color: $background-color;
   }
 }
 

app/assets/stylesheets/pages/diff.scss

@@ -89,7 +89,7 @@
       margin: 0px;
       padding: 0px;
       border: none;
-      background: #F5F5F5;
+      background: $background-color;
       color: rgba(0,0,0,0.3);
       padding: 0px 5px;
       border-right: 1px solid $border-color;

app/assets/stylesheets/pages/editor.scss

@@ -37,7 +37,7 @@
   }
 
   .editor-ref {
-    background: #f5f5f5;
+    background: $background-color;
     padding: 11px 15px;
     border-right: 1px solid #CCC;
     display: inline-block;

app/assets/stylesheets/pages/events.scss

@@ -154,10 +154,12 @@
   overflow: auto;
   .event-last-push-text {
     @include str-truncated(100%);
+    padding: 5px 0;
+    font-size: 13px;
     float:left;
     margin-right: -150px;
     padding-right: 150px;
-    line-height: 24px;
+    line-height: 20px;
   }
 }
 
@@ -188,7 +190,7 @@
   li a {
     font-size: 13px;
     padding: 5px 10px;
-    background: rgba(0,0,0,0.045);
+    background: $background-color;
     margin-left: 4px;
   }
 }

app/assets/stylesheets/pages/merge_requests.scss

@@ -129,7 +129,7 @@
     font-size: 15px;
     border-bottom: 1px solid #BBB;
     color: #777;
-    background-color: #F5F5F5;
+    background-color: $background-color;
 
     &.ci-success {
       color: $gl-success;

app/assets/stylesheets/pages/tree.scss

@@ -27,7 +27,7 @@
       }
       &.selected {
         td {
-          background: #f5f5f5;
+          background: $background-color;
           border-top: 1px solid #EEE;
           border-bottom: 1px solid #EEE;
         }

app/views/notify/project_was_moved_email.html.haml

@@ -6,10 +6,10 @@
     = @project.name_with_namespace
 %p
   To update the remote url in your local repository run (for ssh):
-%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
+%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
   git remote set-url origin #{@project.ssh_url_to_repo}
 %p
   or for http(s):
-%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
+%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
   git remote set-url origin #{@project.http_url_to_repo}
 %br

app/views/projects/issues/_issue_context.html.haml

@@ -27,19 +27,20 @@
       = hidden_field_tag :issue_context
       = f.submit class: 'btn'
 
-  %div.prepend-top-20.clearfix
-    .issuable-context-title
-      %label
-        Subscription:
-    %button.btn.btn-block.subscribe-button
-      %i.fa.fa-eye
-      %span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
-    - subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
-    .subscription-status{"data-status" => subscribtion_status}
-      .description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )}
-        You're not receiving notifications from this thread.
-      .description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )}
-        You're receiving notifications because you're subscribed to this thread.
+  - if current_user
+    %div.prepend-top-20.clearfix
+      .issuable-context-title
+        %label
+          Subscription:
+      %button.btn.btn-block.subscribe-button
+        %i.fa.fa-eye
+        %span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
+      - subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
+      .subscription-status{"data-status" => subscribtion_status}
+        .description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )}
+          You're not receiving notifications from this thread.
+        .description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )}
+          You're receiving notifications because you're subscribed to this thread.
 
 :coffeescript
   $ ->

app/views/projects/merge_requests/show/_context.html.haml

@@ -29,19 +29,20 @@
         = hidden_field_tag :merge_request_context
         = f.submit class: 'btn'
 
-  %div.prepend-top-20.clearfix
-    .issuable-context-title
-      %label
-        Subscription:
-    %button.btn.btn-block.subscribe-button
-      %i.fa.fa-eye
-      %span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
-    - subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
-    .subscription-status{"data-status" => subscribtion_status}
-      .description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )}
-        You're not receiving notifications from this thread.
-      .description-block.subscribed{class: ( "hidden" unless @merge_request.subscribed?(current_user) )}
-        You're receiving notifications because you're subscribed to this thread.
+  - if current_user
+    %div.prepend-top-20.clearfix
+      .issuable-context-title
+        %label
+          Subscription:
+      %button.btn.btn-block.subscribe-button
+        %i.fa.fa-eye
+        %span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
+      - subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
+      .subscription-status{"data-status" => subscribtion_status}
+        .description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )}
+          You're not receiving notifications from this thread.
+        .description-block.subscribed{class: ( "hidden" unless @merge_request.subscribed?(current_user) )}
+          You're receiving notifications because you're subscribed to this thread.
 
 :coffeescript
   $ ->