From 63b179163c6515d8e587cd68e8c6152d435b72bf Mon Sep 17 00:00:00 2001 From: Les James Date: Thu, 28 Feb 2013 16:35:15 -0500 Subject: [PATCH] Removed box-sizing polyfill. Fixes #41 --- static/js/boxsizing.htc | 399 -------------------------- static/sass/framework/_grid-core.scss | 4 +- static/sass/framework/_mixins.scss | 8 - 3 files changed, 2 insertions(+), 409 deletions(-) delete mode 100644 static/js/boxsizing.htc diff --git a/static/js/boxsizing.htc b/static/js/boxsizing.htc deleted file mode 100644 index f8b3bd1..0000000 --- a/static/js/boxsizing.htc +++ /dev/null @@ -1,399 +0,0 @@ -/** -* box-sizing Polyfill -* -* A polyfill for box-sizing: border-box for IE6 & IE7. -* -* JScript -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License as published -* by the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License for more details. -* -* See -* -* @category JScript -* @package box-sizing-polyfill -* @author Christian Schepp Schaefer -* @copyright 2012 Christian Schepp Schaefer -* @license http://www.gnu.org/copyleft/lesser.html The GNU LESSER GENERAL PUBLIC LICENSE, Version 3.0 -* @link http://github.com/Schepp/box-sizing-polyfill -* -* PREFACE: -* -* This box-sizing polyfill is based on previous work done by Erik Arvidsson, -* which he published in 2002 on http://webfx.eae.net/dhtml/boxsizing/boxsizing.html. -* -* USAGE: -* -* Add the behavior/HTC after every `box-sizing: border-box;` that you assign: -* -* box-sizing: border-box; -* *behavior: url(/scripts/boxsizing.htc);` -* -* Prefix the `behavior` property with a star, like seen above, so it will only be seen by -* IE6 & IE7, not by IE8+ who already implement box-sizing. -* -* The URL to the HTC file must be relative to your HTML(!) document, not relative to your CSS. -* That's why I'd advise you to use absolute paths like in the example. -* -*/ - - - - - - \ No newline at end of file diff --git a/static/sass/framework/_grid-core.scss b/static/sass/framework/_grid-core.scss index fa2e96f..91d8744 100644 --- a/static/sass/framework/_grid-core.scss +++ b/static/sass/framework/_grid-core.scss @@ -53,8 +53,8 @@ img { max-width: 100%; } .grid-cell { width: 100%; - @include inline-block; - @include border-box; + display: inline-block; + @include box-sizing('border-box'); margin: 0; padding: 0 0.5 * em($grid-gutter); /* controls vertical positioning of units */ diff --git a/static/sass/framework/_mixins.scss b/static/sass/framework/_mixins.scss index 84f5956..f5c46c1 100644 --- a/static/sass/framework/_mixins.scss +++ b/static/sass/framework/_mixins.scss @@ -1,11 +1,3 @@ -// cross browser border box -@mixin border-box() { - @include box-sizing(border-box); - - // MUST BE ABSOLUTE PATH - @include ie7 { behavior: url(#{$static-path}/js/boxsizing.htc); } -} - // cross browser mixins @mixin ff { body:not(:-moz-handler-blocked) & { @content } } @mixin ie7 { .lt-ie8 & { @content } }