diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 13:09:50 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 13:09:50 +0300 |
| commit | 3b9012871da7dbf6d4f5463654c7c478012e694e (patch) | |
| tree | 0dfd072107d486a85de73b3ae4016d4f4d13d04a /app/assets/stylesheets/framework/variables.scss | |
| parent | 25c9b5b531c5dfe08f9dc9d075589a30465fa318 (diff) | |
| parent | 03b816f3e845c9b25d3588336fc1616238465deb (diff) | |
Merge branch 'master' into zj-project-templates
* master: (623 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix pipeline icon in contextual nav for projects
Since mysql is not a priority anymore, test it less
Fix order of CI lint ace editor loading
Add container registry and spam logs icons
Fix different Markdown styles
Backport to CE for:
Make new dropdown dividers full width
Fix spec
Fix spec
Fix spec
Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
Add changelog
Install yarn via apt in update guides
Use long curl options
fix
Add a spec for concurrent process
Remove monkey-patched Array.prototype.first() and last() methods
...
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 f25b96b87a6..78ff5961ab5 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -204,6 +204,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; /* |