Skip to content

Commit 21b60d9

Browse files
Fix light alert colors (from upstream)
1 parent 232ce9e commit 21b60d9

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

index.html

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ <h1 class="display-3">Welcome!</h1>
5252
<div class="col-sm-6">
5353
<h2>Installation</h2>
5454
<p>Recommended for modern web applications.</p>
55-
<pre><code>$ npm install csh-material-bootstrap@4.0.0-beta.3</code></pre>
55+
<pre><code>$ npm install csh-material-bootstrap@4.0.0</code></pre>
5656
</div>
5757
<div class="col-sm-6">
5858
<h2>CDN</h2>
5959
<p>Use CSH Material Bootstrap without a package manager.</p>
6060

6161
<h5>CSS</h5>
62-
<pre><code>&lt;link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.0.0-beta.3/dist/csh-material-bootstrap.min.css" media="screen"&gt;</code></pre>
62+
<pre><code>&lt;link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.0.0/dist/csh-material-bootstrap.min.css" media="screen"&gt;</code></pre>
6363

6464
<h5>JS, Popper.js, and jQuery</h5>
6565
<p>Required for most interactive functionality, unless using an alternative implementation such as <a href="http://reactstrap.github.io" rel="nofollow">Reactstrap</a>.</p>
6666
<pre><code>&lt;script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"&gt;&lt;/script&gt;
6767
&lt;script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"&gt;&lt;/script&gt;
68-
&lt;script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.3/js/bootstrap.min.js" integrity="sha384-a5N7Y/aK3qNeh15eJKGWxsqtnX/wWdSZSKp+81YjTmS15nvnvxKHuzaWwXHDli+4" crossorigin="anonymous"&gt;&lt;/script&gt;</code></pre>
68+
&lt;script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"&gt;&lt;/script&gt;</code></pre>
6969
</div>
7070
</div>
7171
</div>
@@ -821,7 +821,7 @@ <h2 id="nav-tabs">Tabs</h2>
821821
<p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
822822
</div>
823823
<div class="tab-pane fade" id="profile">
824-
<p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit.</p>
824+
<p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit.</p>
825825
</div>
826826
<div class="tab-pane fade" id="dropdown1">
827827
<p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork.</p>
@@ -1040,6 +1040,32 @@ <h4 class="alert-heading">Warning!</h4>
10401040
</div>
10411041
</div>
10421042
</div>
1043+
<div class="row">
1044+
<div class="col-lg-4">
1045+
<div class="bs-component">
1046+
<div class="alert alert-dismissible alert-primary">
1047+
<button type="button" class="close" data-dismiss="alert">&times;</button>
1048+
<strong>Oh snap!</strong> <a href="#" class="alert-link">Change a few things up</a> and try submitting again.
1049+
</div>
1050+
</div>
1051+
</div>
1052+
<div class="col-lg-4">
1053+
<div class="bs-component">
1054+
<div class="alert alert-dismissible alert-secondary">
1055+
<button type="button" class="close" data-dismiss="alert">&times;</button>
1056+
<strong>Well done!</strong> You successfully read <a href="#" class="alert-link">this important alert message</a>.
1057+
</div>
1058+
</div>
1059+
</div>
1060+
<div class="col-lg-4">
1061+
<div class="bs-component">
1062+
<div class="alert alert-dismissible alert-light">
1063+
<button type="button" class="close" data-dismiss="alert">&times;</button>
1064+
<strong>Heads up!</strong> This <a href="#" class="alert-link">alert needs your attention</a>, but it's not super important.
1065+
</div>
1066+
</div>
1067+
</div>
1068+
</div>
10431069
<div>
10441070
<h2>Badges</h2>
10451071
<div class="bs-component" style="margin-bottom: 40px;">
@@ -1481,7 +1507,7 @@ <h4 class="modal-title">Source Code</h4>
14811507

14821508
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
14831509
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
1484-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.3/js/bootstrap.min.js" integrity="sha384-a5N7Y/aK3qNeh15eJKGWxsqtnX/wWdSZSKp+81YjTmS15nvnvxKHuzaWwXHDli+4" crossorigin="anonymous"></script>
1510+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-a5N7Y/aK3qNeh15eJKGWxsqtnX/wWdSZSKp+81YjTmS15nvnvxKHuzaWwXHDli+4" crossorigin="anonymous"></script>
14851511
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
14861512
<script>
14871513
(function(){
@@ -1533,7 +1559,7 @@ <h4 class="modal-title">Source Code</h4>
15331559
lines.splice(-1, 1);
15341560

15351561
var indentSize = lines[0].length - lines[0].trim().length,
1536-
re = new RegExp(" {" + indentSize + "}");
1562+
re = new RegExp(" {" indentSize "}");
15371563

15381564
lines = lines.map(function(line){
15391565
if (line.match(re)) {

src/csh-material-bootstrap.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ input[type="checkbox"],
628628
}
629629
}
630630

631-
a:not(.close):not(.btn),
631+
a:not(.btn),
632632
.alert-link {
633633
color: #fff;
634634
font-weight: bold;
@@ -637,6 +637,15 @@ input[type="checkbox"],
637637
.close {
638638
color: #fff;
639639
}
640+
641+
&-secondary,
642+
&-light {
643+
&,
644+
& a:not(.btn),
645+
& .alert-link {
646+
color: $body-color;
647+
}
648+
}
640649
}
641650

642651
.badge {

0 commit comments

Comments
 (0)