diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-07 22:24:14 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-07 22:24:14 +0300 |
| commit | 4c8b666893aa9f5ab94b800489fd9e3240ad4f5e (patch) | |
| tree | 4c499f649a9b3461963d9c084333259aad8a57be /app/assets/stylesheets/framework/variables.scss | |
| parent | 4e2b630df716174ea9b07319a0fd5eda7b60cf8e (diff) | |
| parent | ae5003a35ef47bbdafc51e3e9d0f27039f9d20a2 (diff) | |
Merge branch 'zj-project-templates' into 'master'
Allow projects to be started from a template
Closes #32420
See merge request !13108
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 1d0f10d6a32..7a1a89cd2f9 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -629,3 +629,11 @@ $perf-bar-bucket-bg: #111; $perf-bar-bucket-color: #ccc; $perf-bar-bucket-box-shadow-from: rgba($white-light, .2); $perf-bar-bucket-box-shadow-to: rgba($black, .25); + + +/* +Project Templates Icons +*/ +$rails: #c00; +$node: #353535; +$java: #70ad51; |