Merge remote-tracking branch 'refs/remotes/rhyneav/master'

This commit is contained in:
Fraham 2017-11-01 14:30:13 +00:00
commit 2efe012411
2 changed files with 33 additions and 6 deletions

View file

@ -246,10 +246,10 @@
</div>
<fieldset class="form-group">
<legend>Some Radio Buttons</legend>
<label for="paperRadios1" class="paper-radio">
<label for="paperRadios1" class="paper-radio">
<input type="radio" name="paperRadios" id="paperRadios1" value="option 1"> <span>This is the first option<span>
</label>
<label for="paperRadios2" class="paper-radio">
<label for="paperRadios2" class="paper-radio">
<input type="radio" name="paperRadios" id="paperRadios2" value="option 2"> <span>This is the second option<span>
</label>
</fieldset>
@ -292,10 +292,10 @@
&lt;/div&gt;
&lt;fieldset class="form-group"&gt;
&lt;legend&gt;Some Radio Buttons&lt;/legend&gt;
&lt;label for="paperRadios1" class="paper-radio"&gt;
&lt;label for="paperRadios1" class="paper-radio"&gt;
&lt;input type="radio" name="paperRadios" id="paperRadios1" value="option 1"&gt; &lt;span&gt;This is the first option&lt;span&gt;
&lt;/label&gt;
&lt;label for="paperRadios2" class="paper-radio"&gt;
&lt;label for="paperRadios2" class="paper-radio"&gt;
&lt;input type="radio" name="paperRadios" id="paperRadios2" value="option 2"&gt; &lt;span&gt;This is the second option&lt;span&gt;
&lt;/label&gt;
&lt;/fieldset&gt;
@ -661,7 +661,7 @@ function add(x, y) {
&lt;div class="sm-2 col border border-warning"&gt;Border warning&lt;/div&gt;
&lt;div class="sm-2 col border border-danger"&gt;Border danger&lt;/div&gt;
&lt;div class="sm-2 col border background-primary border-white"&gt;Border white&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;div class="row child-borders"&gt;
&lt;div class="sm-2 col border border-primary"&gt;Border primary&lt;/div&gt;
&lt;div class="sm-2 col border border-secondary"&gt;Border secondary&lt;/div&gt;
@ -690,6 +690,22 @@ function add(x, y) {
&lt;div class="sm-2 col"&gt;4&lt;/div&gt;
&lt;div class="sm-2 col"&gt;5&lt;/div&gt;
&lt;div class="sm-2 col"&gt;6&lt;/div&gt;
&lt;/div&gt;</pre>
</div>
<h4>Border Styles</h4>
<div class="row flex-spaces child-borders">
<div class="sm-3 col border-dashed">Dashed</div>
<div class="sm-3 col border-dotted">Dotted</div>
<div class="sm-3 col border-dashed border-thick">Dashed Thick</div>
<div class="sm-3 col border-dotted border-thick">Dotted Thick</div>
</div>
<div class="docs">
<pre>
&lt;div class="row flex-spaces child-borders"&gt;
&lt;div class="sm-3 col border-dashed"&gt;Dashed&lt;/div&gt;
&lt;div class="sm-3 col border-dotted"&gt;Dotted&lt;/div&gt;
&lt;div class="sm-3 col border-dashed border-thick"&gt;Dashed Thick&lt;/div&gt;
&lt;div class="sm-3 col border-dotted border-thick"&gt;Dotted Thick&lt;/div&gt;
&lt;/div&gt;</pre>
</div>
<h4>Shadows</h4>

View file

@ -1,5 +1,7 @@
.border, .border-1, .child-borders > *:nth-child(6n+1) {
.border {
border: 2px solid @primary;
}
.border, .border-1, .child-borders > *:nth-child(6n+1) {
border-top-left-radius: 255px 15px;
border-top-right-radius: 15px 225px;
border-bottom-right-radius: 225px 15px;
@ -55,4 +57,13 @@
}
.border-white {
border-color: #FFF;
}
.border-dotted {
border-style: dotted;
}
.border-dashed {
border-style: dashed;
}
.border-thick {
border-width: 5px;
}