Revert "CSS: Optimize tabs CSS"

wet-boew · Jan 7, 2015 · 658bf5f · 658bf5f
1 parent d4c5cbd
commit 658bf5f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -55,12 +55,12 @@
     "grunt-jscs": "^0.7.1",
     "grunt-mocha": "~0.4.1",
     "grunt-modernizr": "~0.5.2",
-    "grunt-sass": "^0.16.1",
+    "grunt-sass": "^0.14.1",
     "grunt-saucelabs": "^8.2.0",
     "grunt-wget": "~0.1.0",
     "grunt-wet-boew-postbuild": "wet-boew/grunt-wet-boew-postbuild#v0.1.2",
     "mocha": "^1.18.2",
     "sinon": "^1.9.1",
     "time-grunt": "~1.0.0"
   }
-}
+}
diff --git a/src/plugins/tabs/_base.scss b/src/plugins/tabs/_base.scss
@@ -43,21 +43,6 @@ $medGray: #ccc;
 	}
 }
 
-%tab-figure {
-	figure {
-		@extend %tabs-position-relative;
-		@extend %tab-background-243850;
-	}
-
-	figcaption {
-		@extend %tab-figure-captions;
-
-		p {
-			@extend %tabs-margin-bottom-0;
-		}
-	}
-}
-
 %carousel-s2-prv-nxt-common {
 	background: none;
 	margin: 0;
@@ -232,8 +217,6 @@ $medGray: #ccc;
 	 * Style 1 - Basic carousel style
 	 */
 	&.carousel-s1 {
-		@extend %tab-figure;
-
 		border-top: 0;
 
 		[role="tablist"] {
@@ -283,14 +266,25 @@ $medGray: #ccc;
 				}
 			}
 		}
+
+		figure {
+			@extend %tabs-position-relative;
+			@extend %tab-background-243850;
+		}
+
+		figcaption {
+			@extend %tab-figure-captions;
+
+			p {
+				@extend %tabs-margin-bottom-0;
+			}
+		}
 	}
 
 	/**
 	 * Style 2 - Slider-like carousel style
 	 */
 	&.carousel-s2 {
-		@extend %tab-figure;
-
 		background: #eee;
 		padding-bottom: 4.375em;
 
@@ -381,15 +375,24 @@ $medGray: #ccc;
 		}
 
 		figure {
+			@extend %tabs-position-relative;
+			@extend %tab-background-243850;
+
 			img {
 				@extend %tab-width-100-height-auto;
 			}
 		}
 
 		figcaption {
+			@extend %tab-figure-captions;
+
 			a {
 				@extend %tab-figure-captions-links;
 			}
+
+			p {
+				@extend %tabs-margin-bottom-0;
+			}
 		}
 	}
 }