diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-27 19:26:04 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-27 19:26:04 +0300 |
| commit | 0599ced165b45ef10051c1e74d093846b6298103 (patch) | |
| tree | 2f51f8b96f65e84bc01ddc207b32233e8f619b8f /app/assets | |
| parent | 46dfee555f9b9144d07735343ff56c87291b7efa (diff) | |
| parent | 4feefd36463b494dc0d9f80138a6c6fcc1e7337a (diff) | |
Merge branch 'rss-btn-alignment-fix' into 'master'
Fixed alignment of RSS button on activity pages
Closes #28572
See merge request !9478
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 0f9213b98e3..9a4129cdc8d 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -229,7 +229,7 @@ .controls { float: right; margin-top: 8px; - padding-bottom: 7px; + padding-bottom: 8px; border-bottom: 1px solid $border-color; } } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 67110813abb..07b93430442 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -638,14 +638,6 @@ pre.light-well { margin: 0; } -.activity-filter-block { - .controls { - padding-bottom: 7px; - margin-top: 8px; - border-bottom: 1px solid $border-color; - } -} - .commits-search-form { .input-short { min-width: 200px; |