diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
| commit | c8db25c37c0d78457d06117497ccde7ad80e2321 (patch) | |
| tree | dc2db4637c33c53b032a22f8e78975838396ed13 /app/assets/stylesheets/pages/diff.scss | |
| parent | 6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (diff) | |
| parent | 948bb655f3cba9909b7396c3062da7b22f4409b3 (diff) | |
| download | gitlab-ce-c8db25c37c0d78457d06117497ccde7ad80e2321.tar.gz | |
Merge branch 'master' into issue_3945
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index caaad1e31d3..012232a708e 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -1,9 +1,7 @@ // Common .diff-file { - margin-left: -$gl-padding; - margin-right: -$gl-padding; - border: none; - border-bottom: 1px solid #E7E9EE; + border: 1px solid $border-color; + border-top: none; .diff-header { position: relative; @@ -23,14 +21,6 @@ } } - .diff-controls { - .btn { - padding: 0px 10px; - font-size: 13px; - line-height: 28px; - } - } - .commit-short-id { font-family: $monospace_font; font-size: smaller; |