This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Minor commit

  • Loading branch information...
Andy Clarke Andy Clarke
Andy Clarke authored and Andy Clarke committed Jan 6, 2016
1 parent 64ef7dd commit 6f58cc1128edebf11e82a9aea90e0ab48be451a0
Showing with 42 additions and 14 deletions.
  1. +1 −1 css/320andup.css
  2. +12 −5 index.html
  3. +12 −5 index.kit
  4. +1 −1 scss/elements/_a.scss
  5. +3 −0 scss/elements/_form-input.scss
  6. +12 −1 scss/elements/_type-paragraph.scss
  7. +1 −1 scss/layout/_layout-pattern.scss
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -302,7 +302,7 @@ <h1 class="pattern__page__header">Complementary typography</h1>
<div class="pattern-col-all">
<div class="pattern-col pattern-col1">
<p class="milli">Regular</p>
-</div>
+</div><!-- pattern-col -->
<div class="pattern-col pattern-col2-col3">
<p class="secondary" style="text-transform:uppercase;">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
@@ -332,13 +332,20 @@ <h1 class="pattern__page__header">Complementary typography</h1>
<div class="pattern-col-all">
<div class="pattern-col pattern-col1">
<p class="milli">Columns</p>
-</div>
-
-<div class="pattern-col pattern-col2-col3 columns">
-<p class="tertiary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
</div><!-- pattern-col -->
</div><!-- col-all -->
+<div class="pattern-col-all">
+
+<div class="columns">
+<p class="secondary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+<p class="secondary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+<p class="secondary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+<p class="secondary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+</div><!-- columns -->
+
+</div><!-- col-all -->
+
</section><!-- pattern__page -->
View
@@ -265,7 +265,7 @@
<div class="pattern-col-all">
<div class="pattern-col pattern-col1">
<p class="milli">Regular</p>
-</div>
+</div><!-- pattern-col -->
<div class="pattern-col pattern-col2-col3">
<p class="secondary" style="text-transform:uppercase;"><!-- $pattern-example-short --></p>
@@ -295,13 +295,20 @@
<div class="pattern-col-all">
<div class="pattern-col pattern-col1">
<p class="milli">Columns</p>
-</div>
-
-<div class="pattern-col pattern-col2-col3 columns">
-<p class="tertiary"><!-- $pattern-example-short --> <!-- $pattern-example-short --> <!-- $pattern-example-short --></p>
</div><!-- pattern-col -->
</div><!-- col-all -->
+<div class="pattern-col-all">
+
+<div class="columns">
+<p class="secondary"><!-- $pattern-example-short --> <!-- $pattern-example-short --></p>
+<p class="secondary"><!-- $pattern-example-short --> <!-- $pattern-example-short --></p>
+<p class="secondary"><!-- $pattern-example-short --> <!-- $pattern-example-short --></p>
+<p class="secondary"><!-- $pattern-example-short --> <!-- $pattern-example-short --></p>
+</div><!-- columns -->
+
+</div><!-- col-all -->
+
</section><!-- pattern__page -->
View
@@ -4,7 +4,7 @@ a {
background : linear-gradient($color-neutral, $color-neutral) no-repeat;
background-size : 100% 1px;
background-position : 0 1.02em;
- text-shadow : .05em 0 $body-background, -.05em 0 $body-background;
+ text-shadow : .075em 0 $body-background, -.075em 0 $body-background;
&:visited {
color : $link-color-visited; }
@@ -1,4 +1,5 @@
.form-control {
+ -moz-appearance : none;
-webkit-appearance : none;
display : block;
width : 100%;
@@ -54,6 +55,8 @@ textarea.form-control {
resize-x : none; }
select.form-control {
+ -moz-appearance : menulist;
+ -webkit-appearance : menulist;
margin-bottom : $vertical-spacing;
width : auto;
max-width : 100%; }
@@ -44,14 +44,25 @@ p {
.columns {
@include bp(bp4) {
- column-width : 24rem;
+ column-count : 2;
column-gap : ($gutter * 2); }
p {
@include bp(bp4) {
+ margin-bottom : 0;
+ display : inline-block;
hyphens : auto;
hyphenate-limit-chars : 3;
hyphenate-limit-lines : 4;
text-align : justify; }
}
+
+p + p {
+@include bp(bp4) {
+ text-indent : ($gutter * 2); }
+}
+
+p:last-child:after {
+ content : " \00B6";
+ @include font-size(10); }
}
@@ -1,7 +1,7 @@
.pattern__container {
-@include bp(bp7) {
+@include bp(bp6) {
display : flex;
flex-wrap : wrap; }
}

0 comments on commit 6f58cc1

Please sign in to comment.