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

@ -690,6 +690,22 @@ function add(x, y) {
<div class="sm-2 col">4</div>
<div class="sm-2 col">5</div>
<div class="sm-2 col">6</div>
&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;
@ -56,3 +58,12 @@
.border-white {
border-color: #FFF;
}
.border-dotted {
border-style: dotted;
}
.border-dashed {
border-style: dashed;
}
.border-thick {
border-width: 5px;
}