Browse Source

Merge pull request #33 from owenversteeg/port_less_to_sass_round2

pull over latest Less styling updates to the Sass directory as well as ABCSSifying the Less files and converting input to forms.scss
Scott O'Hara 11 years ago
parent
commit
f623aa6d75
8 changed files with 35 additions and 34 deletions
  1. 4 4
      less/general.less
  2. 3 2
      less/inputs.less
  3. 10 10
      less/navbar.less
  4. 6 6
      sass/_forms.scss
  5. 8 8
      sass/_general.scss
  6. 1 1
      sass/_grid.scss
  7. 1 1
      sass/_table.scss
  8. 2 2
      sass/min-master.scss

+ 4 - 4
less/general.less

@@ -1,8 +1,8 @@
 body, textarea, input {
 body, textarea, input {
+	background: 0;
+	border-radius: 0;
 	font: 16px sans-serif;
 	font: 16px sans-serif;
 	margin: 0;
 	margin: 0;
-	border-radius: 0;
-	background: 0;
 }
 }
 
 
 .smooth {
 .smooth {
@@ -24,13 +24,13 @@ body, textarea, input {
 
 
 @media(min-width:1310px) {
 @media(min-width:1310px) {
 	.container {
 	.container {
-		width: 1270px;
 		margin: auto;
 		margin: auto;
+		width: 1270px;
 	}
 	}
 }
 }
 
 
 label > * {
 label > * {
-	display:inline
+	display:inline;
 }
 }
 
 
 form > * {
 form > * {

+ 3 - 2
less/inputs.less

@@ -5,17 +5,18 @@ textarea, input, .addon-front, .btn-sm, .nav a {
 textarea, input {
 textarea, input {
 	border: 1px solid #ccc;
 	border: 1px solid #ccc;
 	padding: 8px;
 	padding: 8px;
+
 	&:focus {
 	&:focus {
 		border-color: #5ab;
 		border-color: #5ab;
 	}
 	}
 }
 }
 
 
 textarea, input[type='text'] {
 textarea, input[type='text'] {
-	width: 13em;
 	-webkit-appearance: none; /* make iOS inputs pretty */
 	-webkit-appearance: none; /* make iOS inputs pretty */
+	width: 13em;
 }
 }
 
 
 .addon-front {
 .addon-front {
-	padding: 8px 12px;
 	box-shadow: 0 0 0 1px #ccc;
 	box-shadow: 0 0 0 1px #ccc;
+	padding: 8px 12px;
 }
 }

+ 10 - 10
less/navbar.less

@@ -13,18 +13,18 @@
 }
 }
 
 
 .nav a {
 .nav a {
-	padding-right: 1em;
 	color: #aaa;
 	color: #aaa;
-	top: -1px;
+	padding-right: 1em;
 	position: relative;
 	position: relative;
+	top: -1px;
 }
 }
 
 
 .btn.btn-close {
 .btn.btn-close {
 	background: #000;
 	background: #000;
-	visibility: hidden;
 	float: right;
 	float: right;
-	margin-top: -54px;
 	font-size: 25px;
 	font-size: 25px;
+	margin-top: -54px;
+	visibility: hidden;
 }
 }
 
 
 .nav .pagename {
 .nav .pagename {
@@ -44,27 +44,27 @@
 		margin-top: -11px;
 		margin-top: -11px;
 	}
 	}
 	.nav:focus {
 	.nav:focus {
+		height: auto;
 		/* Necesary for animations
 		/* Necesary for animations
 		max-height: 500px;
 		max-height: 500px;
 		height: 100%;
 		height: 100%;
 		*/
 		*/
-		height: auto;
 	}
 	}
 	.nav div:before {
 	.nav div:before {
-		content: '';
-		border-top: 3px solid;
+		background: #000;
 		border-bottom: 10px double;
 		border-bottom: 10px double;
+		border-top: 3px solid;
+		content: '';
 		float: right;
 		float: right;
 		height: 4px;
 		height: 4px;
+		position: relative;
 		right: 3px;
 		right: 3px;
 		top: 14px;
 		top: 14px;
 		width: 20px;
 		width: 20px;
-		position: relative;
-		background: #000;
 	}
 	}
 	.nav a {
 	.nav a {
+		display: block;
 		padding: .5em 0;
 		padding: .5em 0;
 		width: 50%;
 		width: 50%;
-		display: block;
 	}
 	}
 }
 }

+ 6 - 6
sass/_inputs.scss → sass/_forms.scss

@@ -1,17 +1,17 @@
-@if $import-inputs == true {
+@if $import-forms == true {
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
-//  Inputs
+//  Form Elements
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 
 
-label > * {
-  display: inline;
-}
-
 form > * {
 form > * {
   display: block;
   display: block;
   margin-bottom: 10px;
   margin-bottom: 10px;
 }
 }
 
 
+label > * {
+  display: inline;
+}
+
 input, textarea {
 input, textarea {
   @extend %shared-font-size;
   @extend %shared-font-size;
   border: 1px solid $c-grey;
   border: 1px solid $c-grey;

+ 8 - 8
sass/_general.scss

@@ -4,28 +4,28 @@
 
 
 body,
 body,
 textarea, input {
 textarea, input {
+  background: 0;
+  border-radius: 0;
   font: 16px sans-serif;
   font: 16px sans-serif;
   margin: 0;
   margin: 0;
-  border-radius: 0;
 }
 }
 
 
 * {
 * {
   outline: 0;
   outline: 0;
 }
 }
 
 
-
 // apply a smooth transition effect to an element's state change
 // apply a smooth transition effect to an element's state change
 .smooth {
 .smooth {
   transition: all .2s;
   transition: all .2s;
 }
 }
 
 
 .container {
 .container {
-  margin: auto;
-  width: 1270px;
+  margin: 0 20px;
+  width: auto;
 
 
-  @media(max-width:1310px) {
-    margin: 0 20px;
-    width: auto;
+  @media(min-width:1310px) {
+    margin: auto;
+    width: 1270px;
   }
   }
 }
 }
 
 
@@ -41,5 +41,5 @@ textarea, input {
 
 
 // shared smaller text size
 // shared smaller text size
 %shared-font-size {
 %shared-font-size {
-  font-size: .9em;
+  font-size: 14px;
 }
 }

+ 1 - 1
sass/_grid.scss

@@ -8,7 +8,7 @@
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 
 
 .row {
 .row {
-  margin-top: 2%;
+  margin: 1% 0;
   overflow: auto; // needed for proper formed layout
   overflow: auto; // needed for proper formed layout
 }
 }
 
 

+ 1 - 1
sass/_table.scss

@@ -12,7 +12,7 @@
   }
   }
 
 
   tbody>*:nth-child(2n-1) {
   tbody>*:nth-child(2n-1) {
-    background: $c-grey; // Shade every other table row
+    background: $c-grey;
     // We use tbody to ensure that we don't shade the heading
     // We use tbody to ensure that we don't shade the heading
     // this preserves the order of the shading
     // this preserves the order of the shading
   }
   }

+ 2 - 2
sass/min-master.scss

@@ -17,7 +17,7 @@ $import-headings:                         true!default;
 
 
 $import-buttons:                          true!default;
 $import-buttons:                          true!default;
 
 
-$import-inputs:                           true!default;
+$import-forms:                            true!default;
 
 
 $import-navbar:                           true!default;
 $import-navbar:                           true!default;
 
 
@@ -40,7 +40,7 @@ $import-ie-hacks:                         false!default;
         'grid',
         'grid',
         'headings',
         'headings',
         'icons',
         'icons',
-        'inputs',
+        'forms',
         'navbar',
         'navbar',
         'table',
         'table',
         'iehacks';
         'iehacks';