diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-22 01:22:21 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-22 01:22:21 +0300 |
| commit | ae7b2ef62cdf61c990f914d776a6fdfc2bc49fa2 (patch) | |
| tree | 6f0022bf04b1b566fa79b979cc9cc373cd0ebaa1 /app/assets/stylesheets/framework/blocks.scss | |
| parent | 8d544645f0ef114586212835cf011a3e268c9ec1 (diff) | |
| parent | 0305dd98b32b5a989f2b84e0810cf5ddc14abd7f (diff) | |
Merge branch 'master' into issue_12658
# Conflicts:
# app/models/issue.rb
# app/views/projects/_home_panel.html.haml
# app/views/shared/projects/_project.html.haml
# db/schema.rb
# spec/models/project_spec.rb
Diffstat (limited to 'app/assets/stylesheets/framework/blocks.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 2fac6abbac9..62b2af0dbf7 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -107,7 +107,7 @@ margin: 0; font-size: 23px; font-weight: normal; - margin: 16px 0 5px 0; + margin: 16px 0 5px; color: #4c4e54; font-size: 23px; line-height: 1.1; |