mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
mucho updato around buttons to fix some stuff that was introduced with the bootstrap update
This commit is contained in:
Mark Otto
parent
dd769f9a6e
commit
243fc873d9
12
bootstrap.css
vendored
12
bootstrap.css
vendored
@ -29,11 +29,11 @@ div.container{width:940px;margin:0 auto;}
|
||||
div.container-fluid{padding:20px;zoom:1;}div.container-fluid:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
|
||||
div.container-fluid div.sidebar{float:left;width:220px;}
|
||||
div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
|
||||
a{color:#08b5fb;text-decoration:none;line-height:inherit;}a:hover{color:#0393cd;text-decoration:underline;}
|
||||
a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
|
||||
.btn{display:inline-block;background-color:#dfd8d8;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#dfd8d8));background-image:-moz-linear-gradient(#f5f5f5, #dfd8d8);background-image:-ms-linear-gradient(#f5f5f5, #dfd8d8);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #dfd8d8));background-image:-webkit-linear-gradient(#f5f5f5, #dfd8d8);background-image:-o-linear-gradient(#f5f5f5, #dfd8d8);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#dfd8d8', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#dfd8d8', GradientType=0)";background-image:linear-gradient(#f5f5f5, #dfd8d8);padding:9px 15px 10px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:20px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),inset 0 -1px 0 rgba(0, 0, 0, 0.2),0 1px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),inset 0 -1px 0 rgba(0, 0, 0, 0.2),0 1px 2px rgba(0, 0, 0, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),inset 0 -1px 0 rgba(0, 0, 0, 0.2),0 1px 2px rgba(0, 0, 0, 0.25);}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;}
|
||||
.btn.primary{background-color:#0381b4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#08b5fb), to(#0381b4));background-image:-moz-linear-gradient(#08b5fb, #0381b4);background-image:-ms-linear-gradient(#08b5fb, #0381b4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #08b5fb), color-stop(100%, #0381b4));background-image:-webkit-linear-gradient(#08b5fb, #0381b4);background-image:-o-linear-gradient(#08b5fb, #0381b4);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0381b4', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#08b5fb', endColorstr='#0381b4', GradientType=0)";background-image:linear-gradient(#08b5fb, #0381b4);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
|
||||
.btn.large{font-size:16px;line-height:30px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
|
||||
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;line-height:16px;}
|
||||
.btn.large{font-size:16px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
|
||||
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
|
||||
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
|
||||
p{font-size:14px;font-weight:normal;line-height:20px;margin-bottom:20px;}p small{font-size:12px;color:#b3b3b3;}
|
||||
h1,h2,h3,h4,h5,h6{font-weight:500;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#b3b3b3;}
|
||||
@ -186,10 +186,12 @@ ul.tabs,ul.pills{margin:0 0 20px;padding:0;zoom:1;}ul.tabs:after,ul.pills:after{
|
||||
ul.tabs li,ul.pills li{display:inline;}ul.tabs li a,ul.pills li a{display:inline;float:left;width:auto;}
|
||||
ul.tabs{width:100%;border-bottom:1px solid #ccc;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:39px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background:#f5f5f5;border-bottom:1px solid #ccc;}
|
||||
ul.tabs li.active a{background:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
|
||||
ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0393cd;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
|
||||
ul.pills li.active a{background:#08b5fb;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
|
||||
ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
|
||||
ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
|
||||
div.pagination{height:40px;margin:20px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{display:inline;float:left;padding:0 14px;line-height:38px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;}
|
||||
div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#eaf9ff;}
|
||||
div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#b3b3b3;}
|
||||
div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;}
|
||||
div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}
|
||||
div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
|
||||
div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:620px;height:500px;margin:-310px 0 0 -250px;background-color:#ffffff;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
|
||||
|
||||
@ -79,8 +79,6 @@ section {
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#7a43b6', EndColorStr='#552e7e', GradientType=0))";
|
||||
display: block;
|
||||
margin-bottom: 20px;
|
||||
padding-top: 5px;
|
||||
padding-bottom: 5px;
|
||||
text-align: center;
|
||||
border: 0;
|
||||
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.4);
|
||||
|
||||
@ -7,62 +7,6 @@
|
||||
/* Top bar
|
||||
-------------------------------------------------- */
|
||||
|
||||
/*
|
||||
div.topbar {
|
||||
#gradient > .vertical(#333, #222);
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 1000;
|
||||
height: 40px;
|
||||
.box-shadow(0 1px 3px rgba(0,0,0,.5));
|
||||
a {
|
||||
color: #999;
|
||||
&:hover {
|
||||
color: @white;
|
||||
text-decoration: none;
|
||||
background-color: rgba(255,255,255,.05);
|
||||
}
|
||||
}
|
||||
a.logo,
|
||||
ul li a {
|
||||
float: left;
|
||||
padding: 0 10px;
|
||||
line-height: 40px;
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||
}
|
||||
// Logo
|
||||
a.logo {
|
||||
margin-left: -10px;
|
||||
margin-right: 10px;
|
||||
color: @grayLight;
|
||||
font-size: 20px;
|
||||
font-weight: 200;
|
||||
img {
|
||||
float: left;
|
||||
margin-top: 9px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
&:hover {
|
||||
color: @white;
|
||||
}
|
||||
}
|
||||
// Nav items
|
||||
ul {
|
||||
float: left;
|
||||
margin: 0;
|
||||
li {
|
||||
display: inline;
|
||||
&.active a {
|
||||
color: #fff;
|
||||
background-color: rgba(0,0,0,.5);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// Topbar for Branding and Nav
|
||||
div.topbar {
|
||||
#gradient > .vertical(#333, #222);
|
||||
@ -524,3 +468,28 @@ div.well {
|
||||
.border-radius(4px);
|
||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075);
|
||||
}
|
||||
|
||||
|
||||
/* Modals
|
||||
-------------------------------------------------- */
|
||||
|
||||
div.modal-backdrop {
|
||||
background-color: rgba(0,0,0,.5);
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
z-index: 1000;
|
||||
}
|
||||
div.modal {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
z-index: 2000;
|
||||
width: 620px;
|
||||
height: 500px;
|
||||
margin: -310px 0 0 -250px;
|
||||
background-color: @white;
|
||||
.border-radius(6px);
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
-------------------------------------------------- */
|
||||
|
||||
// Links
|
||||
@linkColor: #08b5fb;
|
||||
@linkColor: #0069d6;
|
||||
@linkColorHover: darken(@linkColor, 10);
|
||||
|
||||
// Grays
|
||||
@ -178,7 +178,7 @@
|
||||
text-shadow: @textShadow;
|
||||
color: @textColor;
|
||||
font-size: @fontSize;
|
||||
line-height: 20px;
|
||||
line-height: @baseline;
|
||||
.border-radius(@borderRadius);
|
||||
@shadow: inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(0,0,0,.25);
|
||||
.box-shadow(@shadow);
|
||||
|
||||
@ -89,14 +89,12 @@ a {
|
||||
}
|
||||
&.large {
|
||||
font-size: 16px;
|
||||
line-height: 30px;
|
||||
.border-radius(6px);
|
||||
}
|
||||
&.small {
|
||||
padding-right: 9px;
|
||||
padding-left: 9px;
|
||||
font-size: 11px;
|
||||
line-height: 16px;
|
||||
}
|
||||
}
|
||||
// Help Firefox not be a douche about adding extra padding to buttons
|
||||
|
||||
Loading…
Reference in New Issue
Block a user