Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 16 deletions

diff --git a/app/assets/stylesheets/snippets.scss b/app/assets/stylesheets/snippets.scss
index dcdb195518c..0008a0e5c51 100644
--- a/app/assets/stylesheets/snippets.scss
+++ b/app/assets/stylesheets/snippets.scss
@@ -11,7 +11,7 @@
   line-height: $code-line-height;
   color: $gl-text-color;
   margin: 20px;
-  font-weight: 200;
+  font-weight: $gl-font-weight-normal;
 
   .gl-snippet-icon {
     display: inline-block;
@@ -34,7 +34,7 @@
 
   .file-content.code {
     border: $border-style;
-    border-radius: 0 0 4px 4px;
+    border-radius: 0 0 $border-radius-default $border-radius-default;
     display: flex;
     box-shadow: none;
     margin: 0;
@@ -45,6 +45,7 @@
       overflow-x: auto;
 
       pre {
+        height: 100%;
         padding: 10px;
         border: 0;
         border-radius: 0;
@@ -110,17 +111,13 @@
         }
       }
 
-      .gitlab-logo {
-        display: inline-block;
-        padding-left: 5px;
-        text-decoration: none;
-        color: $gl-text-color-secondary;
+      .gitlab-logo-wrapper {
+        padding-left: $gl-padding-8;
+        position: relative;
+        top: 2px;
 
-        .logo-text {
-          background: image_url('ext_snippet_icons/logo.png') no-repeat left center;
-          background-size: 18px;
-          font-weight: $gl-font-weight-normal;
-          padding-left: 24px;
+        .gitlab-logo {
+          height: 18px;
         }
       }
     }
@@ -128,7 +125,7 @@
     img,
     .gl-snippet-icon {
       display: inline-block;
-      vertical-align: middle;
+      vertical-align: text-bottom;
     }
   }
 
@@ -136,7 +133,7 @@
     a.btn {
       background-color: $white-light;
       text-decoration: none;
-      padding: 7px 9px;
+      padding: 8px 9px;
       border: $border-style;
       border-right: 0;
 
@@ -147,11 +144,11 @@
       }
 
       &:first-child {
-        border-radius: 3px 0 0 3px;
+        border-radius: $border-radius-default 0 0 $border-radius-default;
       }
 
       &:last-child {
-        border-radius: 0 3px 3px 0;
+        border-radius: 0 $border-radius-default $border-radius-default 0;
         border-right: $border-style;
       }
     }