diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-16 19:41:15 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | a3eb39a1068df93d732585272c5eaff380801430 (patch) | |
| tree | 7ec0263041316dbf37e8638ecd9fd79ec2dbe1c7 /app/assets/stylesheets | |
| parent | 26f658decd3943bbc66c567ea91e7b859b32e0e6 (diff) | |
| download | gitlab-ce-a3eb39a1068df93d732585272c5eaff380801430.tar.gz | |
Replace textarea with Ace editor
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 577a97e8c0e..2a8c693b2a8 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -255,6 +255,13 @@ $colors: ( .editor { border-top: solid 1px yellow; + + pre { + height: 350px; + border: none; + border-radius: 0; + margin-bottom: 0; + } } .loading-text { |