diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-25 15:43:25 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-25 15:43:25 +0000 |
| commit | da8b8fe33bb6fe6bd017ea4182d7fb4f5888914c (patch) | |
| tree | 837577b8f7c57b11aba999b50c820a7a979485fe | |
| parent | 18565188a938f62d09c8c2809593d2cd4efa3ad7 (diff) | |
| parent | 166c4ee93163dd96adfd4bf8bba38aaf5e95247c (diff) | |
| download | gitlab-ce-da8b8fe33bb6fe6bd017ea4182d7fb4f5888914c.tar.gz | |
Merge branch '45933-webide-fade-uneditable-area' into 'master'
Resolve "Guide users towards editing capabilities in review mode of Web IDE"
Closes #45933
See merge request gitlab-org/gitlab-ce!20008
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 13 | ||||
| -rw-r--r-- | changelogs/unreleased/45933-webide-fade-uneditable-area.yml | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 0a56153203c..bd3320c8ae5 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -281,8 +281,8 @@ } .margin { - background-color: $gray-light; - border-right: 1px solid $white-normal; + background-color: $white-light; + border-right: 1px solid $theme-gray-100; .line-insert { border-right: 1px solid $line-added-dark; @@ -303,6 +303,15 @@ .multi-file-editor-holder { height: 100%; min-height: 0; + + &.is-readonly, + .editor.original { + .monaco-editor, + .monaco-editor-background, + .monaco-editor .inputarea.ime-input { + background-color: $theme-gray-50; + } + } } .preview-container { diff --git a/changelogs/unreleased/45933-webide-fade-uneditable-area.yml b/changelogs/unreleased/45933-webide-fade-uneditable-area.yml new file mode 100644 index 00000000000..dfb186122e7 --- /dev/null +++ b/changelogs/unreleased/45933-webide-fade-uneditable-area.yml @@ -0,0 +1,5 @@ +--- +title: Fade uneditable area in Web IDE +merge_request: 20008 +author: +type: changed |