openstack/horizon
Code Issues Proposed changes

Revert "Merge "Bootstrap variable overrides should only be default values""

Browse Source 
This reverts commit 1fefd0f425, reversing
changes made to 74e6da9f43.

This patch incorrectly layers defaults in SCSS, which doesn't work. A
default does not override another default, so adding !default to our
overrides has caused them not to work.

Change-Id: I9f9c98262a428d84efe7887f76ff9e1af451c29b
Closes-Bug: 1459573
This commit is contained in:
Rob Cresswell 2015-05-28 09:44:09 +01:00
parent 3b1e4cb745
commit 88d8f1f4b2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/static/dashboard/scss/_variables.scss
View File

@ -8,10 +8,10 @@ $webroot: "" !default;
/* Bootstrap variables overrides */
$icon-font-path: "../../bootstrap/fonts/bootstrap/" !default;
$font-size-base: 13px !default;
$modal-md: 732px !default;
$gray-light: #cccccc !default;
$icon-font-path: "../../bootstrap/fonts/bootstrap/";
$font-size-base: 13px;
$modal-md: 732px;
$gray-light: #cccccc;
/* Horizon Custom Variables */