diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-19 10:51:09 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 02bfb0ff1bf53abf44c50d8310ad0856d26860cf (patch) | |
| tree | 32d1234d933b03ec1f321d0b4c64e503f433594f /app/assets/stylesheets | |
| parent | 17830296a6143c4d76155449ff4da4377e263657 (diff) | |
| download | gitlab-ce-02bfb0ff1bf53abf44c50d8310ad0856d26860cf.tar.gz | |
Style for resolve conflicts form
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index ea848b2c2c0..c851bd52b1a 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -278,4 +278,8 @@ $colors: ( margin-left: 10px; } } + + .resolve-conflicts-form { + padding-top: $gl-padding; + } } |