From b8b266ca7ce4419d0b64d7c9cc895db9c1e79015 Mon Sep 17 00:00:00 2001 From: Mark Otto <otto@github.com> Date: Fri, 30 Nov 2012 15:40:44 -0800 Subject: [PATCH] popovers and tooltips vars --- docs/assets/css/bootstrap.css | 58 +++++++++--------- less/popovers.less | 108 +++++++++++++++++----------------- less/tooltip.less | 28 ++++----- less/variables.less | 20 +++---- 4 files changed, 107 insertions(+), 107 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 985cc2deab..8aa51f07eb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4663,57 +4663,57 @@ input[type="button"].btn-block { .popover { /* &.top .arrow { - bottom: -@popoverArrowWidth; + bottom: -@popover-arrow-width; left: 50%; - margin-left: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth 0; - //border-top-color: @popoverArrowColor; + margin-left: -@popover-arrow-width; + border-width: @popover-arrow-width @popover-arrow-width 0; + //border-top-color: @popover-arrow-color; border-top-color: blue; &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - //border-top-color: @popoverArrowOuterColor; + border-width: @popover-arrow-outer-width @popover-arrow-outer-width 0; + //border-top-color: @popover-arrow-outer-color; border-top-color: red; - top: -@popoverArrowWidth; + top: -@popover-arrow-width; //bottom: -1px; - left: -@popoverArrowOuterWidth; + left: -@popover-arrow-outer-width; } } &.right .arrow { top: 50%; - left: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; - border-right-color: @popoverArrowColor; + left: -@popover-arrow-width; + margin-top: -@popover-arrow-width; + border-width: @popover-arrow-width @popover-arrow-width @popover-arrow-width 0; + border-right-color: @popover-arrow-color; &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-right-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; + border-width: @popover-arrow-outer-width @popover-arrow-outer-width @popover-arrow-outer-width 0; + border-right-color: @popover-arrow-outer-color; + bottom: -@popover-arrow-outer-width; left: -1px; } } &.bottom .arrow { - top: -@popoverArrowWidth; + top: -@popover-arrow-width; left: 50%; - margin-left: -@popoverArrowWidth; - border-width: 0 @popoverArrowWidth @popoverArrowWidth; - border-bottom-color: @popoverArrowColor; + margin-left: -@popover-arrow-width; + border-width: 0 @popover-arrow-width @popover-arrow-width; + border-bottom-color: @popover-arrow-color; &:after { - border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-bottom-color: @popoverArrowOuterColor; + border-width: 0 @popover-arrow-outer-width @popover-arrow-outer-width; + border-bottom-color: @popover-arrow-outer-color; top: -1px; - left: -@popoverArrowOuterWidth; + left: -@popover-arrow-outer-width; } } &.left .arrow { top: 50%; - right: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; - border-left-color: @popoverArrowColor; + right: -@popover-arrow-width; + margin-top: -@popover-arrow-width; + border-width: @popover-arrow-width 0 @popover-arrow-width @popover-arrow-width; + border-left-color: @popover-arrow-color; &:after { - border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-left-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; + border-width: @popover-arrow-outer-width 0 @popover-arrow-outer-width @popover-arrow-outer-width; + border-left-color: @popover-arrow-outer-color; + bottom: -@popover-arrow-outer-width; right: -1px; } }*/ diff --git a/less/popovers.less b/less/popovers.less index fff10f3837..61b3f12833 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -11,7 +11,7 @@ display: none; width: 236px; padding: 1px; - background-color: @popoverBackground; + background-color: @popover-background; -webkit-background-clip: padding-box; -moz-background-clip: padding; background-clip: padding-box; @@ -36,8 +36,8 @@ font-size: 14px; font-weight: normal; line-height: 18px; - background-color: @popoverTitleBackground; - border-bottom: 1px solid darken(@popoverTitleBackground, 5%); + background-color: @popover-title-background; + border-bottom: 1px solid darken(@popover-title-background, 5%); border-radius: 5px 5px 0 0; } @@ -62,69 +62,69 @@ border-style: solid; } .popover .arrow { - border-width: @popoverArrowOuterWidth; + border-width: @popover-arrow-outer-width; } .popover .arrow:after { - border-width: @popoverArrowWidth; + border-width: @popover-arrow-width; content: ""; } .popover { &.top .arrow { left: 50%; - margin-left: -@popoverArrowOuterWidth; + margin-left: -@popover-arrow-outer-width; border-bottom-width: 0; border-top-color: #999; // IE8 fallback - border-top-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; + border-top-color: @popover-arrow-outer-color; + bottom: -@popover-arrow-outer-width; &:after { bottom: 1px; - margin-left: -@popoverArrowWidth; + margin-left: -@popover-arrow-width; border-bottom-width: 0; - border-top-color: @popoverArrowColor; + border-top-color: @popover-arrow-color; } } &.right .arrow { top: 50%; - left: -@popoverArrowOuterWidth; - margin-top: -@popoverArrowOuterWidth; + left: -@popover-arrow-outer-width; + margin-top: -@popover-arrow-outer-width; border-left-width: 0; border-right-color: #999; // IE8 fallback - border-right-color: @popoverArrowOuterColor; + border-right-color: @popover-arrow-outer-color; &:after { left: 1px; - bottom: -@popoverArrowWidth; + bottom: -@popover-arrow-width; border-left-width: 0; - border-right-color: @popoverArrowColor; + border-right-color: @popover-arrow-color; } } &.bottom .arrow { left: 50%; - margin-left: -@popoverArrowOuterWidth; + margin-left: -@popover-arrow-outer-width; border-top-width: 0; border-bottom-color: #999; // IE8 fallback - border-bottom-color: @popoverArrowOuterColor; - top: -@popoverArrowOuterWidth; + border-bottom-color: @popover-arrow-outer-color; + top: -@popover-arrow-outer-width; &:after { top: 1px; - margin-left: -@popoverArrowWidth; + margin-left: -@popover-arrow-width; border-top-width: 0; - border-bottom-color: @popoverArrowColor; + border-bottom-color: @popover-arrow-color; } } &.left .arrow { top: 50%; - right: -@popoverArrowOuterWidth; - margin-top: -@popoverArrowOuterWidth; + right: -@popover-arrow-outer-width; + margin-top: -@popover-arrow-outer-width; border-right-width: 0; border-left-color: #999; // IE8 fallback - border-left-color: @popoverArrowOuterColor; + border-left-color: @popover-arrow-outer-color; &:after { right: 1px; border-right-width: 0; - border-left-color: @popoverArrowColor; - bottom: -@popoverArrowWidth; + border-left-color: @popover-arrow-color; + bottom: -@popover-arrow-width; } } @@ -132,57 +132,57 @@ /* &.top .arrow { - bottom: -@popoverArrowWidth; + bottom: -@popover-arrow-width; left: 50%; - margin-left: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth 0; - //border-top-color: @popoverArrowColor; + margin-left: -@popover-arrow-width; + border-width: @popover-arrow-width @popover-arrow-width 0; + //border-top-color: @popover-arrow-color; border-top-color: blue; &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - //border-top-color: @popoverArrowOuterColor; + border-width: @popover-arrow-outer-width @popover-arrow-outer-width 0; + //border-top-color: @popover-arrow-outer-color; border-top-color: red; - top: -@popoverArrowWidth; + top: -@popover-arrow-width; //bottom: -1px; - left: -@popoverArrowOuterWidth; + left: -@popover-arrow-outer-width; } } &.right .arrow { top: 50%; - left: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; - border-right-color: @popoverArrowColor; + left: -@popover-arrow-width; + margin-top: -@popover-arrow-width; + border-width: @popover-arrow-width @popover-arrow-width @popover-arrow-width 0; + border-right-color: @popover-arrow-color; &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-right-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; + border-width: @popover-arrow-outer-width @popover-arrow-outer-width @popover-arrow-outer-width 0; + border-right-color: @popover-arrow-outer-color; + bottom: -@popover-arrow-outer-width; left: -1px; } } &.bottom .arrow { - top: -@popoverArrowWidth; + top: -@popover-arrow-width; left: 50%; - margin-left: -@popoverArrowWidth; - border-width: 0 @popoverArrowWidth @popoverArrowWidth; - border-bottom-color: @popoverArrowColor; + margin-left: -@popover-arrow-width; + border-width: 0 @popover-arrow-width @popover-arrow-width; + border-bottom-color: @popover-arrow-color; &:after { - border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-bottom-color: @popoverArrowOuterColor; + border-width: 0 @popover-arrow-outer-width @popover-arrow-outer-width; + border-bottom-color: @popover-arrow-outer-color; top: -1px; - left: -@popoverArrowOuterWidth; + left: -@popover-arrow-outer-width; } } &.left .arrow { top: 50%; - right: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; - border-left-color: @popoverArrowColor; + right: -@popover-arrow-width; + margin-top: -@popover-arrow-width; + border-width: @popover-arrow-width 0 @popover-arrow-width @popover-arrow-width; + border-left-color: @popover-arrow-color; &:after { - border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-left-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; + border-width: @popover-arrow-outer-width 0 @popover-arrow-outer-width @popover-arrow-outer-width; + border-left-color: @popover-arrow-outer-color; + bottom: -@popover-arrow-outer-width; right: -1px; } }*/ diff --git a/less/tooltip.less b/less/tooltip.less index 49e553643a..cc4dbe61db 100644 --- a/less/tooltip.less +++ b/less/tooltip.less @@ -23,10 +23,10 @@ .tooltip-inner { max-width: 200px; padding: 3px 8px; - color: @tooltipColor; + color: @tooltip-color; text-align: center; text-decoration: none; - background-color: @tooltipBackground; + background-color: @tooltip-background; border-radius: @border-radius-base; } @@ -42,29 +42,29 @@ &.top .tooltip-arrow { bottom: 0; left: 50%; - margin-left: -@tooltipArrowWidth; - border-width: @tooltipArrowWidth @tooltipArrowWidth 0; - border-top-color: @tooltipArrowColor; + margin-left: -@tooltip-arrow-width; + border-width: @tooltip-arrow-width @tooltip-arrow-width 0; + border-top-color: @tooltip-arrow-color; } &.right .tooltip-arrow { top: 50%; left: 0; - margin-top: -@tooltipArrowWidth; - border-width: @tooltipArrowWidth @tooltipArrowWidth @tooltipArrowWidth 0; - border-right-color: @tooltipArrowColor; + margin-top: -@tooltip-arrow-width; + border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0; + border-right-color: @tooltip-arrow-color; } &.left .tooltip-arrow { top: 50%; right: 0; - margin-top: -@tooltipArrowWidth; - border-width: @tooltipArrowWidth 0 @tooltipArrowWidth @tooltipArrowWidth; - border-left-color: @tooltipArrowColor; + margin-top: -@tooltip-arrow-width; + border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width; + border-left-color: @tooltip-arrow-color; } &.bottom .tooltip-arrow { top: 0; left: 50%; - margin-left: -@tooltipArrowWidth; - border-width: 0 @tooltipArrowWidth @tooltipArrowWidth; - border-bottom-color: @tooltipArrowColor; + margin-left: -@tooltip-arrow-width; + border-width: 0 @tooltip-arrow-width @tooltip-arrow-width; + border-bottom-color: @tooltip-arrow-color; } } diff --git a/less/variables.less b/less/variables.less index 0ccd179431..e0bb27f49f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -229,19 +229,19 @@ // Tooltips and popovers // ------------------------- -@tooltipColor: #fff; -@tooltipBackground: rgba(0,0,0,.9); -@tooltipArrowWidth: 5px; -@tooltipArrowColor: @tooltipBackground; +@tooltip-color: #fff; +@tooltip-background: rgba(0,0,0,.9); +@tooltip-arrow-width: 5px; +@tooltip-arrow-color: @tooltip-background; -@popoverBackground: #fff; -@popoverArrowWidth: 10px; -@popoverArrowColor: #fff; -@popoverTitleBackground: darken(@popoverBackground, 3%); +@popover-background: #fff; +@popover-arrow-width: 10px; +@popover-arrow-color: #fff; +@popover-title-background: darken(@popover-background, 3%); // Special enhancement for popovers -@popoverArrowOuterWidth: @popoverArrowWidth + 1; -@popoverArrowOuterColor: rgba(0,0,0,.25); +@popover-arrow-outer-width: @popover-arrow-width + 1; +@popover-arrow-outer-color: rgba(0,0,0,.25); // Miscellaneous -- GitLab