Commit 842f9238 authored by Thomas Park's avatar Thomas Park
Browse files

amelia: different sizes for btns, closes #40

parent 5344f16f
...@@ -2649,17 +2649,17 @@ input[type="button"].btn-block { ...@@ -2649,17 +2649,17 @@ input[type="button"].btn-block {
.btn-primary { .btn-primary {
color: #ffffff; color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #ad2724; background-color: #ad1d28;
background-image: -moz-linear-gradient(top, #ad1d28, #ad361d); background-image: -moz-linear-gradient(top, #ad1d28, #ad1d28);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#ad361d)); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#ad1d28));
background-image: -webkit-linear-gradient(top, #ad1d28, #ad361d); background-image: -webkit-linear-gradient(top, #ad1d28, #ad1d28);
background-image: -o-linear-gradient(top, #ad1d28, #ad361d); background-image: -o-linear-gradient(top, #ad1d28, #ad1d28);
background-image: linear-gradient(to bottom, #ad1d28, #ad361d); background-image: linear-gradient(to bottom, #ad1d28, #ad1d28);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ffad361d', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ffad1d28', GradientType=0);
border-color: #ad361d #ad361d #6b2212; border-color: #ad1d28 #ad1d28 #6b1219;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #ad361d; *background-color: #ad1d28;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
...@@ -2670,12 +2670,12 @@ input[type="button"].btn-block { ...@@ -2670,12 +2670,12 @@ input[type="button"].btn-block {
.btn-primary.disabled, .btn-primary.disabled,
.btn-primary[disabled] { .btn-primary[disabled] {
color: #ffffff; color: #ffffff;
background-color: #ad361d; background-color: #ad1d28;
*background-color: #972f19; *background-color: #971923;
} }
.btn-primary:active, .btn-primary:active,
.btn-primary.active { .btn-primary.active {
background-color: #812816 \9; background-color: #81161e \9;
} }
.btn-warning { .btn-warning {
color: #ffffff; color: #ffffff;
...@@ -3016,7 +3016,7 @@ input[type="submit"].btn.btn-mini { ...@@ -3016,7 +3016,7 @@ input[type="submit"].btn.btn-mini {
background-color: #dddddd; background-color: #dddddd;
} }
.btn-group.open .btn-primary.dropdown-toggle { .btn-group.open .btn-primary.dropdown-toggle {
background-color: #ad361d; background-color: #ad1d28;
} }
.btn-group.open .btn-warning.dropdown-toggle { .btn-group.open .btn-warning.dropdown-toggle {
background-color: #df6e1e; background-color: #df6e1e;
...@@ -5414,8 +5414,14 @@ div.subnav-fixed { ...@@ -5414,8 +5414,14 @@ div.subnav-fixed {
.btn-link.active { .btn-link.active {
background-color: #6b1219 \9; background-color: #6b1219 \9;
} }
.btn-large {
padding: 20px 24px;
}
.btn-small { .btn-small {
padding: 13px 16px 12px; padding: 8px 12px;
}
.btn-mini {
padding: 4px 8px;
} }
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
......
...@@ -500,8 +500,8 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap ...@@ -500,8 +500,8 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;} input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;}
.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} .btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);}
.btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);} .btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);}
.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ad2724;background-image:-moz-linear-gradient(top, #ad1d28, #ad361d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#ad361d));background-image:-webkit-linear-gradient(top, #ad1d28, #ad361d);background-image:-o-linear-gradient(top, #ad1d28, #ad361d);background-image:linear-gradient(to bottom, #ad1d28, #ad361d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ffad361d', GradientType=0);border-color:#ad361d #ad361d #6b2212;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ad361d;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#ad361d;*background-color:#972f19;} .btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ad1d28;background-image:-moz-linear-gradient(top, #ad1d28, #ad1d28);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ad1d28), to(#ad1d28));background-image:-webkit-linear-gradient(top, #ad1d28, #ad1d28);background-image:-o-linear-gradient(top, #ad1d28, #ad1d28);background-image:linear-gradient(to bottom, #ad1d28, #ad1d28);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffad1d28', endColorstr='#ffad1d28', GradientType=0);border-color:#ad1d28 #ad1d28 #6b1219;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#ad1d28;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#ad1d28;*background-color:#971923;}
.btn-primary:active,.btn-primary.active{background-color:#812816 \9;} .btn-primary:active,.btn-primary.active{background-color:#81161e \9;}
.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#df6e1e;background-image:-moz-linear-gradient(top, #df6e1e, #df6e1e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#df6e1e), to(#df6e1e));background-image:-webkit-linear-gradient(top, #df6e1e, #df6e1e);background-image:-o-linear-gradient(top, #df6e1e, #df6e1e);background-image:linear-gradient(to bottom, #df6e1e, #df6e1e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdf6e1e', endColorstr='#ffdf6e1e', GradientType=0);border-color:#df6e1e #df6e1e #9c4d15;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#df6e1e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#df6e1e;*background-color:#c9631b;} .btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#df6e1e;background-image:-moz-linear-gradient(top, #df6e1e, #df6e1e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#df6e1e), to(#df6e1e));background-image:-webkit-linear-gradient(top, #df6e1e, #df6e1e);background-image:-o-linear-gradient(top, #df6e1e, #df6e1e);background-image:linear-gradient(to bottom, #df6e1e, #df6e1e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdf6e1e', endColorstr='#ffdf6e1e', GradientType=0);border-color:#df6e1e #df6e1e #9c4d15;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#df6e1e;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#df6e1e;*background-color:#c9631b;}
.btn-warning:active,.btn-warning.active{background-color:#b25818 \9;} .btn-warning:active,.btn-warning.active{background-color:#b25818 \9;}
.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#debb27;background-image:-moz-linear-gradient(top, #debb27, #debb27);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#debb27), to(#debb27));background-image:-webkit-linear-gradient(top, #debb27, #debb27);background-image:-o-linear-gradient(top, #debb27, #debb27);background-image:linear-gradient(to bottom, #debb27, #debb27);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdebb27', endColorstr='#ffdebb27', GradientType=0);border-color:#debb27 #debb27 #a08618;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#debb27;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#debb27;*background-color:#ccab1f;} .btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#debb27;background-image:-moz-linear-gradient(top, #debb27, #debb27);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#debb27), to(#debb27));background-image:-webkit-linear-gradient(top, #debb27, #debb27);background-image:-o-linear-gradient(top, #debb27, #debb27);background-image:linear-gradient(to bottom, #debb27, #debb27);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdebb27', endColorstr='#ffdebb27', GradientType=0);border-color:#debb27 #debb27 #a08618;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#debb27;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#debb27;*background-color:#ccab1f;}
...@@ -542,7 +542,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- ...@@ -542,7 +542,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-
.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;} .btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;}
.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);}
.btn-group.open .btn.dropdown-toggle{background-color:#dddddd;} .btn-group.open .btn.dropdown-toggle{background-color:#dddddd;}
.btn-group.open .btn-primary.dropdown-toggle{background-color:#ad361d;} .btn-group.open .btn-primary.dropdown-toggle{background-color:#ad1d28;}
.btn-group.open .btn-warning.dropdown-toggle{background-color:#df6e1e;} .btn-group.open .btn-warning.dropdown-toggle{background-color:#df6e1e;}
.btn-group.open .btn-danger.dropdown-toggle{background-color:#debb27;} .btn-group.open .btn-danger.dropdown-toggle{background-color:#debb27;}
.btn-group.open .btn-success.dropdown-toggle{background-color:#48ca3b;} .btn-group.open .btn-success.dropdown-toggle{background-color:#48ca3b;}
...@@ -901,7 +901,9 @@ div.subnav-fixed{top:50px;} ...@@ -901,7 +901,9 @@ div.subnav-fixed{top:50px;}
.btn-link{background-color:#ad1d28;border-color:transparent;}.btn-link:hover,.btn-link:active,.btn-link.active,.btn-link.disabled,.btn-link[disabled]{background-color:#971923;text-shadow:none;} .btn-link{background-color:#ad1d28;border-color:transparent;}.btn-link:hover,.btn-link:active,.btn-link.active,.btn-link.disabled,.btn-link[disabled]{background-color:#971923;text-shadow:none;}
.btn-link:active,.btn-link.active{background-color:#6b1219;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-link:active,.btn-link.active{background-color:#6b1219;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
.btn-link:active,.btn-link.active{background-color:#6b1219 \9;} .btn-link:active,.btn-link.active{background-color:#6b1219 \9;}
.btn-small{padding:13px 16px 12px;} .btn-large{padding:20px 24px;}
.btn-small{padding:8px 12px;}
.btn-mini{padding:4px 8px;}
[class^="icon-"],[class*=" icon-"]{margin-top:2px;margin-right:8px;} [class^="icon-"],[class*=" icon-"]{margin-top:2px;margin-right:8px;}
.btn-small [class^="icon-"]{margin-top:1px;} .btn-small [class^="icon-"]{margin-top:1px;}
.add-on [class^="icon-"]{margin-left:5px;} .add-on [class^="icon-"]{margin-left:5px;}
......
...@@ -447,8 +447,16 @@ div.subnav { ...@@ -447,8 +447,16 @@ div.subnav {
.buttonBackgroundCustom(@btnPrimaryBackground); .buttonBackgroundCustom(@btnPrimaryBackground);
} }
.btn-large {
padding: 20px 24px;
}
.btn-small { .btn-small {
padding: 13px 16px 12px; padding: 8px 12px;
}
.btn-mini {
padding: 4px 8px;
} }
[class^="icon-"], [class*=" icon-"] { [class^="icon-"], [class*=" icon-"] {
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
@btnBorder: rgba(0, 0, 0, 0); @btnBorder: rgba(0, 0, 0, 0);
@btnPrimaryBackground: @navbarBackground; @btnPrimaryBackground: @navbarBackground;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%); @btnPrimaryBackgroundHighlight: @navbarBackground;
@btnInfoBackground: @purple; @btnInfoBackground: @purple;
@btnInfoBackgroundHighlight: @purple; @btnInfoBackgroundHighlight: @purple;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment