From: zurbchris Date: Thu, 28 Feb 2013 19:36:39 +0000 (-0800) Subject: update X-Git-Tag: v4.0.0.rc1~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae7527e73fa38b82e426d97ac03aeb9568f77160;p=thirdparty%2Ffoundation%2Ffoundation-sites.git update --- diff --git a/scss/foundation/components/_magellan.scss b/scss/foundation/components/_magellan.scss index 68a44f99c..0e5676c17 100644 --- a/scss/foundation/components/_magellan.scss +++ b/scss/foundation/components/_magellan.scss @@ -1,6 +1,3 @@ - - - @if $include-html-classes { [data-magellan-expedition] { diff --git a/scss/foundation/components/_reveal.scss b/scss/foundation/components/_reveal.scss index 1efdb22e7..3149a8898 100644 --- a/scss/foundation/components/_reveal.scss +++ b/scss/foundation/components/_reveal.scss @@ -99,31 +99,33 @@ $reveal-border-color: #666 !default; cursor: pointer; } -// Reveal Modals -.reveal-modal-bg { @include reveal-bg; } +@if $include-html-classes { + // Reveal Modals + .reveal-modal-bg { @include reveal-bg; } -.reveal-modal { - @include reveal-modal-base; - @include reveal-modal-style; + .reveal-modal { + @include reveal-modal-base; + @include reveal-modal-style; - .close-reveal-modal { @include reveal-close; } -} + .close-reveal-modal { @include reveal-close; } + } -// Large Screen Styles -@media #{$small} { + // Large Screen Styles + @media #{$small} { - .reveal-modal { - @include reveal-modal-style(false, emCalc(30px), false, $box-shadow: false, $top-offset: emCalc(100px)); + .reveal-modal { + @include reveal-modal-style(false, emCalc(30px), false, $box-shadow: false, $top-offset: emCalc(100px)); - &.small { @include reveal-modal-base(false, 30%); } - &.medium { @include reveal-modal-base(false, 40%); } - &.large { @include reveal-modal-base(false, 60%); } - &.xlarge { @include reveal-modal-base(false, 70%); } - &.expand { @include reveal-modal-base(false, 95%); } + &.small { @include reveal-modal-base(false, 30%); } + &.medium { @include reveal-modal-base(false, 40%); } + &.large { @include reveal-modal-base(false, 60%); } + &.xlarge { @include reveal-modal-base(false, 70%); } + &.expand { @include reveal-modal-base(false, 95%); } + } } -} -// Reveal Print Styles -@media print { - div:not(.reveal-modal) { display: none; } -} + // Reveal Print Styles + @media print { + div:not(.reveal-modal) { display: none; } + } +} \ No newline at end of file diff --git a/scss/foundation/components/_switch.scss b/scss/foundation/components/_switch.scss index c169ad197..ba71f2ba4 100644 --- a/scss/foundation/components/_switch.scss +++ b/scss/foundation/components/_switch.scss @@ -205,36 +205,38 @@ $switch-label-outline: 1px dotted #888 !default; @include switch-style($paddle-bg, $positive-color, $negative-color, $radius, $base-style); } +@if $include-html-classes { -/* Foundation Switches */ -@media only screen { + /* Foundation Switches */ + @media only screen { - // Containing element for the radio switch - .switch { - @include switch; + // Containing element for the radio switch + .switch { + @include switch; - // Large radio switches - &.large { @include switch-size($switch-height-lrg, $switch-font-size-lrg); } + // Large radio switches + &.large { @include switch-size($switch-height-lrg, $switch-font-size-lrg); } - // Small radio switches - &.small { @include switch-size($switch-height-sml, $switch-font-size-sml, 2.1em); } + // Small radio switches + &.small { @include switch-size($switch-height-sml, $switch-font-size-sml, 2.1em); } - // Tiny radio switches - &.tiny { @include switch-size($switch-height-tny, $switch-font-size-tny, 1.9em); } + // Tiny radio switches + &.tiny { @include switch-size($switch-height-tny, $switch-font-size-tny, 1.9em); } - // Add a radius to the switch - &.radius { @include radius(4px); - & > span { @include radius(3px); } - } + // Add a radius to the switch + &.radius { @include radius(4px); + & > span { @include radius(3px); } + } - // Make the switch completely round, like a pill - &.round { @include radius(1000px); - & > span { @include radius(999px); } - label { padding: 0 emCalc($switch-label-side-padding + 3px); } - } + // Make the switch completely round, like a pill + &.round { @include radius(1000px); + & > span { @include radius(999px); } + label { padding: 0 emCalc($switch-label-side-padding + 3px); } + } - } + } - @-webkit-keyframes webkitSiblingBugfix { from { position: relative; } to { position: relative; } } + @-webkit-keyframes webkitSiblingBugfix { from { position: relative; } to { position: relative; } } + } } \ No newline at end of file