Add picture element, general cleanup

thoughtbot · Jul 24, 2014 · 6bdef8f · alexgleason · Aug 25, 2015 · prisis
1 parent 9f1f24e
commit 6bdef8f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 22 deletions.
diff --git a/app/assets/stylesheets/_base.scss b/app/assets/stylesheets/_base.scss
@@ -4,21 +4,21 @@
  * MIT License */
 
 // Variables
-@import 'variables';
+@import "variables";
 
 // Neat Settings -- uncomment if using Neat -- must be imported before Neat
-// @import 'grid-settings';
+// @import "grid-settings";
 
 // Extends
-@import 'extends/button';
+@import "extends/button";
-@import 'extends/clearfix';
+@import "extends/clearfix";
-@import 'extends/errors';
+@import "extends/errors";
-@import 'extends/flashes';
+@import "extends/flashes";
-@import 'extends/hide-text';
+@import "extends/hide-text";
 
 // Typography and Elements
-@import 'typography';
+@import "typography";
-@import 'forms';
+@import "forms";
-@import 'tables';
+@import "tables";
-@import 'lists';
+@import "lists";
-@import 'buttons';
+@import "buttons";
diff --git a/app/assets/stylesheets/_forms.scss b/app/assets/stylesheets/_forms.scss
@@ -60,7 +60,8 @@ input[type="search"] {
   @include appearance(none);
 }
 
-input[type="checkbox"], input[type="radio"] {
+input[type="checkbox"],
+input[type="radio"] {
   display: inline;
   margin-right: $base-spacing / 4;
 }

diff --git a/app/assets/stylesheets/_grid-settings.scss b/app/assets/stylesheets/_grid-settings.scss
@@ -1,4 +1,4 @@
-@import 'neat-helpers'; // or '../neat/neat-helpers' when not in Rails
+@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
 
 // Neat Overrides
 // $column: 90px;

diff --git a/app/assets/stylesheets/_lists.scss b/app/assets/stylesheets/_lists.scss
@@ -1,4 +1,5 @@
-ul, ol {
+ul,
+ol {
   margin: 0;
   padding: 0;
   list-style-type: none;

diff --git a/app/assets/stylesheets/_tables.scss b/app/assets/stylesheets/_tables.scss
@@ -17,6 +17,8 @@ td {
   padding: ($base-spacing / 2) 0;
 }
 
-tr, td, th {
+tr,
+td,
+th {
   vertical-align: middle;
 }
diff --git a/app/assets/stylesheets/_typography.scss b/app/assets/stylesheets/_typography.scss
@@ -7,7 +7,12 @@ body {
   line-height: $base-line-height;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: $header-font-family;
   line-height: $header-line-height;
   margin: 0;
@@ -65,7 +70,8 @@ hr {
   margin: $base-spacing 0;
 }
 
-img {
+img,
+picture {
   margin: 0;
   max-width: 100%;
 }
@@ -82,6 +88,6 @@ cite {
   font-style: italic;
 
   &:before {
-    content: '\2014 \00A0';
+    content: "\2014 \00A0";
   }
 }
diff --git a/app/assets/stylesheets/extends/_button.scss b/app/assets/stylesheets/extends/_button.scss
@@ -7,7 +7,7 @@
   font-size: $base-font-size;
   font-weight: bold;
   line-height: 1;
-  padding: .75em 1em;
+  padding: 0.75em 1em;
   text-decoration: none;
 
   &:hover {

diff --git a/spec/fixtures/application.scss b/spec/fixtures/application.scss
@@ -1,2 +1,2 @@
-@import 'bourbon';
+@import "bourbon";
-@import 'base/base';
+@import "base/base";