mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 06:40:40 +00:00
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts: Makefile README.md bootstrap.css bootstrap.min.css lib/bootstrap.less lib/scaffolding.less
This commit is contained in:
Jacob Thornton
commit
c7c5ce8dcd
9
Makefile
9
Makefile
@ -1,3 +1,4 @@
|
||||
VERSION=1.2.0
|
||||
DATE=$(shell DATE)
|
||||
BOOTSTRAP = ./bootstrap.css
|
||||
BOOTSTRAP_MIN = ./bootstrap.min.css
|
||||
@ -7,10 +8,10 @@ WATCHR ?= `which watchr`
|
||||
|
||||
build:
|
||||
@@if test ! -z ${LESS_COMPESSOR}; then \
|
||||
sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp && \
|
||||
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP} && \
|
||||
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress && \
|
||||
rm -f ${BOOTSTRAP_LESS}.tmp && \
|
||||
sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
|
||||
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
|
||||
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
|
||||
rm -f ${BOOTSTRAP_LESS}.tmp; \
|
||||
echo "Bootstrap successfully built! - `date`"; \
|
||||
else \
|
||||
echo "You must have the LESS compiler installed in order to build Bootstrap."; \
|
||||
|
||||
24
README.md
24
README.md
@ -13,12 +13,16 @@ You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS int
|
||||
|
||||
Here's what the LESS version looks like:
|
||||
|
||||
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
|
||||
<script src="less.js" type="text/javascript"></script>
|
||||
``` html
|
||||
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
|
||||
<script src="less.js" type="text/javascript"></script>
|
||||
```
|
||||
|
||||
Or if you prefer, the standard css way:
|
||||
|
||||
``` html
|
||||
<link rel="stylesheet" type="text/css" href="bootstrap.css">
|
||||
```
|
||||
|
||||
For more info, refer to the docs!
|
||||
|
||||
@ -41,7 +45,7 @@ And constructed with the following guidelines:
|
||||
For more information on SemVer, please visit http://semver.org/.
|
||||
|
||||
|
||||
Bug Tracker
|
||||
Bug tracker
|
||||
-----------
|
||||
|
||||
Have a bug? Please create an issue here on GitHub!
|
||||
@ -49,7 +53,13 @@ Have a bug? Please create an issue here on GitHub!
|
||||
https://github.com/twitter/bootstrap/issues
|
||||
|
||||
|
||||
Mailing List
|
||||
Twitter account
|
||||
---------------
|
||||
|
||||
Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>.
|
||||
|
||||
|
||||
Mailing list
|
||||
------------
|
||||
|
||||
Have a question? Ask on our mailing list!
|
||||
@ -73,7 +83,7 @@ This is a convenience method for watching your less files and automatically buil
|
||||
Watchr is required for this command to run.
|
||||
|
||||
|
||||
AUTHORS
|
||||
Authors
|
||||
-------
|
||||
|
||||
**Mark Otto**
|
||||
@ -87,7 +97,7 @@ AUTHORS
|
||||
+ http://github.com/fat
|
||||
|
||||
|
||||
Copyright and License
|
||||
Copyright and license
|
||||
---------------------
|
||||
|
||||
Copyright 2011 Twitter, Inc.
|
||||
@ -102,4 +112,4 @@ Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
limitations under the License.
|
||||
|
||||
56
bootstrap.css
vendored
56
bootstrap.css
vendored
@ -6,7 +6,11 @@
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||
<<<<<<< HEAD:bootstrap.css
|
||||
* Date: Fri Sep 16 10:51:22 PDT 2011
|
||||
=======
|
||||
* Date: Mon Sep 12 09:25:40 PDT 2011
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
|
||||
*/
|
||||
/* Reset.less
|
||||
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
|
||||
@ -266,7 +270,11 @@ a:hover {
|
||||
.row:after {
|
||||
clear: both;
|
||||
}
|
||||
<<<<<<< HEAD:bootstrap.css
|
||||
[class*="span"] {
|
||||
=======
|
||||
.row [class*="span"] {
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-left: 20px;
|
||||
@ -391,6 +399,54 @@ a:hover {
|
||||
.offset-two-thirds {
|
||||
margin-left: 660px;
|
||||
}
|
||||
<<<<<<< HEAD:bootstrap.css
|
||||
=======
|
||||
html, body {
|
||||
background-color: #fff;
|
||||
}
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
color: #808080;
|
||||
}
|
||||
.container {
|
||||
width: 940px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.container-fluid {
|
||||
padding: 0 20px;
|
||||
zoom: 1;
|
||||
}
|
||||
.container-fluid:before, .container-fluid:after {
|
||||
display: table;
|
||||
content: "";
|
||||
}
|
||||
.container-fluid:after {
|
||||
clear: both;
|
||||
}
|
||||
.container-fluid > .sidebar {
|
||||
float: left;
|
||||
width: 220px;
|
||||
}
|
||||
.container-fluid > .content {
|
||||
min-width: 700px;
|
||||
max-width: 1180px;
|
||||
margin-left: 240px;
|
||||
}
|
||||
a {
|
||||
color: #0069d6;
|
||||
text-decoration: none;
|
||||
line-height: inherit;
|
||||
font-weight: inherit;
|
||||
}
|
||||
a:hover {
|
||||
color: #0050a3;
|
||||
text-decoration: underline;
|
||||
}
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
|
||||
/* Typography.less
|
||||
* Headings, body text, lists, code, and more for a versatile and durable typography system
|
||||
* ---------------------------------------------------------------------------------------- */
|
||||
|
||||
69
bootstrap.min.css
vendored
69
bootstrap.min.css
vendored
@ -20,11 +20,62 @@ button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:poin
|
||||
input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
|
||||
input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
|
||||
textarea{overflow:auto;vertical-align:top;}
|
||||
<<<<<<< HEAD:bootstrap.min.css
|
||||
html,body{background-color:#ffffff;}
|
||||
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
|
||||
.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
.container:after{clear:both;}
|
||||
.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
=======
|
||||
.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
|
||||
.clearfix:after{clear:both;}
|
||||
.center-block{display:block;margin:0 auto;}
|
||||
.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
|
||||
.container:after{clear:both;}
|
||||
.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
|
||||
.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
|
||||
.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
|
||||
.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
|
||||
.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
|
||||
.row:after{clear:both;}
|
||||
.row [class*="span"]{display:inline;float:left;margin-left:20px;}
|
||||
.row .span1{width:40px;}
|
||||
.row .span2{width:100px;}
|
||||
.row .span3{width:160px;}
|
||||
.row .span4{width:220px;}
|
||||
.row .span5{width:280px;}
|
||||
.row .span6{width:340px;}
|
||||
.row .span7{width:400px;}
|
||||
.row .span8{width:460px;}
|
||||
.row .span9{width:520px;}
|
||||
.row .span10{width:580px;}
|
||||
.row .span11{width:640px;}
|
||||
.row .span12{width:700px;}
|
||||
.row .span13{width:760px;}
|
||||
.row .span14{width:820px;}
|
||||
.row .span15{width:880px;}
|
||||
.row .span16{width:940px;}
|
||||
.row .offset1{margin-left:80px;}
|
||||
.row .offset2{margin-left:140px;}
|
||||
.row .offset3{margin-left:200px;}
|
||||
.row .offset4{margin-left:260px;}
|
||||
.row .offset5{margin-left:320px;}
|
||||
.row .offset6{margin-left:380px;}
|
||||
.row .offset7{margin-left:440px;}
|
||||
.row .offset8{margin-left:500px;}
|
||||
.row .offset9{margin-left:560px;}
|
||||
.row .offset10{margin-left:620px;}
|
||||
.row .offset11{margin-left:680px;}
|
||||
.row .offset12{margin-left:740px;}
|
||||
.row .span-one-third{width:300px;}
|
||||
.row .span-two-thirds{width:620px;}
|
||||
.row .offset-one-third{margin-left:340px;}
|
||||
.row .offset-two-thirds{margin-left:660px;}
|
||||
html,body{background-color:#fff;}
|
||||
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;}
|
||||
.container{width:940px;margin:0 auto;}
|
||||
.container-fluid{padding:0 20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
|
||||
.container-fluid:after{clear:both;}
|
||||
.container-fluid>.sidebar{float:left;width:220px;}
|
||||
.container-fluid>.content{float:left;min-width:700px;max-width:1180px;margin-left:20px;}
|
||||
@ -105,9 +156,14 @@ code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospa
|
||||
code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
|
||||
pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
|
||||
form{margin-bottom:18px;}
|
||||
<<<<<<< HEAD:bootstrap.min.css
|
||||
fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;}
|
||||
form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
form .clearfix:after{clear:both;}
|
||||
=======
|
||||
fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
|
||||
form .clearfix{margin-bottom:18px;}
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
|
||||
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
|
||||
label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
|
||||
form .input{margin-left:150px;}
|
||||
@ -237,7 +293,11 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
|
||||
.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);}
|
||||
.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
|
||||
.open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;}
|
||||
<<<<<<< HEAD:bootstrap.min.css
|
||||
.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
=======
|
||||
.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
|
||||
.tabs:after,.pills:after{clear:both;}
|
||||
.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
|
||||
.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;}
|
||||
@ -292,6 +352,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
|
||||
.pagination a:hover,.pagination .active a{background-color:#c7eefe;}
|
||||
.pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;}
|
||||
.pagination .next a{border:0;}
|
||||
<<<<<<< HEAD:bootstrap.min.css
|
||||
.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
|
||||
.modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;}
|
||||
.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
|
||||
@ -301,6 +362,14 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
|
||||
.modal-header{border-bottom:1px solid #eee;padding:5px 15px;}
|
||||
.modal-body{padding:15px;}
|
||||
.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;}
|
||||
=======
|
||||
.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
|
||||
.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
|
||||
.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}
|
||||
.modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
|
||||
.modal-body{padding:20px;}
|
||||
.modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
|
||||
>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
|
||||
.modal-footer:after{clear:both;}
|
||||
.modal-footer .btn{float:right;margin-left:5px;}
|
||||
.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
|
||||
|
||||
2
lib/bootstrap.less
vendored
2
lib/bootstrap.less
vendored
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* Bootstrap v1.3.0
|
||||
* Bootstrap @VERSION
|
||||
*
|
||||
* Copyright 2011 Twitter, Inc
|
||||
* Licensed under the Apache License v2.0
|
||||
|
||||
@ -134,4 +134,4 @@ a {
|
||||
.span-one-third { width: 300px; }
|
||||
.span-two-thirds { width: 620px; }
|
||||
.offset-one-third { margin-left: 340px; }
|
||||
.offset-two-thirds { margin-left: 660px; }
|
||||
.offset-two-thirds { margin-left: 660px; }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user