Add latest changes from gitlab-org/gitlab@master

1 files changed, 39 insertions, 2 deletions

diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss
index 0b65b915abf..8f1b4cdb6d5 100644
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -1,3 +1,31 @@
+.new-wiki-page {
+  .new-wiki-page-slug-tip {
+    display: inline-block;
+    max-width: 100%;
+    margin-top: 5px;
+  }
+}
+
+.wiki-history,
+.wiki-page,
+.edit-wiki-page {
+  margin-right: $gutter-width;
+}
+
+.edit-wiki-page {
+  @media only screen and (min-width: map-get($grid-breakpoints, lg) + (2 * $gutter-width)) and (max-width: map-get($grid-breakpoints, lg) + (3 * $gutter-width)) {
+    margin-right: $gutter-width * 1.5;
+  }
+}
+
+.wiki-form {
+  .edit-wiki-page-slug-tip {
+    display: inline-block;
+    max-width: 100%;
+    margin-top: 5px;
+  }
+}
+
 .title .edit-wiki-header {
   width: 780px;
   margin-left: auto;
@@ -5,6 +33,15 @@
   padding-right: 7px;
 }
 
+.container-fluid.wiki-page,
+.container-fluid.edit-wiki-page {
+  width: initial;
+}
+
+.wiki-history.breadcrumbs {
+  min-height: (2 * $gl-padding) + 22;
+}
+
 .wiki-page-header {
   position: relative;
 
@@ -79,7 +116,7 @@
   }
 
   .sidebar-container {
-    padding: $gl-padding 0;
+    padding-bottom: $gl-padding;
     width: calc(100% + 100px);
     padding-right: 100px;
     height: 100%;
@@ -125,7 +162,7 @@
   }
 
   .wiki-sidebar-header {
-    padding: 0 $gl-padding $gl-padding;
+    padding: $gl-padding;
 
     .gutter-toggle {
       margin-top: 0;