diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
| commit | 0ac012f0ad14e8a77eedb026a2de12bf59fa5881 (patch) | |
| tree | ac4693a27c1ad2c5d37b5884f4ac316f4d56b0f7 /app/assets/stylesheets/framework/variables.scss | |
| parent | 933cfe1e0c493964052b664c2426a90f845f0042 (diff) | |
| parent | 2519027442a5645cc9467e842172143e3f56c7c3 (diff) | |
| download | gitlab-ce-0ac012f0ad14e8a77eedb026a2de12bf59fa5881.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 80d634487ff..f02b2e72ffd 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -205,6 +205,7 @@ $divergence-graph-separator-bg: #ccc; $general-hover-transition-duration: 100ms; $general-hover-transition-curve: linear; $highlight-changes-color: rgb(235, 255, 232); +$performance-bar-height: 35px; /* |