7 9 stable (!8970) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Closed gitlab-qa-bot requested to merge 7-9-stable into master 9 years ago

Viewing commit 368a3911

Show latest version

10 files

+ 31

− 31

Files

10

368a3911

Merge branch 'css-vars' into 'master' · 368a3911
Dmitriy Zaporozhets authored 9 years ago
```
More actively use css variabled to prevent colors duplication

See merge request !1715
```

Conflict: This file was modified in the source branch, but removed in the target branch. Ask someone with write access to resolve it.

app/assets/stylesheets/generic/files.scss

+ 1

− 1

@@ -94,7 +94,7 @@
      }
      .author,
      .blame_commit {
        background: #f5f5f5;
        background: $background-color;
        vertical-align: top;
      }
      .lines {