misc formatting cleanup in scss files

thoughtbot · Sep 8, 2011 · edd4938 · edd4938
1 parent be155a5
commit edd4938
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 47 deletions.
diff --git a/app/assets/stylesheets/_defaults.scss b/app/assets/stylesheets/_defaults.scss
@@ -10,8 +10,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 /* Success, error & notice boxes for messages and errors. */
-div.error, div.notice, div.success,
+div.error, div.notice, div.success, #flash_failure, #flash_success, #flash_notice {
-#flash_failure, #flash_success, #flash_notice {
   border: 1px solid #ddd;
   -moz-border-radius: 8px;
   -webkit-border-radius: 8px;
@@ -20,39 +19,33 @@ div.error, div.notice, div.success,
   padding: 10px;
 }
 
-div.error,
+div.error, #flash_failure {
-#flash_failure {
   background: #FBE3E4;
   border-color: #FBC2C4;
   color: #D12F19;
 }
 
-div.error a,
+div.error a, #flash_failure a {
-#flash_failure a {
   color: #D12F19;
 }
 
-div.notice,
+div.notice, #flash_notice {
-#flash_notice {
   background: #FFF6BF;
   border-color: #FFD324;
   color: #817134;
 }
 
-div.notice a,
+div.notice a, #flash_notice a {
-#flash_notice a {
   color: #817134;
 }
 
-div.success,
+div.success, #flash_success {
-#flash_success {
   background: #E6EFC2;
   border-color: #C6D880;
   color: #529214;
 }
 
-div.success a,
+div.success a, #flash_success a {
-#flash_success a {
   color: #529214;
 }
 
@@ -92,14 +85,14 @@ hr.space {
 }
 
 /* Hide for both screenreaders and browsers
-   css-discuss.incutio.com/wiki/Screenreader_Visibility */
+css-discuss.incutio.com/wiki/Screenreader_Visibility */
 .hidden {
   display: none;
   visibility: hidden;
 }
 
 /* Hide only visually, but have it available for screenreaders
-   www.webaim.org/techniques/css/invisiblecontent/  &  j.mp/visuallyhidden  */
+www.webaim.org/techniques/css/invisiblecontent/  &  j.mp/visuallyhidden  */
 .visuallyhidden {
   clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
   clip: rect(1px, 1px, 1px, 1px);
@@ -112,8 +105,7 @@ hr.space {
 }
 
 /* >> The Magnificent CLEARFIX: Updated to prevent margin-collapsing on child elements << j.mp/bestclearfix */
-.clearfix:before,
+.clearfix:before, .clearfix:after {
-.clearfix:after {
   content: "\0020";
   display: block;
   height: 0;

diff --git a/app/assets/stylesheets/_forms.scss b/app/assets/stylesheets/_forms.scss
@@ -1,9 +1,9 @@
 /* Forms */
 
 /*
- * Remove inner padding and border in FF3/4
+* Remove inner padding and border in FF3/4
- * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
+* www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
- */
+*/
 input[type="submit"]::-moz-focus-inner {
   border: 0;
   padding: 0;
@@ -78,8 +78,7 @@ fieldset {
   padding: 16px 16px 12px 16px;
 }
 
-fieldset fieldset,
+fieldset fieldset, fieldset fieldset fieldset {
-fieldset fieldset fieldset {
   border: 0;
   padding: 0;
 }
@@ -181,15 +180,11 @@ optgroup {
 }
 
 /* Date & Time */
-form ol li.date select,
+form ol li.date select, form ol li.time select, form ol li.datetime select {
-form ol li.time select,
-form ol li.datetime select {
   display: inline;
   width: auto;
 }
 
-form ol li.date ol li,
+form ol li.date ol li, form ol li.time ol li, form ol li.datetime ol li {
-form ol li.time ol li,
-form ol li.datetime ol li {
   display: inline-block;
 }
diff --git a/app/assets/stylesheets/_reset.scss b/app/assets/stylesheets/_reset.scss
@@ -6,18 +6,12 @@ Author: Richard Clark - http://richclarkdesign.com
 Twitter: @rich_clark
 */
 
-html, body, div, span, object, iframe,
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small,
-abbr, address, cite, code,
+strong, sub, sup, var,b, i,dl, dt, dd, ol, ul, li,fieldset, form, label,
-del, dfn, em, img, ins, kbd, q, samp,
+legend,table, caption, tbody, tfoot, thead, tr, th, td,article, aside, canvas,
-small, strong, sub, sup, var,
+details, figcaption, figure, footer, header, hgroup, menu, nav, section,
-b, i,
+summary, time, mark, audio, video {
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
   margin:0;
   padding:0;
   border:0;
@@ -31,8 +25,8 @@ body {
   line-height:1;
 }
 
-article,aside,details,figcaption,figure,
+article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
-footer,header,hgroup,menu,nav,section {
+section {
   display:block;
 }
 
@@ -44,8 +38,7 @@ blockquote, q {
   quotes:none;
 }
 
-blockquote:before, blockquote:after,
+blockquote:before, blockquote:after, q:before, q:after {
-q:before, q:after {
   content:'';
   content:none;
 }

diff --git a/app/assets/stylesheets/_type.scss b/app/assets/stylesheets/_type.scss
@@ -79,8 +79,7 @@ a:hover {
   color: #052246;
 }
 
-a:active,
+a:active, a:focus {
-a:focus {
   color: #1a4882;
 }