From 95be924926aff0bc80589eefa2660ebc673ff2fb Mon Sep 17 00:00:00 2001 From: syed <syed.sayal.shah@gmail.com> Date: Fri, 19 Jul 2013 18:18:01 +0500 Subject: [PATCH 1/4] Move accordion inline properties to variables.les --- less/accordion.less | 4 ++-- less/variables.less | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/less/accordion.less b/less/accordion.less index 0d18978317..62aced6ac3 100644 --- a/less/accordion.less +++ b/less/accordion.less @@ -11,7 +11,7 @@ // Group == heading + body .accordion-group { margin-bottom: 2px; - border: 1px solid #e5e5e5; + border: 1px solid @accordion-group-border-color; border-radius: @border-radius-base; } .accordion-heading { @@ -27,5 +27,5 @@ // Inner needs the styles because you can't animate properly with any styles on the element .accordion-inner { padding: 9px 15px; - border-top: 1px solid #e5e5e5; + border-top: 1px solid @accordion-group-border-color; } diff --git a/less/variables.less b/less/variables.less index 3b26988082..4cdb71da5c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -7,6 +7,13 @@ // -------------------------------------------------- +// Inner Files color variables (can say inline colors) +// -------------------------------------------------- + +@color-1: #e5e5e5; //Mercury, RGB: 229, 229, 229 + +@accordion-group-border-color: @color-1; + // Grays // ------------------------- From b37127e2fcb35ea992043c508231f9476302b653 Mon Sep 17 00:00:00 2001 From: syed <syed.sayal.shah@gmail.com> Date: Fri, 19 Jul 2013 18:29:19 +0500 Subject: [PATCH 2/4] move badges inline properties to variables.less --- less/badges.less | 6 +++--- less/variables.less | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/less/badges.less b/less/badges.less index e1a2e9c5a6..825d31dbf3 100644 --- a/less/badges.less +++ b/less/badges.less @@ -10,7 +10,7 @@ padding: 3px 7px; font-size: @font-size-small; font-weight: bold; - color: #fff; + color: @badge-color; line-height: 1; vertical-align: middle; white-space: nowrap; @@ -28,7 +28,7 @@ a.badge { &:hover, &:focus { - color: #fff; + color: @badge-link-hover-color; text-decoration: none; cursor: pointer; } @@ -44,7 +44,7 @@ a.badge { a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: @link-color; - background-color: #fff; + background-color: @active-badge-bg-color; } .nav-pills > li > a > .badge { margin-left: 3px; diff --git a/less/variables.less b/less/variables.less index 4cdb71da5c..7ea1042d17 100644 --- a/less/variables.less +++ b/less/variables.less @@ -14,6 +14,10 @@ @accordion-group-border-color: @color-1; +@active-badge-bg-color: @color-2; +@badge-link-hover-color: @color-2; +@badge-color: @color-2; + // Grays // ------------------------- From 5e898fa2a1564f3103017874aea0c993fffe26cc Mon Sep 17 00:00:00 2001 From: syed <syed.sayal.shah@gmail.com> Date: Fri, 19 Jul 2013 18:39:51 +0500 Subject: [PATCH 3/4] move breadcrumb.less inline properties and also added @color-2 missed in last commit --- less/breadcrumbs.less | 4 ++-- less/variables.less | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 956944a8ba..2f7fb6ddc9 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -7,11 +7,11 @@ padding: 8px 15px; margin: 0 0 @line-height-computed; list-style: none; - background-color: #f5f5f5; + background-color: @breadcrumb-bg-color; border-radius: @border-radius-base; > li { display: inline-block; - text-shadow: 0 1px 0 #fff; + text-shadow: 0 1px 0 @breadcrumb-text-shadow-color; &+li:before { display: inline-block; content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space diff --git a/less/variables.less b/less/variables.less index 7ea1042d17..541a38c530 100644 --- a/less/variables.less +++ b/less/variables.less @@ -10,13 +10,18 @@ // Inner Files color variables (can say inline colors) // -------------------------------------------------- -@color-1: #e5e5e5; //Mercury, RGB: 229, 229, 229 +@color-1: #e5e5e5; //Mercury, RGB: 229, 229, 229 +@color-2: #fff; //white, RGB: 255, 255, 255 +@color-3: #f5f5f5; //Wild Sand, RGB: 245, 245, 245 @accordion-group-border-color: @color-1; @active-badge-bg-color: @color-2; @badge-link-hover-color: @color-2; @badge-color: @color-2; +@breadcrumb-text-shadow-color: @color-2; + +@breadcrumb-bg-color: @color-3; // Grays // ------------------------- From 65ee36a7bf403588a105b09aae5ffa141f47a97f Mon Sep 17 00:00:00 2001 From: syed <syed.sayal.shah@gmail.com> Date: Fri, 19 Jul 2013 23:14:13 +0500 Subject: [PATCH 4/4] Improved and followed pattern suggestions --- less/accordion.less | 4 ++-- less/badges.less | 2 +- less/breadcrumbs.less | 4 ++-- less/variables.less | 15 ++++++--------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/less/accordion.less b/less/accordion.less index 62aced6ac3..c3023ac49e 100644 --- a/less/accordion.less +++ b/less/accordion.less @@ -11,7 +11,7 @@ // Group == heading + body .accordion-group { margin-bottom: 2px; - border: 1px solid @accordion-group-border-color; + border: 1px solid @accordion-border-color; border-radius: @border-radius-base; } .accordion-heading { @@ -27,5 +27,5 @@ // Inner needs the styles because you can't animate properly with any styles on the element .accordion-inner { padding: 9px 15px; - border-top: 1px solid @accordion-group-border-color; + border-top: 1px solid @accordion-border-color; } diff --git a/less/badges.less b/less/badges.less index 825d31dbf3..f2f2aedabb 100644 --- a/less/badges.less +++ b/less/badges.less @@ -44,7 +44,7 @@ a.badge { a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: @link-color; - background-color: @active-badge-bg-color; + background-color: @badge-active-bg; } .nav-pills > li > a > .badge { margin-left: 3px; diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 2f7fb6ddc9..36fb4cd478 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -7,11 +7,11 @@ padding: 8px 15px; margin: 0 0 @line-height-computed; list-style: none; - background-color: @breadcrumb-bg-color; + background-color: @breadcrumb-bg; border-radius: @border-radius-base; > li { display: inline-block; - text-shadow: 0 1px 0 @breadcrumb-text-shadow-color; + text-shadow: @breadcrumb-text-shadow; &+li:before { display: inline-block; content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space diff --git a/less/variables.less b/less/variables.less index 541a38c530..fa230d6674 100644 --- a/less/variables.less +++ b/less/variables.less @@ -10,18 +10,15 @@ // Inner Files color variables (can say inline colors) // -------------------------------------------------- -@color-1: #e5e5e5; //Mercury, RGB: 229, 229, 229 -@color-2: #fff; //white, RGB: 255, 255, 255 -@color-3: #f5f5f5; //Wild Sand, RGB: 245, 245, 245 +@accordion-border-color: #e5e5e5; -@accordion-group-border-color: @color-1; +@badge-color: #fff; +@badge-active-bg: #fff; +@badge-link-hover-color: #fff; -@active-badge-bg-color: @color-2; -@badge-link-hover-color: @color-2; -@badge-color: @color-2; -@breadcrumb-text-shadow-color: @color-2; +@breadcrumb-bg: #f5f5f5; +@breadcrumb-text-shadow: 0 1px 0 #fff; -@breadcrumb-bg-color: @color-3; // Grays // -------------------------