From e21a0bd231d1da08afdf70ffd2597c81d0e62f89 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Fri, 28 Jun 2013 10:49:13 -0700 Subject: [PATCH] added some bootstrap overrides. --- Gruntfile.js | 1 + UI/Content/Overrides/bootstrap.less | 14 ++++++++++++++ UI/Content/Overrides/overrides.less | 2 -- UI/Content/base.less | 1 - UI/Content/overrides.less | 2 ++ UI/Index.html | 1 + 6 files changed, 18 insertions(+), 3 deletions(-) delete mode 100644 UI/Content/Overrides/overrides.less diff --git a/Gruntfile.js b/Gruntfile.js index 077c93e22..1b348012a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,6 +61,7 @@ module.exports = function (grunt) { expand: true, src : [ 'UI/Content/base.less', + 'UI/Content/Overrides.less', 'UI/Series/Series.less', 'UI/AddSeries/addSeries.less', 'UI/Calendar/calendar.less', diff --git a/UI/Content/Overrides/bootstrap.less b/UI/Content/Overrides/bootstrap.less index b349f9ed4..b33d1110a 100644 --- a/UI/Content/Overrides/bootstrap.less +++ b/UI/Content/Overrides/bootstrap.less @@ -1,3 +1,5 @@ +@import "../prefixer"; + .label, .badge { cursor : default; } @@ -7,3 +9,15 @@ margin-left : 0; } } + +.label, .badge, .btn { + .text-shadow(none); +} + +.btn { + min-width : 80px; +} + +.slide-button { + min-width : 0px; +} diff --git a/UI/Content/Overrides/overrides.less b/UI/Content/Overrides/overrides.less deleted file mode 100644 index d10bd1ce7..000000000 --- a/UI/Content/Overrides/overrides.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "bootstrap"; -@import "browser"; diff --git a/UI/Content/base.less b/UI/Content/base.less index ade0bb39f..a32f6ccc6 100644 --- a/UI/Content/base.less +++ b/UI/Content/base.less @@ -1,7 +1,6 @@ @import "bootstrap/variables"; @import "bootstrap/mixins"; @import "bootstrap/type"; -@import "Overrides/overrides"; @import "font"; @import "form"; @import "theme"; diff --git a/UI/Content/overrides.less b/UI/Content/overrides.less index e69de29bb..93839659e 100644 --- a/UI/Content/overrides.less +++ b/UI/Content/overrides.less @@ -0,0 +1,2 @@ +@import "Overrides/bootstrap"; +@import "Overrides/browser"; diff --git a/UI/Index.html b/UI/Index.html index e3cb2a431..84e61dc7d 100644 --- a/UI/Index.html +++ b/UI/Index.html @@ -14,6 +14,7 @@ +