From 1e91bc2119d19f96b6e5ff8187d032692b5780e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 2 Jul 2017 15:28:51 -0700 Subject: more syntax changes --- docs/assets/less/featurettes.less | 4 +- docs/assets/less/footer.less | 2 +- docs/assets/less/glyphicons.less | 2 +- docs/assets/less/ie10-viewport-bug-workaround.less | 7 +- docs/assets/less/masthead.less | 15 +-- docs/assets/less/page-header.less | 4 +- docs/assets/less/responsive-tests.less | 12 +- docs/assets/less/sidebar.less | 30 ++--- docs/assets/less/skip-link.less | 7 -- docs/assets/less/swatches.less | 4 +- docs/assets/less/syntax.less | 123 ++++++++++----------- docs/assets/less/zero-clipboard.less | 2 +- 12 files changed, 95 insertions(+), 117 deletions(-) (limited to 'docs/assets/less') diff --git a/docs/assets/less/featurettes.less b/docs/assets/less/featurettes.less index caeb86ffc5..7df3e94d54 100644 --- a/docs/assets/less/featurettes.less +++ b/docs/assets/less/featurettes.less @@ -42,12 +42,12 @@ margin-bottom: 15px; } -@media (min-width: 480px) { +@media (min-width: @screen-xs-min) { .bs-docs-featurette .img-responsive { margin-top: 30px; } } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .bs-docs-featurette { padding-top: 100px; padding-bottom: 100px; diff --git a/docs/assets/less/footer.less b/docs/assets/less/footer.less index 8d9e33c1c7..715aadb2af 100644 --- a/docs/assets/less/footer.less +++ b/docs/assets/less/footer.less @@ -20,7 +20,7 @@ margin-left: 15px; } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .bs-docs-footer { text-align: left; } diff --git a/docs/assets/less/glyphicons.less b/docs/assets/less/glyphicons.less index 841e1e244c..b75a7f25ee 100644 --- a/docs/assets/less/glyphicons.less +++ b/docs/assets/less/glyphicons.less @@ -25,7 +25,7 @@ .bs-glyphicons .glyphicon-class { display: block; text-align: center; - word-wrap: break-word; /* Help out IE10+ with class names */ + word-wrap: break-word; // Help out IE10+ with class names } .bs-glyphicons li:hover { color: #fff; diff --git a/docs/assets/less/ie10-viewport-bug-workaround.less b/docs/assets/less/ie10-viewport-bug-workaround.less index 4b9518e218..6ac824f93f 100644 --- a/docs/assets/less/ie10-viewport-bug-workaround.less +++ b/docs/assets/less/ie10-viewport-bug-workaround.less @@ -4,10 +4,9 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -/* - * See the Getting Started docs for more information: - * http://getbootstrap.com/getting-started/#support-ie10-width - */ +// See the Getting Started docs for more information: +// http://getbootstrap.com/getting-started/#support-ie10-width + @-ms-viewport { width: device-width; } @-o-viewport { width: device-width; } @viewport { width: device-width; } diff --git a/docs/assets/less/masthead.less b/docs/assets/less/masthead.less index b36d170e0d..20c9a2671d 100644 --- a/docs/assets/less/masthead.less +++ b/docs/assets/less/masthead.less @@ -1,10 +1,3 @@ -/* - * Homepage - * - * Tweaks to the custom homepage and the masthead (main jumbotron). - */ - -/* Share masthead with page headers */ .bs-docs-masthead, .bs-docs-header { position: relative; @@ -21,7 +14,7 @@ background-repeat: repeat-x; } -/* Masthead (headings and download button) */ +// Masthead (headings and download button) .bs-docs-masthead .bs-docs-booticon { margin: 0 auto 30px; } @@ -46,13 +39,13 @@ font-size: 20px; } -@media (min-width: 480px) { +@media (min-width: @screen-xs-min) { .bs-docs-masthead .btn { width: auto; } } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .bs-docs-masthead { padding: 80px 0; } @@ -64,7 +57,7 @@ } } -@media (min-width: 992px) { +@media (min-width: @screen-md-min) { .bs-docs-masthead .lead { width: 80%; font-size: 30px; diff --git a/docs/assets/less/page-header.less b/docs/assets/less/page-header.less index 33900f3342..75393ead0b 100644 --- a/docs/assets/less/page-header.less +++ b/docs/assets/less/page-header.less @@ -15,7 +15,7 @@ position: relative; } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .bs-docs-header { padding-top: 60px; padding-bottom: 60px; @@ -28,7 +28,7 @@ } } -@media (min-width: 992px) { +@media (min-width: @screen-md-min) { .bs-docs-header h1, .bs-docs-header p { margin-right: 380px; diff --git a/docs/assets/less/responsive-tests.less b/docs/assets/less/responsive-tests.less index a5c61a1039..bf9d002d2b 100644 --- a/docs/assets/less/responsive-tests.less +++ b/docs/assets/less/responsive-tests.less @@ -1,15 +1,9 @@ -/* - * Responsive tests - * - * Generate a set of tests to show the responsive utilities in action. - */ - -/* Responsive (scrollable) doc tables */ +// Responsive (scrollable) doc tables .table-responsive .highlight pre { white-space: normal; } -/* Utility classes table */ +// Utility classes table .bs-table th small, .responsive-utilities th small { display: block; @@ -31,7 +25,7 @@ background-color: #f9f9f9 !important; } -/* Responsive tests */ +// Responsive tests .responsive-utilities-test { margin-top: 5px; } diff --git a/docs/assets/less/sidebar.less b/docs/assets/less/sidebar.less index 61d1c36101..93932128b2 100644 --- a/docs/assets/less/sidebar.less +++ b/docs/assets/less/sidebar.less @@ -1,20 +1,20 @@ -/* By default it's not affixed in mobile views, so undo that */ +// By default it's not affixed in mobile views, so undo that .bs-docs-sidebar.affix { position: static; } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .bs-docs-sidebar { padding-left: 20px; } } -/* First level of nav */ +// First level of nav .bs-docs-sidenav { margin-top: 20px; margin-bottom: 20px; } -/* All levels of nav */ +// All levels of nav .bs-docs-sidebar .nav > li > a { display: block; padding: 4px 20px; @@ -40,9 +40,9 @@ border-left: 2px solid #563d7c; } -/* Nav: second level (shown on .active) */ +// Nav: second level (shown on .active) .bs-docs-sidebar .nav .nav { - display: none; /* Hide by default, but at >768px, show it */ + display: none; // Hide by default, but at >768px, show it padding-bottom: 10px; } .bs-docs-sidebar .nav .nav > li > a { @@ -63,7 +63,7 @@ font-weight: 500; } -/* Back to top (hidden on mobile) */ +// Back to top (hidden on mobile) .back-to-top, .bs-docs-theme-toggle { display: none; @@ -83,29 +83,29 @@ margin-top: 0; } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .back-to-top, .bs-docs-theme-toggle { display: block; } } -/* Show and affix the side nav when space allows it */ -@media (min-width: 992px) { +// Show and affix the side nav when space allows it +@media (min-width: @screen-md-min) { .bs-docs-sidebar .nav > .active > ul { display: block; } - /* Widen the fixed sidebar */ + // Widen the fixed sidebar .bs-docs-sidebar.affix, .bs-docs-sidebar.affix-bottom { width: 213px; } .bs-docs-sidebar.affix { - position: fixed; /* Undo the static from mobile first approach */ + position: fixed; // Undo the static from mobile first approach top: 20px; } .bs-docs-sidebar.affix-bottom { - position: absolute; /* Undo the static from mobile first approach */ + position: absolute; // Undo the static from mobile first approach } .bs-docs-sidebar.affix-bottom .bs-docs-sidenav, .bs-docs-sidebar.affix .bs-docs-sidenav { @@ -113,8 +113,8 @@ margin-bottom: 0; } } -@media (min-width: 1200px) { - /* Widen the fixed sidebar again */ +@media (min-width: @screen-lg-min) { + // Widen the fixed sidebar again .bs-docs-sidebar.affix-bottom, .bs-docs-sidebar.affix { width: 263px; diff --git a/docs/assets/less/skip-link.less b/docs/assets/less/skip-link.less index 7085e3f5c6..174a64fe08 100644 --- a/docs/assets/less/skip-link.less +++ b/docs/assets/less/skip-link.less @@ -1,10 +1,3 @@ -/* - * Fancy skip link - * - * Make it look a bit less "bare bones" - * Also includes focus suppression for the Chrome tabindex="-1" workaround - */ - #skippy { display: block; padding: 1em; diff --git a/docs/assets/less/swatches.less b/docs/assets/less/swatches.less index 1d23e1e135..f7f461193a 100644 --- a/docs/assets/less/swatches.less +++ b/docs/assets/less/swatches.less @@ -17,7 +17,7 @@ } } -/* Framework colors */ +// Framework colors .color-swatches .gray-darker { background-color: #222; } @@ -49,7 +49,7 @@ background-color: #5bc0de; } -/* Docs colors */ +// Docs colors .color-swatches .bs-purple { background-color: #563d7c; } diff --git a/docs/assets/less/syntax.less b/docs/assets/less/syntax.less index 37ffb104af..ab8cc60342 100644 --- a/docs/assets/less/syntax.less +++ b/docs/assets/less/syntax.less @@ -1,65 +1,64 @@ .hll { background-color: #ffffcc } - /*{ background: #f0f3f3; }*/ -.c { color: #999; } /* Comment */ -.err { color: #AA0000; background-color: #FFAAAA } /* Error */ -.k { color: #006699; } /* Keyword */ -.o { color: #555555 } /* Operator */ -.cm { color: #999; } /* Comment.Multiline */ /* Edited to remove italics and make into comment */ -.cp { color: #009999 } /* Comment.Preproc */ -.c1 { color: #999; } /* Comment.Single */ -.cs { color: #999; } /* Comment.Special */ -.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } /* Generic.Deleted */ -.ge { font-style: italic } /* Generic.Emph */ -.gr { color: #FF0000 } /* Generic.Error */ -.gh { color: #003300; } /* Generic.Heading */ -.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } /* Generic.Inserted */ -.go { color: #AAAAAA } /* Generic.Output */ -.gp { color: #000099; } /* Generic.Prompt */ -.gs { } /* Generic.Strong */ -.gu { color: #003300; } /* Generic.Subheading */ -.gt { color: #99CC66 } /* Generic.Traceback */ -.kc { color: #006699; } /* Keyword.Constant */ -.kd { color: #006699; } /* Keyword.Declaration */ -.kn { color: #006699; } /* Keyword.Namespace */ -.kp { color: #006699 } /* Keyword.Pseudo */ -.kr { color: #006699; } /* Keyword.Reserved */ -.kt { color: #007788; } /* Keyword.Type */ -.m { color: #FF6600 } /* Literal.Number */ -.s { color: #d44950 } /* Literal.String */ -.na { color: #4f9fcf } /* Name.Attribute */ -.nb { color: #336666 } /* Name.Builtin */ -.nc { color: #00AA88; } /* Name.Class */ -.no { color: #336600 } /* Name.Constant */ -.nd { color: #9999FF } /* Name.Decorator */ -.ni { color: #999999; } /* Name.Entity */ -.ne { color: #CC0000; } /* Name.Exception */ -.nf { color: #CC00FF } /* Name.Function */ -.nl { color: #9999FF } /* Name.Label */ -.nn { color: #00CCFF; } /* Name.Namespace */ -.nt { color: #2f6f9f; } /* Name.Tag */ -.nv { color: #003333 } /* Name.Variable */ -.ow { color: #000000; } /* Operator.Word */ -.w { color: #bbbbbb } /* Text.Whitespace */ -.mf { color: #FF6600 } /* Literal.Number.Float */ -.mh { color: #FF6600 } /* Literal.Number.Hex */ -.mi { color: #FF6600 } /* Literal.Number.Integer */ -.mo { color: #FF6600 } /* Literal.Number.Oct */ -.sb { color: #CC3300 } /* Literal.String.Backtick */ -.sc { color: #CC3300 } /* Literal.String.Char */ -.sd { color: #CC3300; font-style: italic } /* Literal.String.Doc */ -.s2 { color: #CC3300 } /* Literal.String.Double */ -.se { color: #CC3300; } /* Literal.String.Escape */ -.sh { color: #CC3300 } /* Literal.String.Heredoc */ -.si { color: #AA0000 } /* Literal.String.Interpol */ -.sx { color: #CC3300 } /* Literal.String.Other */ -.sr { color: #33AAAA } /* Literal.String.Regex */ -.s1 { color: #CC3300 } /* Literal.String.Single */ -.ss { color: #FFCC33 } /* Literal.String.Symbol */ -.bp { color: #336666 } /* Name.Builtin.Pseudo */ -.vc { color: #003333 } /* Name.Variable.Class */ -.vg { color: #003333 } /* Name.Variable.Global */ -.vi { color: #003333 } /* Name.Variable.Instance */ -.il { color: #FF6600 } /* Literal.Number.Integer.Long */ +.c { color: #999; } +.err { color: #AA0000; background-color: #FFAAAA } +.k { color: #006699; } +.o { color: #555555 } +.cm { color: #999; } +.cp { color: #009999 } +.c1 { color: #999; } +.cs { color: #999; } +.gd { background-color: #FFCCCC; border: 1px solid #CC0000 } +.ge { font-style: italic } +.gr { color: #FF0000 } +.gh { color: #003300; } +.gi { background-color: #CCFFCC; border: 1px solid #00CC00 } +.go { color: #AAAAAA } +.gp { color: #000099; } +.gs { } +.gu { color: #003300; } +.gt { color: #99CC66 } +.kc { color: #006699; } +.kd { color: #006699; } +.kn { color: #006699; } +.kp { color: #006699 } +.kr { color: #006699; } +.kt { color: #007788; } +.m { color: #FF6600 } +.s { color: #d44950 } +.na { color: #4f9fcf } +.nb { color: #336666 } +.nc { color: #00AA88; } +.no { color: #336600 } +.nd { color: #9999FF } +.ni { color: #999999; } +.ne { color: #CC0000; } +.nf { color: #CC00FF } +.nl { color: #9999FF } +.nn { color: #00CCFF; } +.nt { color: #2f6f9f; } +.nv { color: #003333 } +.ow { color: #000000; } +.w { color: #bbbbbb } +.mf { color: #FF6600 } +.mh { color: #FF6600 } +.mi { color: #FF6600 } +.mo { color: #FF6600 } +.sb { color: #CC3300 } +.sc { color: #CC3300 } +.sd { color: #CC3300; font-style: italic } +.s2 { color: #CC3300 } +.se { color: #CC3300; } +.sh { color: #CC3300 } +.si { color: #AA0000 } +.sx { color: #CC3300 } +.sr { color: #33AAAA } +.s1 { color: #CC3300 } +.ss { color: #FFCC33 } +.bp { color: #336666 } +.vc { color: #003333 } +.vg { color: #003333 } +.vi { color: #003333 } +.il { color: #FF6600 } .css .o, .css .o + .nt, @@ -88,7 +87,7 @@ } .highlight pre code { font-size: inherit; - color: #333; /* Effectively the base text color */ + color: #333; // Effectively the base text color } .highlight pre code:first-child { display: inline-block; diff --git a/docs/assets/less/zero-clipboard.less b/docs/assets/less/zero-clipboard.less index 2a12503936..13cfb149b2 100644 --- a/docs/assets/less/zero-clipboard.less +++ b/docs/assets/less/zero-clipboard.less @@ -22,7 +22,7 @@ border-color: #563d7c; } -@media (min-width: 768px) { +@media (min-width: @screen-sm-min) { .zero-clipboard { display: block; } -- cgit v1.2.3