From 1661550c689c03559b1d0cba4387bfdfb0251520 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Mon, 11 Jan 2016 17:36:05 -0800 Subject: [PATCH] Change buttons to ghost type --- client/less/lib/bootstrap/buttons.less | 2 +- client/less/lib/bootstrap/mixins/buttons.less | 4 ++-- client/less/lib/bootstrap/variables.less | 12 ++++++------ client/less/main.less | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/less/lib/bootstrap/buttons.less b/client/less/lib/bootstrap/buttons.less index 40553c6386..66a19bd066 100755 --- a/client/less/lib/bootstrap/buttons.less +++ b/client/less/lib/bootstrap/buttons.less @@ -32,7 +32,7 @@ &:hover, &:focus, &.focus { - color: @btn-default-color; + color: @gray-lighter; text-decoration: none; } diff --git a/client/less/lib/bootstrap/mixins/buttons.less b/client/less/lib/bootstrap/mixins/buttons.less index 92d8a056cd..c8289d0cd8 100755 --- a/client/less/lib/bootstrap/mixins/buttons.less +++ b/client/less/lib/bootstrap/mixins/buttons.less @@ -14,8 +14,8 @@ &:active, &.active, .open > .dropdown-toggle& { - color: @color; - background-color: darken(@background, 10%); + color: @gray-lighter; + background-color: lighten(@background, 10%); border-color: darken(@border, 12%); } &:active, diff --git a/client/less/lib/bootstrap/variables.less b/client/less/lib/bootstrap/variables.less index 98b46a105f..fdd43df500 100755 --- a/client/less/lib/bootstrap/variables.less +++ b/client/less/lib/bootstrap/variables.less @@ -144,27 +144,27 @@ @btn-font-weight: normal; -@btn-default-color: #333; +@btn-default-color: @gray-lighter; @btn-default-bg: @gray-lighter; @btn-default-border: #ccc; -@btn-primary-color: @gray-lighter; +@btn-primary-color: @brand-primary; @btn-primary-bg: @brand-primary; @btn-primary-border: darken(@btn-primary-bg, 5%); -@btn-success-color: @gray-lighter; +@btn-success-color: @brand-primary; @btn-success-bg: @brand-success; @btn-success-border: darken(@btn-success-bg, 5%); -@btn-info-color: @gray-lighter; +@btn-info-color: @brand-info; @btn-info-bg: @brand-info; @btn-info-border: darken(@btn-info-bg, 5%); -@btn-warning-color: @gray-lighter; +@btn-warning-color: @brand-primary; @btn-warning-bg: @brand-warning; @btn-warning-border: darken(@btn-warning-bg, 5%); -@btn-danger-color: @gray-lighter; +@btn-danger-color: @brand-danger; @btn-danger-bg: @brand-danger; @btn-danger-border: darken(@btn-danger-bg, 5%); diff --git a/client/less/main.less b/client/less/main.less index b3dc2a87b5..12dc2e3c06 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -117,7 +117,7 @@ h1, h2, h3, h4, h5, h6, p, li { font-size: 40px; } -.btn, .shadow { +.shadow { white-space: normal; -webkit-box-shadow: 2px 4px 1px rgba(0, 0, 0, 0.3); -moz-box-shadow: 2px 4px 1px rgba(0, 0, 0, 0.3); @@ -719,7 +719,7 @@ iframe.iphone { .btn { background: transparent; - color: #fff; + -webkit-transition: background .2s ease-in-out, border .2s ease-in-out; -moz-transition: background .2s ease-in-out, border .2s ease-in-out; -ms-transition: background .2s ease-in-out, border .2s ease-in-out;