Permalink
Browse files

Merge branch 'sass-mixins'

  • Loading branch information...
2 parents 461c3a3 + fa4f37c commit 8f01321e2920852f8acf9a97b0955906e7ed17bb Phil LaPier committed Jun 27, 2011
View
@@ -0,0 +1,3 @@
+[submodule "public/stylesheets/sass/sass-mixins"]
+ path = public/stylesheets/sass/sass-mixins
+ url = git@github.com:thoughtbot/sass-mixins.git
View
@@ -8,5 +8,5 @@ Gem::Specification.new do |s|
s.description = 'Flutie is a starting point for personal discovery'
s.files = ["README*", "Rakefile", "{app,config,lib,public}/**/*"].map { |glob| Dir[glob] }.flatten
s.authors = ['Chad Pytel', 'Kevin Burg', 'Matt Jankowski', 'Mike Burns', 'Fred Yates']
- s.add_development_dependency('haml')
+ s.add_development_dependency('sass')
end
@@ -78,9 +78,6 @@ hr {
input, select {
vertical-align: middle; }
-/* this hack is courtesy of gbbowers on github
- https://gist.github.com/601810 */
-/* Useful with form inputs and textareas */
/* Legacy support for inline-block in IE7 (maybe IE6) */
body {
color: #222;
@@ -1,5 +0,0 @@
-@mixin border-radius ($radii) {
- -moz-border-radius: $radii;
- -webkit-border-radius: $radii;
- border-radius: $radii;
-}
@@ -1,35 +0,0 @@
-/* this hack is courtesy of gbbowers on github
- https://gist.github.com/601810 */
-@mixin box-shadow ($shadow-1, $shadow-2: false, $shadow-3: false, $shadow-4: false, $shadow-5: false, $shadow-6: false, $shadow-7: false, $shadow-8: false, $shadow-9: false) {
- $full: $shadow-1;
-
- @if $shadow-2 {
- $full: $full + ", " + $shadow-2;
- }
- @if $shadow-3 {
- $full: $full + ", " + $shadow-3;
- }
- @if $shadow-4 {
- $full: $full + ", " + $shadow-4;
- }
- @if $shadow-5 {
- $full: $full + ", " + $shadow-5;
- }
- @if $shadow-6 {
- $full: $full + ", " + $shadow-6;
- }
- @if $shadow-7 {
- $full: $full + ", " + $shadow-7;
- }
- @if $shadow-8 {
- $full: $full + ", " + $shadow-8;
- }
- @if $shadow-9 {
- $full: $full + ", " + $shadow-9;
- }
-
- -moz-box-shadow: $full;
- -webkit-box-shadow: $full;
- -o-box-shadow: $full;
- box-shadow: $full;
-}
@@ -1,7 +0,0 @@
-/* Useful with form inputs and textareas */
-@mixin box-sizing ($box) {
- -webkit-box-sizing: $box;
- -moz-box-sizing: $box;
- box-sizing: $box; // border-box, content-box, padding-box (moz), margin-box (moz)
-}
-
@@ -1,10 +0,0 @@
-/* Legacy support for inline-block in IE7 (maybe IE6) */
-@mixin inline-block {
- display: -moz-inline-box;
- -moz-box-orient: vertical;
- display: inline-block;
- vertical-align: baseline;
- zoom: 1;
- *display: inline;
- *vertical-align: auto;
-}
@@ -1,9 +0,0 @@
-@mixin linear-gradient ($from, $to) {
- background: $from;
- background: -moz-linear-gradient(top, $from, $to); // FF3.6
- background: -ms-linear-gradient(top, $from, $to); // IE10
- background: -o-linear-gradient(top, $from, $to); // Opera 11.10+
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0, $from), color-stop(1, $to)); // Saf4+, Chrome
- background: -webkit-linear-gradient(top, $from, $to); // Chrome 10+, Saf5.1+
- background: linear-gradient(top, $from, $to);
-}
@@ -1,6 +0,0 @@
-@mixin transition($property: all, $ratio: 0.15s, $ease: ease-out) {
- -webkit-transition: $property $ratio $ease;
- -moz-transition: $property $ratio $ease;
- -o-transition: $property $ratio $ease;
- transition: $property $ratio $ease;
-}
@@ -1,10 +1,5 @@
@import 'reset';
-@import 'border-radius';
-@import 'box-shadow';
-@import 'box-sizing';
-@import 'inline-block';
-@import 'transition';
-@import 'linear-gradient';
+@import 'sass-mixins/mixins';
@import 'defaults';
@import 'type';
@import 'forms';
Submodule sass-mixins added at 88babb
@@ -6,7 +6,7 @@
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler)
-require 'haml'
+require 'sass'
require 'flutie'
module Dummy

0 comments on commit 8f01321

Please sign in to comment.