diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-11 00:37:39 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-11 00:37:39 +0000 |
| commit | 8ab76fc5572f4654c9db990c7410f42a7dd8c1ce (patch) | |
| tree | 707af8f2ba93f9ecb8886ac2ca8a3ceb0b49ed8e | |
| parent | 63553bb1a6776c5edc89d245384031b8aeb0f01a (diff) | |
| parent | 4a81c3ae6ae9b4137292c716c004ee83e6d0fdf4 (diff) | |
| download | gitlab-ce-8ab76fc5572f4654c9db990c7410f42a7dd8c1ce.tar.gz | |
Merge branch '41709-rich-blob-viewer-margins-for-pc' into 'master'
Make rich blob viewer wider for PC
Closes #41709
See merge request gitlab-org/gitlab-ce!16262
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/41709-rich-blob-viewer-margins-for-pc.yml | 5 |
3 files changed, 6 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 1588036aeae..af400da94d6 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -21,11 +21,6 @@ max-width: $limited-layout-width-sm; margin-left: auto; margin-right: auto; - - @media (min-width: $screen-md-min) { - padding-top: 64px; - padding-bottom: 64px; - } } } @@ -128,7 +123,7 @@ } &.wiki { - padding: 30px $gl-padding; + padding: $gl-padding; } &.blob-no-preview { diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 6cb32408a48..acbd9936706 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -16,12 +16,6 @@ display: inline-block; } -@media (min-width: $screen-md-min) { - .blob-viewer[data-type="rich"] { - margin: 20px; - } -} - .ide-view { display: flex; height: calc(100vh - #{$header-height}); diff --git a/changelogs/unreleased/41709-rich-blob-viewer-margins-for-pc.yml b/changelogs/unreleased/41709-rich-blob-viewer-margins-for-pc.yml new file mode 100644 index 00000000000..51285e5476f --- /dev/null +++ b/changelogs/unreleased/41709-rich-blob-viewer-margins-for-pc.yml @@ -0,0 +1,5 @@ +--- +title: Make rich blob viewer wider for PC +merge_request: 16262 +author: Takuya Noguchi +type: fixed |