diff --git a/package.json b/package.json index bff24adb498..fc422726b5c 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "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", @@ -63,4 +63,4 @@ "sinon": "^1.9.1", "time-grunt": "~1.0.0" } -} +} \ No newline at end of file diff --git a/src/plugins/tabs/_base.scss b/src/plugins/tabs/_base.scss index d9493822d66..17a9e825c7e 100644 --- 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; + } } } }