Did some cleanup of SCSS

concerto · Jul 10, 2012 · bf0141f · bf0141f
1 parent 99c25aa
commit bf0141f
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 101 deletions.
diff --git a/app/assets/stylesheets/application/common/mixins.scss.erb b/app/assets/stylesheets/application/common/mixins.scss.erb
@@ -14,8 +14,8 @@
 
 @mixin no-box-shadow {
 	box-shadow: 0 0 0;
-    -moz-box-shadow: 0 0 0;
-    -webkit-box-shadow: 0 0 0;
+  -moz-box-shadow: 0 0 0;
+  -webkit-box-shadow: 0 0 0;
 }
 
 

diff --git a/app/assets/stylesheets/application/controls/buttons.scss.erb b/app/assets/stylesheets/application/controls/buttons.scss.erb
@@ -3,17 +3,6 @@
 /*##########################################################################*/
 
 
-//////////////////
-
-
-/* Special Rules: */
-
-.C-header_right a.button {
- 	margin-right: 0px;
- 	margin-left: 6px; 
-}
-
-
 
 // BUTTON STYLES
 // -------------

diff --git a/app/assets/stylesheets/application/layout/contentcell.scss.erb b/app/assets/stylesheets/application/layout/contentcell.scss.erb
@@ -3,8 +3,6 @@
 /*##########################################################################*/
 
 
-//////////////////
-
 section.C {
 	@include box-shadow(0 3px 2px #ababab);
   display: block;

diff --git a/app/assets/stylesheets/application/layout/forms.scss.erb b/app/assets/stylesheets/application/layout/forms.scss.erb
@@ -491,15 +491,3 @@ textarea[readonly] {
     padding-left: 20px;
   }
 }
-
-
-
-// Forms in Boxes
-//------------------
-// Entire <form> elements or <fieldset>'s can be inserted into bordered boxes
-// This is commonly done with groups of related inputs in the sidebar (submissions#show, for instance)
-
-.form-box {
-  @include border-radius(6px);
-  border:solid 1px $grayLight;
-}
diff --git a/app/assets/stylesheets/application/layout/lists-grid-stacked.scss.erb b/app/assets/stylesheets/application/layout/lists-grid-stacked.scss.erb
@@ -7,71 +7,66 @@
 // This UL aligns 1..n items in a visual grid. Each item is floated left and fills up available space 
 // (20% width apiece). This UL is used extensively on browse content grids of content.
 
-@mixin gridlist-item {
-	list-style: none;
-	float: left;
-	min-width: 200px;
-	width: 25%;
-  min-height:88px;
-
-  .cont {
-		padding: 12px;
-		//border-right: solid 1px $grayLight;
-		//border-bottom: solid 1px $grayLight;
-		min-height: 64px;
-		text-decoration:none;
-
-		// these elements come along for the ride by bringing in gridlist-item mixin:
-		b {
-			color: $black;
-		}
-
-		.controls {
-			display: block;
-			margin-top: 4px;
-    }
-
-    h1 {
-			font-size: 1.2em;
- 			color: #333;
- 			background:none;
- 			padding: 0px;
- 			margin: 0px;
- 			font-weight: bold;
- 			text-align: center;
-		}
-
-		p {
-      margin-bottom: 3px;
-		}
-
-
-
-	}
-
-  img {
-		@extend .with-shadow;
-		float: left;
-		margin-bottom:6px;
-		margin-right:10px;
-  }
-
-  i {
-    float: left;
-    margin-bottom: 6px;
-    margin-right: 10px;
-  }
-
-
-}
-
 ul.GL {
 	//border-top:solid 1px $grayLight;
 	margin: 0px;
 	padding: 0px;
 
   > li {
-		@include gridlist-item;		
+	  list-style: none;
+    float: left;
+    min-width: 200px;
+    width: 25%;
+    min-height:88px;
+
+    .cont {
+      padding: 12px;
+      //border-right: solid 1px $grayLight;
+      //border-bottom: solid 1px $grayLight;
+      min-height: 64px;
+      text-decoration:none;
+
+      // these elements come along for the ride by bringing in gridlist-item mixin:
+      b {
+        color: $black;
+      }
+
+      .controls {
+        display: block;
+        margin-top: 4px;
+      }
+
+      h1 {
+        font-size: 1.2em;
+        color: #333;
+        background:none;
+        padding: 0px;
+        margin: 0px;
+        font-weight: bold;
+        text-align: center;
+      }
+
+      p {
+        margin-bottom: 3px;
+      }
+
+
+
+    }
+
+    img {
+      @extend .with-shadow;
+      float: left;
+      margin-bottom:6px;
+      margin-right:10px;
+    }
+
+    i {
+      float: left;
+      margin-bottom: 6px;
+      margin-right: 10px;
+    }
+
   }
 
   // inset-selection gridlists appear inside forms and while they use 
@@ -153,32 +148,21 @@ ul.GL {
 // on top of one another with visual elements. It is often used for 
 // nested lists, such as the feed list on contents#index.
 
-// this mixin defines how each top-level item looks in the UL:
-@mixin stackedlist-item {
-  //@include vertical-gradient($white, #eee);
-  border-top: solid 1px $grayLighter;
-  padding: 12px;
-}
-
-// this mixin defines how each second-level (nested) item looks in the UL:
-@mixin stackedlist-nesteditem {
-  padding-left: 25px;
-  background: #efefef;
-}
-
 ul.SL {
   margin-left: 0px;
 
   > li {
-    @include stackedlist-item;
+    border-top: solid 1px $grayLighter;
+    padding: 12px;
 
     // this is the second level of UL, which represents a nested list
     // we only recommend one level deep of visual nesting
     ul {
       margin-left: 0px;
 
       > li {
-        @include stackedlist-nesteditem;
+        padding-left: 25px;
+        background: #efefef;
       }
     }