test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_modals.scssc in bootstrap-sass-rails-2.0.1.2 vs test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_modals.scssc in bootstrap-sass-rails-2.0.2.0

- old
+ new

@@ -1,7 +1,7 @@ -3.1.14 (Brainy Betty) -2ec198aac3674f1e533f7a8e84edf00d4efc1bc0 +3.1.15 (Brainy Betty) +58ae10b9b74106116ea8b95eda31fb080afb8fef o:Sass::Tree::RootNode :@children[o:Sass::Tree::CommentNode : @value[I"/* MODALS * ------ */:ET: @silenti: @loud0;[: @linei: @options{o; ;[I"0/* Recalculate z-index where appropriate */; T; @@ -26,35 +26,37 @@ i; 0;[; i; @ o; ;[I" &.fade; F;i;o;;[o;;[o;;[o:Sass::Selector::Parent; i;I"; Fo;;[I" fade; F; i;@Ì; i;@Ì; i;@Ì;[o; ;[I" opacity; T;o;$;I"0; T;%;&; @ ;i;!;";[; i; @ ; i;#T; @ ; i;#T; @ o; ;[I"-.modal-backdrop, .modal-backdrop.fade.in; F;i;o;;[o;;[o;;[o;;[I"modal-backdrop; F; i;I"; F; i;@ão;;[I" ; Fo;;[o;;[I"modal-backdrop; F; i;@ão;;[I" fade; F; i;@ão;;[I"in; F; i;@ã; i;@ã; i;@ã;[o:Sass::Tree::MixinNode ;I" opacity; T: @args[o:Sass::Script::Number ;iU:@numerator_units[:@denominator_units[; i :@originalI"80; F; @ :@keywords{;[; i ; @ ; i;#T; @ o; ;[I"/* Base modal */; T; i; 0;[; i#; @ o; ;[I" .modal; T;i;o;;[o;;[o;;[o;;[I" -modal; T; i$;I"; F; i$;@ ; i$;@ ;[o; ;[I" position; T;o;$;I" -fixed; T;%;&; @ ;i;!;";[; i%; @ o; ;[I"top; T;o;$;I"50%; T;%;&; @ ;i;!;";[; i&; @ o; ;[I" left; T;o;$;I"50%; T;%;&; @ ;i;!;";[; i'; @ o; ;[I" z-index; T;o; ;I"zindexModal; T;I"zindexModal; T; i(; @ ;i;!;";[; i(; @ o; ;[I"max-height; T;o;$;I" -500px; T;%;&; @ ;i;!;";[; i); @ o; ;[I" overflow; T;o;$;I" auto; T;%;&; @ ;i;!;";[; i*; @ o; ;[I" +modal; T; i$;I"; F; i$;@ ; i$;@ ;[o; ;[I" position; T;o;$;I" +fixed; T;%;&; @ ;i;!;";[; i%; @ o; ;[I"top; T;o;$;I"50%; T;%;&; @ ;i;!;";[; i&; @ o; ;[I" left; T;o;$;I"50%; T;%;&; @ ;i;!;";[; i'; @ o; ;[I" z-index; T;o; ;I"zindexModal; T;I"zindexModal; T; i(; @ ;i;!;";[; i(; @ o; ;[I" overflow; T;o;$;I" auto; T;%;&; @ ;i;!;";[; i); @ o; ;[I" width; T;o;$;I" -560px; T;%;&; @ ;i;!;";[; i+; @ o; ;[I" margin; T;o:Sass::Script::List ;[ o;* ;iÿ;+[I"px; T;,[; i,;-I" -250px; F; @ o;* ;i;+[;,@ø; i,;-I"0; F; @ o;* ;i;+[;,@ø; i,;-I"0; F; @ o;* ;iþèþ;+[I"px; T;,[; i,;-I" -280px; F; @ :@separator: -space; i,; @ ;i;!;";[; i,; @ o; ;[I"background-color; T;o; ;I" +560px; T;%;&; @ ;i;!;";[; i*; @ o; ;[I" margin; T;o:Sass::Script::List ;[ o;* ;iÿ;+[I"px; T;,[; i+;-I" -250px; F; @ o;* ;i;+[;,@ø; i+;-I"0; F; @ o;* ;i;+[;,@ø; i+;-I"0; F; @ o;* ;iþèþ;+[I"px; T;,[; i+;-I" -280px; F; @ :@separator: +space; i+; @ ;i;!;";[; i+; @ o; ;[I"background-color; T;o; ;I" white; T;I" -white; T; i-; @ ;i;!;";[; i-; @ o; ;[I" border; T;o;$;I"1px solid #999; T;%;&; @ ;i;!;";[; i.; @ o; ;[I" border; T;o;/ ;[o;* ;i;+[I"px; T;,[; i/;-I"1px; F; @ o;$ ;I" -solid; T;%;&; @ ; i/o:Sass::Script::Funcall -;I" rgba; T;)[ o;* ;i;+[;,@ø; i/;-I"0; F; @ o;* ;i;+[;,@ø; i/;-I"0; F; @ o;* ;i;+[;,@ø; i/;-I"0; F; @ o;* ;f0.3;+[;,@ø; i/;-I"0.3; F; @ ;.{; i/; @ ;0;1; i/; @ ;i;!;";[; i/; @ o; ;[I" *border; T;o;$;I"1px solid #999; T;%;&; @ ;i;!;";[; i0; @ o; ;[I"/* IE6-7 */; T; -0; 0;[; i0; @ o;( ;I"border-radius; T;)[o;* ;i ;+[I"px; T;,[; i1;-I"6px; F; @ ;.{;[; i1; @ o;( ;I"box-shadow; T;)[o;/ ;[ o;* ;i;+[;,@ø; i2;-I"0; F; @ o;* ;i;+[I"px; T;,[; i2;-I"3px; F; @ o;* ;i ;+[I"px; T;,[; i2;-I"7px; F; @ o;2 -;I" rgba; T;)[ o;* ;i;+[;,@ø; i2;-I"0; F; @ o;* ;i;+[;,@ø; i2;-I"0; F; @ o;* ;i;+[;,@ø; i2;-I"0; F; @ o;* ;f0.3;+[;,@ø; i2;-I"0.3; F; @ ;.{; i2; @ ;0;1; i2; @ ;.{;[; i2; @ o;( ;I"background-clip; T;)[o;$ ;I"padding-box; T;%;&; @ ; i3;.{;[; i3; @ o; ;[I" &.fade; F;i;o;;[o;;[o;;[o;'; i4;I"; Fo;;[I" fade; F; i4;@Ä; i4;@Ä; i4;@Ä;[o;( ;I"transition; T;)[o;2 -;I"e; T;)[o;$ ;I")opacity .3s linear, top .3s ease-out; T;%: string; @ ; i5;.{; i5; @ ;.{;[; i5; @ o; ;[I"top; T;o;* ;iâ;+[I"%; T;,[; i6;-I" -25%; F; @ ;i;!;";[; i6; @ ; i4;#T; @ o; ;[I"&.fade.in; F;i;o;;[o;;[o;;[o;'; i8;I"; Fo;;[I" fade; F; i8;@ço;;[I"in; F; i8;@ç; i8;@ç; i8;@ç;[o; ;[I"top; T;o;$;I"50%; T;%;&; @ ;i;!;";[; i8; @ ; i8;#T; @ ; i$;#T; @ o; ;[I".modal-header; T;i;o;;[o;;[o;;[o;;[I"modal-header; T; i:;I"; F; i:;@; i:;@;[ o; ;[I" padding; T;o;$;I" 9px 15px; T;%;&; @ ;i;!;";[; i;; @ o; ;[I"border-bottom; T;o;$;I"1px solid #eee; T;%;&; @ ;i;!;";[; i<; @ o; ;[I"/* Close icon */; T; -i; 0;[; i=; @ o; ;[I" .close; T;i;o;;[o;;[o;;[o;;[I" -close; T; i>;I"; F; i>;@; i>;@;[o; ;[I"margin-top; T;o;$;I"2px; T;%;&; @ ;i;!;";[; i>; @ ; i>;#T; @ ; i:;#T; @ o; ;[I"1/* Body (where all modal content resises) */; T; -i; 0;[; iA; @ o; ;[I".modal-body; T;i;o;;[o;;[o;;[o;;[I"modal-body; T; iB;I"; F; iB;@7; iB;@7;[o; ;[I" padding; T;o;$;I" 15px; T;%;&; @ ;i;!;";[; iC; @ ; iB;#T; @ o; ;[I"*/* Remove bottom margin if need be */; T; -i; 0;[; iE; @ o; ;[I".modal-body .modal-form; T;i;o;;[o;;[o;;[o;;[I"modal-body; T; iF;I"; F; iF;@Oo;;[o;;[I"modal-form; T; iF;@O; iF;@O; iF;@O;[o; ;[I"margin-bottom; T;o;$;I"0; T;%;&; @ ;i;!;";[; iG; @ ; iF;#T; @ o; ;[I"/* Footer (for actions) */; T; -i; 0;[; iJ; @ o; ;[I".modal-footer; T;i;o;;[o;;[o;;[o;;[I"modal-footer; T; iK;I"; F; iK;@l; iK;@l;[ o; ;[I" padding; T;o;$;I"14px 15px 15px; T;%;&; @ ;i;!;";[; iL; @ o; ;[I"margin-bottom; T;o;$;I"0; T;%;&; @ ;i;!;";[; iM; @ o; ;[I"background-color; T;o;$;I" #f5f5f5; T;%;&; @ ;i;!;";[; iN; @ o; ;[I"border-top; T;o;$;I"1px solid #ddd; T;%;&; @ ;i;!;";[; iO; @ o;( ;I"border-radius; T;)[o;/ ;[ o;* ;i;+[;,@ø; iP;-I"0; F; @ o;* ;i;+[;,@ø; iP;-I"0; F; @ o;* ;i ;+[I"px; T;,[; iP;-I"6px; F; @ o;* ;i ;+[I"px; T;,[; iP;-I"6px; F; @ ;0;1; iP; @ ;.{;[; iP; @ o;( ;I"box-shadow; T;)[o;/ ;[ +white; T; i,; @ ;i;!;";[; i,; @ o; ;[I" border; T;o;$;I"1px solid #999; T;%;&; @ ;i;!;";[; i-; @ o; ;[I" border; T;o;/ ;[o;* ;i;+[I"px; T;,[; i.;-I"1px; F; @ o;$ ;I" +solid; T;%;&; @ ; i.o:Sass::Script::Funcall +;I" rgba; T;)[ o;* ;i;+[;,@ø; i.;-I"0; F; @ o;* ;i;+[;,@ø; i.;-I"0; F; @ o;* ;i;+[;,@ø; i.;-I"0; F; @ o;* ;f0.3;+[;,@ø; i.;-I"0.3; F; @ ;.{; i.; @ ;0;1; i.; @ ;i;!;";[; i.; @ o; ;[I" *border; T;o;$;I"1px solid #999; T;%;&; @ ;i;!;";[; i/; @ o; ;[I"/* IE6-7 */; T; +0; 0;[; i/; @ o;( ;I"border-radius; T;)[o;* ;i ;+[I"px; T;,[; i0;-I"6px; F; @ ;.{;[; i0; @ o;( ;I"box-shadow; T;)[o;/ ;[ o;* ;i;+[;,@ø; i1;-I"0; F; @ o;* ;i;+[I"px; T;,[; i1;-I"3px; F; @ o;* ;i ;+[I"px; T;,[; i1;-I"7px; F; @ o;2 +;I" rgba; T;)[ o;* ;i;+[;,@ø; i1;-I"0; F; @ o;* ;i;+[;,@ø; i1;-I"0; F; @ o;* ;i;+[;,@ø; i1;-I"0; F; @ o;* ;f0.3;+[;,@ø; i1;-I"0.3; F; @ ;.{; i1; @ ;0;1; i1; @ ;.{;[; i1; @ o;( ;I"background-clip; T;)[o;$ ;I"padding-box; T;%;&; @ ; i2;.{;[; i2; @ o; ;[I" &.fade; F;i;o;;[o;;[o;;[o;'; i3;I"; Fo;;[I" fade; F; i3;@¾; i3;@¾; i3;@¾;[o;( ;I"transition; T;)[o;2 +;I"e; T;)[o;$ ;I")opacity .3s linear, top .3s ease-out; T;%: string; @ ; i4;.{; i4; @ ;.{;[; i4; @ o; ;[I"top; T;o;* ;iâ;+[I"%; T;,[; i5;-I" -25%; F; @ ;i;!;";[; i5; @ ; i3;#T; @ o; ;[I"&.fade.in; F;i;o;;[o;;[o;;[o;'; i7;I"; Fo;;[I" fade; F; i7;@áo;;[I"in; F; i7;@á; i7;@á; i7;@á;[o; ;[I"top; T;o;$;I"50%; T;%;&; @ ;i;!;";[; i7; @ ; i7;#T; @ ; i$;#T; @ o; ;[I".modal-header; T;i;o;;[o;;[o;;[o;;[I"modal-header; T; i9;I"; F; i9;@û; i9;@û;[ o; ;[I" padding; T;o;$;I" 9px 15px; T;%;&; @ ;i;!;";[; i:; @ o; ;[I"border-bottom; T;o;$;I"1px solid #eee; T;%;&; @ ;i;!;";[; i;; @ o; ;[I"/* Close icon */; T; +i; 0;[; i<; @ o; ;[I" .close; T;i;o;;[o;;[o;;[o;;[I" +close; T; i=;I"; F; i=;@; i=;@;[o; ;[I"margin-top; T;o;$;I"2px; T;%;&; @ ;i;!;";[; i=; @ ; i=;#T; @ ; i9;#T; @ o; ;[I"1/* Body (where all modal content resises) */; T; +i; 0;[; i@; @ o; ;[I".modal-body; T;i;o;;[o;;[o;;[o;;[I"modal-body; T; iA;I"; F; iA;@1; iA;@1;[o; ;[I"overflow-y; T;o;$;I" auto; T;%;&; @ ;i;!;";[; iB; @ o; ;[I"max-height; T;o;$;I" +400px; T;%;&; @ ;i;!;";[; iC; @ o; ;[I" padding; T;o;$;I" 15px; T;%;&; @ ;i;!;";[; iD; @ ; iA;#T; @ o; ;[I"*/* Remove bottom margin if need be */; T; +i; 0;[; iF; @ o; ;[I".modal-form; T;i;o;;[o;;[o;;[o;;[I"modal-form; T; iG;I"; F; iG;@U; iG;@U;[o; ;[I"margin-bottom; T;o;$;I"0; T;%;&; @ ;i;!;";[; iH; @ ; iG;#T; @ o; ;[I"/* Footer (for actions) */; T; +i; 0;[; iK; @ o; ;[I".modal-footer; T;i;o;;[o;;[o;;[o;;[I"modal-footer; T; iL;I"; F; iL;@m; iL;@m;[o; ;[I" padding; T;o;$;I"14px 15px 15px; T;%;&; @ ;i;!;";[; iM; @ o; ;[I"margin-bottom; T;o;$;I"0; T;%;&; @ ;i;!;";[; iN; @ o; ;[I"text-align; T;o;$;I" +right; T;%;&; @ ;i;!;";[; iO; @ o; ;[I"background-color; T;o;$;I" #f5f5f5; T;%;&; @ ;i;!;";[; iP; @ o; ;[I"border-top; T;o;$;I"1px solid #ddd; T;%;&; @ ;i;!;";[; iQ; @ o;( ;I"border-radius; T;)[o;/ ;[ o;* ;i;+[;,@ø; iR;-I"0; F; @ o;* ;i;+[;,@ø; iR;-I"0; F; @ o;* ;i ;+[I"px; T;,[; iR;-I"6px; F; @ o;* ;i ;+[I"px; T;,[; iR;-I"6px; F; @ ;0;1; iR; @ ;.{;[; iR; @ o;( ;I"box-shadow; T;)[o;/ ;[ o;$ ;I" -inset; T;%;&; @ ; iQo;* ;i;+[;,@ø; iQ;-I"0; F; @ o;* ;i;+[I"px; T;,[; iQ;-I"1px; F; @ o;* ;i;+[;,@ø; iQ;-I"0; F; @ o; ;I" +inset; T;%;&; @ ; iSo;* ;i;+[;,@ø; iS;-I"0; F; @ o;* ;i;+[I"px; T;,[; iS;-I"1px; F; @ o;* ;i;+[;,@ø; iS;-I"0; F; @ o; ;I" white; T;I" -white; T; iQ; @ ;0;1; iQ; @ ;.{;[; iQ; @ o;( ;I" clearfix; T;)[;.{;[; iR; @ o; ;[I" .btn; T;i;o;;[o;;[o;;[o;;[I"btn; T; iS;I"; F; iS;@Å; iS;@Å;[ o; ;[I" -float; T;o;$;I" -right; T;%;&; @ ;i;!;";[; iT; @ o; ;[I"margin-left; T;o;$;I"5px; T;%;&; @ ;i;!;";[; iU; @ o; ;[I"margin-bottom; T;o;$;I"0; T;%;&; @ ;i;!;";[; iV; @ o; ;[I"^/* account for input[type="submit"] which gets the bottom margin like all other inputs */; T; -i; 0;[; iV; @ ; iS;#T; @ ; iK;#T; @ :@templateI"B// MODALS +white; T; iS; @ ;0;1; iS; @ ;.{;[; iS; @ o;( ;I" clearfix; T;)[;.{;[; iT; @ o; ;[I"@/* clear it in case folks use .pull-* classes on buttons */; T; +i; 0;[; iT; @ o; ;[I"%/* Properly space out buttons */; T; +i; 0;[; iV; @ o; ;[I".btn + .btn; T;i;o;;[o;;[o;;[o;;[I"btn; T; iW;I"; F; iW;@ÔI"+; To;;[o;;[I"btn; T; iW;@Ô; iW;@Ô; iW;@Ô;[o; ;[I"margin-left; T;o;$;I"5px; T;%;&; @ ;i;!;";[; iX; @ o; ;[I"margin-bottom; T;o;$;I"0; T;%;&; @ ;i;!;";[; iY; @ o; ;[I"^/* account for input[type="submit"] which gets the bottom margin like all other inputs */; T; +i; 0;[; iY; @ ; iW;#T; @ o; ;[I"-/* but override tht for button groups */; T; +i; 0;[; i[; @ o; ;[I".btn-group .btn + .btn; T;i;o;;[o;;[ o;;[o;;[I"btn-group; T; i\;I"; F; i\;@üo;;[o;;[I"btn; T; i\;@ü; i\;@üI"+; To;;[o;;[I"btn; T; i\;@ü; i\;@ü; i\;@ü;[o; ;[I"margin-left; T;o;* ;iú;+[I"px; T;,[; i];-I" -1px; F; @ ;i;!;";[; i]; @ ; i\;#T; @ ; iL;#T; @ :@templateI" // MODALS // ------ // Recalculate z-index where appropriate .modal-open { .dropdown-menu { z-index: $zindexDropdown + $zindexModal; } @@ -85,11 +87,10 @@ .modal { position: fixed; top: 50%; left: 50%; z-index: $zindexModal; - max-height: 500px; overflow: auto; width: 560px; margin: -250px 0 0 -280px; background-color: $white; border: 1px solid #999; @@ -111,28 +112,36 @@ .close { margin-top: 2px; } } // Body (where all modal content resises) .modal-body { + overflow-y: auto; + max-height: 400px; padding: 15px; } // Remove bottom margin if need be -.modal-body .modal-form { +.modal-form { margin-bottom: 0; } // Footer (for actions) .modal-footer { padding: 14px 15px 15px; margin-bottom: 0; + text-align: right; background-color: #f5f5f5; border-top: 1px solid #ddd; @include border-radius(0 0 6px 6px); @include box-shadow(inset 0 1px 0 $white); - @include clearfix(); - .btn { - float: right; + @include clearfix(); // clear it in case folks use .pull-* classes on buttons + + // Properly space out buttons + .btn + .btn { margin-left: 5px; margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs + } + // but override tht for button groups + .btn-group .btn + .btn { + margin-left: -1px; } } ; T; i;#T; @ \ No newline at end of file