Created
June 17, 2014 21:13
-
-
Save sveetch/43ab5a745a21445dc003 to your computer and use it in GitHub Desktop.
Foundation 5.3 bugfixes backported to 5.2.3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- foundation5/bower_components/foundation/scss/foundation/components/_global.scss | |
+++ foundation5/bower_components/foundation/scss/foundation/components/_global.scss.patch | |
@@ -11,8 +11,8 @@ | |
// styles get applied to [data-mysite-plugin], etc | |
$namespace: false !default; | |
-// Control the inclusion of experimental properties | |
-$experimental: true !default; | |
+/*// Control the inclusion of experimental properties | |
+$experimental: true !default;*/ | |
// The default font-size is set to 100% of the browser style sheet (usually 16px) | |
// for compatibility with browser-based text zoom or user-set defaults. | |
@@ -33,11 +33,12 @@ | |
// | |
// We use this to optionally include experimental or | |
// explicitly vendor prefixed properties | |
-@mixin experimental() { | |
+// NOTE: cause clashes/troubles with compass experimental mixin | |
+/*@mixin experimental() { | |
@if $experimental { | |
@content; | |
} | |
-} | |
+}*/ | |
// @mixins | |
// | |
@@ -135,7 +136,7 @@ | |
// $hover-color - icon color during hover | |
// $offcanvas - Set to true of @include in offcanvas | |
@mixin hamburger($width, $left, $top, $thickness, $gap, $color, $hover-color, $offcanvas) { | |
- span:after { | |
+ span::after { | |
content: ''; | |
position: absolute; | |
display: block; | |
@@ -156,6 +157,11 @@ | |
left: ($tabbar-menu-icon-width - $width)/2; | |
} | |
} | |
+ @else { | |
+ top: 50%; | |
+ margin-top: -$width/2; | |
+ #{$opposite-direction}: $topbar-link-padding; | |
+ } | |
box-shadow: | |
0 0px 0 $thickness $color, | |
--- foundation5/bower_components/foundation/scss/foundation/components/_top-bar.scss | |
+++ foundation5/bower_components/foundation/scss/foundation/components/_top-bar.scss | |
@@ -216,10 +216,8 @@ | |
// Adding the class "menu-icon" will add the 3-line icon people love and adore. | |
&.menu-icon { | |
- #{$opposite-direction}: $topbar-link-padding; | |
top: 50%; | |
margin-top: -16px; | |
- padding-#{$default-float}: 40px; | |
a { | |
@if $text-direction == rtl { | |
@@ -227,11 +225,11 @@ | |
} | |
height: 34px; | |
line-height: 33px; | |
- padding: 0; | |
+ padding: 0 $topbar-link-padding+25 0 $topbar-link-padding; | |
color: $topbar-menu-link-color; | |
position: relative; | |
- &::after { | |
+ & { | |
// @include hamburger icon | |
// | |
// We use this to create the icon with three lines aka the hamburger icon, the menu-icon or the navicon | |
@@ -243,8 +241,7 @@ | |
// $color - icon color | |
// $hover-color - icon color during hover, here it is set the same as $color because the values are changed on line 264 | |
// $offcanvas - Set to false of @include in topbar | |
- @include hamburger(16px, false, 0, 1px, 6px, $topbar-menu-icon-color, $topbar-menu-icon-color, false ); | |
- #{$opposite-direction}: 0; | |
+ @include hamburger(16px, false, 0, 1px, 6px, $topbar-menu-icon-color, $topbar-menu-icon-color, false); | |
} | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Actually contains bugfixes for :