diff --git a/debian/changelog b/debian/changelog index 06e6f36b..bf8ebe99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +horizon (3:12.0.0-0ubuntu2) UNRELEASED; urgency=medium + + * debian/theme/ubuntu/_styles.scss: Ensure btn-primary text color takes + precedence (LP: #1481216). + + -- Corey Bryant Fri, 22 Sep 2017 10:23:14 -0400 + horizon (3:12.0.0-0ubuntu1) artful; urgency=medium * New upstream release for OpenStack Pike. diff --git a/debian/theme/ubuntu/_styles.scss b/debian/theme/ubuntu/_styles.scss index 6afbbce1..9dd19a9d 100644 --- a/debian/theme/ubuntu/_styles.scss +++ b/debian/theme/ubuntu/_styles.scss @@ -178,6 +178,7 @@ button.list-group-item:focus, background-color: $brand-color; border-color: darken($brand-color, 5%); margin-right: 5px; + color: $white !important; &.pull-right { margin-right: 0; @@ -191,6 +192,7 @@ button.list-group-item:focus, .open > .btn-primary.dropdown-toggle { background-color: lighten($brand-color, 5%); border-color: $brand-color; + color: $white !important; } .btn-primary.disabled { @@ -208,7 +210,7 @@ fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus { background: $brand-color; - color: $white; + color: $white !important; cursor: not-allowed; opacity: .3; }