Skip to content

Commit af70ac8

Browse files
committed
Tweak parser to ignore empty Less section docstrings; fixes twbs#14878
1 parent c672f9e commit af70ac8

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

docs/_includes/customizer-variables.html

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ <h2 id="buttons">Buttons</h2>
379379
</div>
380380
</div>
381381
<h2 id="forms">Forms</h2>
382-
<p></p>
383382
<div class="row">
384383
<div class="bs-customizer-input">
385384
<label for="input-@input-bg">@input-bg</label>
@@ -653,7 +652,6 @@ <h2 id="container-sizes">Container sizes</h2>
653652
</div>
654653
</div>
655654
<h2 id="navbar">Navbar</h2>
656-
<p></p>
657655
<div class="row">
658656
<div class="bs-customizer-input">
659657
<label for="input-@navbar-height">@navbar-height</label>
@@ -809,7 +807,6 @@ <h2 id="navbar">Navbar</h2>
809807
</div>
810808
</div>
811809
<h2 id="navs">Navs</h2>
812-
<p></p>
813810
<h3 id="shared-nav-styles">Shared nav styles</h3>
814811
<div class="row">
815812
<div class="bs-customizer-input">
@@ -876,7 +873,6 @@ <h2 id="pills">Pills</h2>
876873
</div>
877874
</div>
878875
<h2 id="pagination">Pagination</h2>
879-
<p></p>
880876
<div class="row">
881877
<div class="bs-customizer-input">
882878
<label for="input-@pagination-color">@pagination-color</label>
@@ -928,7 +924,6 @@ <h2 id="pagination">Pagination</h2>
928924
</div>
929925
</div>
930926
<h2 id="pager">Pager</h2>
931-
<p></p>
932927
<div class="row">
933928
<div class="bs-customizer-input">
934929
<label for="input-@pager-bg">@pager-bg</label>
@@ -960,7 +955,6 @@ <h2 id="pager">Pager</h2>
960955
</div>
961956
</div>
962957
<h2 id="jumbotron">Jumbotron</h2>
963-
<p></p>
964958
<div class="row">
965959
<div class="bs-customizer-input">
966960
<label for="input-@jumbotron-padding">@jumbotron-padding</label>
@@ -1036,7 +1030,6 @@ <h2 id="form-states-and-alerts">Form states and alerts</h2>
10361030
</div>
10371031
</div>
10381032
<h2 id="tooltips">Tooltips</h2>
1039-
<p></p>
10401033
<div class="row">
10411034
<div class="bs-customizer-input">
10421035
<label for="input-@tooltip-max-width">@tooltip-max-width</label>
@@ -1069,7 +1062,6 @@ <h2 id="tooltips">Tooltips</h2>
10691062
</div>
10701063
</div>
10711064
<h2 id="popovers">Popovers</h2>
1072-
<p></p>
10731065
<div class="row">
10741066
<div class="bs-customizer-input">
10751067
<label for="input-@popover-bg">@popover-bg</label>
@@ -1123,7 +1115,6 @@ <h2 id="popovers">Popovers</h2>
11231115
</div>
11241116
</div>
11251117
<h2 id="labels">Labels</h2>
1126-
<p></p>
11271118
<div class="row">
11281119
<div class="bs-customizer-input">
11291120
<label for="input-@label-default-bg">@label-default-bg</label>
@@ -1167,7 +1158,6 @@ <h2 id="labels">Labels</h2>
11671158
</div>
11681159
</div>
11691160
<h2 id="modals">Modals</h2>
1170-
<p></p>
11711161
<div class="row">
11721162
<div class="bs-customizer-input">
11731163
<label for="input-@modal-inner-padding">@modal-inner-padding</label>
@@ -1297,7 +1287,6 @@ <h2 id="alerts">Alerts</h2>
12971287
</div>
12981288
</div>
12991289
<h2 id="progress-bars">Progress bars</h2>
1300-
<p></p>
13011290
<div class="row">
13021291
<div class="bs-customizer-input">
13031292
<label for="input-@progress-bg">@progress-bg</label>
@@ -1341,7 +1330,6 @@ <h2 id="progress-bars">Progress bars</h2>
13411330
</div>
13421331
</div>
13431332
<h2 id="list-group">List group</h2>
1344-
<p></p>
13451333
<div class="row">
13461334
<div class="bs-customizer-input">
13471335
<label for="input-@list-group-bg">@list-group-bg</label>
@@ -1412,7 +1400,6 @@ <h2 id="list-group">List group</h2>
14121400
</div>
14131401
</div>
14141402
<h2 id="panels">Panels</h2>
1415-
<p></p>
14161403
<div class="row">
14171404
<div class="bs-customizer-input">
14181405
<label for="input-@panel-bg">@panel-bg</label>
@@ -1517,7 +1504,6 @@ <h2 id="panels">Panels</h2>
15171504
</div>
15181505
</div>
15191506
<h2 id="thumbnails">Thumbnails</h2>
1520-
<p></p>
15211507
<div class="row">
15221508
<div class="bs-customizer-input">
15231509
<label for="input-@thumbnail-padding">@thumbnail-padding</label>
@@ -1551,7 +1537,6 @@ <h2 id="thumbnails">Thumbnails</h2>
15511537
</div>
15521538
</div>
15531539
<h2 id="wells">Wells</h2>
1554-
<p></p>
15551540
<div class="row">
15561541
<div class="bs-customizer-input">
15571542
<label for="input-@well-bg">@well-bg</label>
@@ -1563,7 +1548,6 @@ <h2 id="wells">Wells</h2>
15631548
</div>
15641549
</div>
15651550
<h2 id="badges">Badges</h2>
1566-
<p></p>
15671551
<div class="row">
15681552
<div class="bs-customizer-input">
15691553
<label for="input-@badge-color">@badge-color</label>
@@ -1592,13 +1576,16 @@ <h2 id="badges">Badges</h2>
15921576
<label for="input-@badge-font-weight">@badge-font-weight</label>
15931577
<input id="input-@badge-font-weight" type="text" value="bold" data-var="@badge-font-weight" class="form-control"/>
15941578
</div>
1579+
<div class="bs-customizer-input">
1580+
<label for="input-@badge-line-height">@badge-line-height</label>
1581+
<input id="input-@badge-line-height" type="text" value="1" data-var="@badge-line-height" class="form-control"/>
1582+
</div>
15951583
<div class="bs-customizer-input">
15961584
<label for="input-@badge-border-radius">@badge-border-radius</label>
15971585
<input id="input-@badge-border-radius" type="text" value="10px" data-var="@badge-border-radius" class="form-control"/>
15981586
</div>
15991587
</div>
16001588
<h2 id="breadcrumbs">Breadcrumbs</h2>
1601-
<p></p>
16021589
<div class="row">
16031590
<div class="bs-customizer-input">
16041591
<label for="input-@breadcrumb-padding-vertical">@breadcrumb-padding-vertical</label>
@@ -1630,7 +1617,6 @@ <h2 id="breadcrumbs">Breadcrumbs</h2>
16301617
</div>
16311618
</div>
16321619
<h2 id="carousel">Carousel</h2>
1633-
<p></p>
16341620
<div class="row">
16351621
<div class="bs-customizer-input">
16361622
<label for="input-@carousel-text-shadow">@carousel-text-shadow</label>
@@ -1666,7 +1652,6 @@ <h2 id="carousel">Carousel</h2>
16661652
</div>
16671653
</div>
16681654
<h2 id="close">Close</h2>
1669-
<p></p>
16701655
<div class="row">
16711656
<div class="bs-customizer-input">
16721657
<label for="input-@close-font-weight">@close-font-weight</label>
@@ -1682,7 +1667,6 @@ <h2 id="close">Close</h2>
16821667
</div>
16831668
</div>
16841669
<h2 id="code">Code</h2>
1685-
<p></p>
16861670
<div class="row">
16871671
<div class="bs-customizer-input">
16881672
<label for="input-@code-color">@code-color</label>
@@ -1718,7 +1702,6 @@ <h2 id="code">Code</h2>
17181702
</div>
17191703
</div>
17201704
<h2 id="type">Type</h2>
1721-
<p></p>
17221705
<div class="row">
17231706
<div class="bs-customizer-input">
17241707
<label for="input-@component-offset-horizontal">@component-offset-horizontal</label>

grunt/bs-lessdoc-parser.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ Mini-language:
3333
var CUSTOMIZABLE_HEADING = /^[/]{2}={2}(.*)$/;
3434
var UNCUSTOMIZABLE_HEADING = /^[/]{2}-{2}(.*)$/;
3535
var SUBSECTION_HEADING = /^[/]{2}={3}(.*)$/;
36-
var SECTION_DOCSTRING = /^[/]{2}#{2}(.*)$/;
37-
var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]+);[ ]*$/;
38-
var VAR_DOCSTRING = /^[/]{2}[*]{2}(.*)$/;
36+
var SECTION_DOCSTRING = /^[/]{2}#{2}(.+)$/;
37+
var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]*);[ ]*$/;
38+
var VAR_DOCSTRING = /^[/]{2}[*]{2}(.+)$/;
3939

4040
function Section(heading, customizable) {
4141
this.heading = heading.trim();

0 commit comments

Comments
 (0)