From: Mark Otto Date: Sun, 29 Jan 2012 07:58:39 +0000 (-0800) Subject: add swatches to the color variables in less docs page X-Git-Tag: v2.0.0~6^2~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15a1c0ce7988aaf715096760fa99eff7b23937f4;p=thirdparty%2Fbootstrap.git add swatches to the color variables in less docs page --- diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7876f300a3..9b8244d49b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -470,6 +470,30 @@ hr.soften { +/* Color swatches on LESS docs page +-------------------------------------------------- */ +/* Sets the width of the td */ +.swatch-col { + width: 30px; +} +/* Le swatch */ +.swatch { + display: inline-block; + width: 30px; + height: 20px; + margin: -6px 0; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +/* For white swatches, give a border */ +.swatch-bordered { + width: 28px; + height: 18px; + border: 1px solid #eee; +} + + /* Misc -------------------------------------------------- */ diff --git a/docs/less.html b/docs/less.html index 497a9dfe31..5935c91259 100644 --- a/docs/less.html +++ b/docs/less.html @@ -134,168 +134,146 @@ ================================================== -->
-

Hyperlinks

- - - - - - - - - - - - - - - - - - - - -
VariableValueUsage
@linkColor#08cDefault link text color
@linkColorHoverdarken(@linkColor, 15%)Default link text hover color
-
-

Grayscale colors

+

Hyperlinks

- + - - + + + + - + + + + + + + +
VariableValue@linkColor#08cDefault link text color
@linkColorHoverdarken(@linkColor, 15%)Default link text hover color
+

Grid system

+ + + + + + + + + + + + + + + + + + + +
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
+

Typography

+ + + + + + + + + + + + + + + + +
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
+
+
+

Grayscale colors

+ - + + + + + + + +
@black@black #000
@grayDarker #222
@grayDark #333
@gray #555
@grayLight #999
@grayLighter #eee
@white #fff
-
-

Accent colors

- - - - - - - + + + + + + + - - -
VariableValue
@blue@blue #049cdb
@green #46a546
@red #9d261d
@yellow #ffc40d
@orange #f89406
@pink #c3325f
@purple #7a43b6
-
-
-
-
-

Grid system

- - - - - - - - - - - - - - - - - - - - - - - - - -
VariableValue
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
-
-
-

Typography

- - - - - - - - - - - - - - - - - - - - +
VariableValue
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
@@ -311,6 +289,7 @@ @primaryButtonBackground @linkColor + @@ -320,6 +299,7 @@ @placeholderText @grayLight + @@ -329,26 +309,32 @@ @navbarHeight 40px + @navbarBackground @grayDarker + @navbarBackgroundHighlight @grayDark + @navbarText @grayLight + @navbarLinkColor @grayLight + @navbarLinkColorHover @white + @@ -360,50 +346,42 @@ @warningText #f3edd2 + @warningBackground #c09853 - - - @warningBorder - #f3edd2 + @errorText #b94a48 + @errorBackground #f2dede - - - @errorBorder - #e9c7c7 + @successText #468847 + @successBackground #dff0d8 - - - @successBorder - #cfe8c4 + @infoText #3a87ad + @infoBackground #d9edf7 - - - @infoBorder - #bfe1f2 + diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index ad6688e1ec..82b921d240 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -62,168 +62,146 @@ ================================================== -->
-

{{_i}}Hyperlinks{{/i}}

- - - - - - - - - - - - - - - - - - - - -
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
@linkColor#08c{{_i}}Default link text color{{/i}}
@linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
-
-

{{_i}}Grayscale colors{{/i}}

+

{{_i}}Hyperlinks{{/i}}

- + - - + + + + - + + + + + + + +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}@linkColor#08c{{_i}}Default link text color{{/i}}
@linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
+

{{_i}}Grid system{{/i}}

+ + + + + + + + + + + + + + + + + + + +
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
+

{{_i}}Typography{{/i}}

+ + + + + + + + + + + + + + + + +
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
+
+
+

{{_i}}Grayscale colors{{/i}}

+ - + + + + + + + +
@black@black #000
@grayDarker #222
@grayDark #333
@gray #555
@grayLight #999
@grayLighter #eee
@white #fff
-
-

{{_i}}Accent colors{{/i}}

- - - - - - - + + + + + + + - - -
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@blue@blue #049cdb
@green #46a546
@red #9d261d
@yellow #ffc40d
@orange #f89406
@pink #c3325f
@purple #7a43b6
-
-
-
-
-

{{_i}}Grid system{{/i}}

- - - - - - - - - - - - - - - - - - - - - - - - - -
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
-
-
-

{{_i}}Typography{{/i}}

- - - - - - - - - - - - - - - - - - - - +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
@@ -239,6 +217,7 @@ @primaryButtonBackground @linkColor + @@ -248,6 +227,7 @@ @placeholderText @grayLight + @@ -257,26 +237,32 @@ @navbarHeight 40px + @navbarBackground @grayDarker + @navbarBackgroundHighlight @grayDark + @navbarText @grayLight + @navbarLinkColor @grayLight + @navbarLinkColorHover @white + @@ -288,50 +274,42 @@ @warningText #f3edd2 + @warningBackground #c09853 - - - @warningBorder - #f3edd2 + @errorText #b94a48 + @errorBackground #f2dede - - - @errorBorder - #e9c7c7 + @successText #468847 + @successBackground #dff0d8 - - - @successBorder - #cfe8c4 + @infoText #3a87ad + @infoBackground #d9edf7 - - - @infoBorder - #bfe1f2 +