Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-27476

2 files changed, 13 insertions, 5 deletions

diff --git a/app/assets/javascripts/repository/components/preview/index.vue b/app/assets/javascripts/repository/components/preview/index.vue
index 7f974838359..6b3822151ff 100644
--- a/app/assets/javascripts/repository/components/preview/index.vue
+++ b/app/assets/javascripts/repository/components/preview/index.vue
@@ -35,11 +35,13 @@ export default {
 
 <template>
   <article class="file-holder limited-width-container readme-holder">
-    <div class="file-title">
-      <i aria-hidden="true" class="fa fa-file-text-o fa-fw"></i>
-      <gl-link :href="blob.webUrl">
-        <strong>{{ blob.name }}</strong>
-      </gl-link>
+    <div class="js-file-title file-title-flex-parent">
+      <div class="file-header-content">
+        <i aria-hidden="true" class="fa fa-file-text-o fa-fw"></i>
+        <gl-link :href="blob.webUrl">
+          <strong>{{ blob.name }}</strong>
+        </gl-link>
+      </div>
     </div>
     <div class="blob-viewer">
       <gl-loading-icon v-if="loading > 0" size="md" class="my-4 mx-auto" />
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 3876d1c10d4..39e7e4bb7e5 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -645,6 +645,12 @@ h4 {
   }
 }
 
+.text-right-md {
+  @include media-breakpoint-up(md) {
+    text-align: right;
+  }
+}
+
 .text-right-lg {
   @include media-breakpoint-up(lg) {
     text-align: right;