Skip to content
GitLab
Commit 621dd13d authored by Mark Otto's avatar Mark Otto
Browse files

move mega link footer to scaffolding to try it out, fix broken button text... 

move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body
parent 23e5fc21
16 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!985Fix id anchor javascript,!13512.0 wip - relative font sizes,!1315[2.0-wip] Fix mustache glob when building,!1268[wip-2.0] IE 7/8 Typehead JS fix,!12362.0 wip - Fix for issue #1202,!1219Removed dotted outline on navbar dropdown menu,!1210Missing icon class from examples,!1195Fixed display of secondary container,!1090Fixed typo,!1084Default `.border-radius-custom` values,!1064Typo Fix in tables.less,!10572.0 wip,!1052Missing data attribute to close modal,!10212.0 wip
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 8 deletions
+98 -8
bootstrap.css
+ 4
- 3
View file @ 621dd13d
......@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Jan 5 14:10:04 PST 2012
* Date: Thu Jan 5 15:42:23 PST 2012
*/
html, body {
margin: 0;
......@@ -401,7 +401,7 @@ h6 {
text-transform: uppercase;
}
ul, ol {
margin: 13px 0 14px 25px;
margin: 0 0 9px 25px;
}
ul ul,
ul ol,
......@@ -417,7 +417,7 @@ ol {
}
li {
line-height: 18px;
color: #333333;
color: #555555;
}
ul.unstyled {
margin-left: 0;
......@@ -2503,6 +2503,7 @@ i {
.alert-message.info,
.btn.info:hover,
.alert-message.info:hover {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #ffffff;
}
.btn.danger,
......
bootstrap.min.css
+ 3
- 3
View file @ 621dd13d
......@@ -69,11 +69,11 @@ h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
h4{font-size:16px;line-height:36px;}h4 small{font-size:12px;}
h5{font-size:14px;line-height:18px;}
h6{font-size:13px;line-height:18px;color:#999999;text-transform:uppercase;}
ul,ol{margin:13px 0 14px 25px;}
ul,ol{margin:0 0 9px 25px;}
ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
ul{list-style:disc;}
ol{list-style:decimal;}
li{line-height:18px;color:#333333;}
li{line-height:18px;color:#555555;}
ul.unstyled{margin-left:0;list-style:none;}
dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
dl dt{font-weight:bold;}
......@@ -390,7 +390,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.popover .inner{padding:3px;width:280px;overflow:hidden;background-color:#000000;background-color:rgba(0, 0, 0, 0.8);-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);}
.popover .title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
.popover .content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
.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.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{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);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-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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);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-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);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);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);}
......
docs/assets/css/docs.css
+ 22
- 0
View file @ 621dd13d
......@@ -202,6 +202,28 @@ body > .navbar-fixed .brand:hover {
margin-bottom: 0;
color: #555;
}
.footer dl {
margin-bottom: 0;
}
.footer dl dt {
font-size: 11px;
color: #999;
text-transform: uppercase;
}
.footer dl dd + dt {
margin-top: 18px;
}
.footer dl dd {
margin-left: 0;
font-size: 12px;
}
.footer dl a {
color: #999;
}
.footer dl a:hover {
color: #555;
}
/* Special grid styles
......
docs/base-css.html
+ 2
- 0
View file @ 621dd13d
......@@ -802,6 +802,8 @@ Form states
<h3>Flexible markup and styles</h3>
<p>The best part about forms in Bootstrap is that all your inputs and controls look great no matter how you build them in your markup. No superfluous HTML is required, but we provide the patterns for those who require it.</p>
</div>
<div class="span4">
</div>
</div>
......
docs/scaffolding.html
+ 64
- 0
View file @ 621dd13d
......@@ -361,6 +361,70 @@
<!-- Footer
================================================== -->
<footer class="footer">
<div class="row">
<dl class="span2">
<dt>Bootstrap</dt>
<dd><a href="./index.html">Overview</a></dd>
<dd><a href="./index.html#gettingstarted">Getting started</a></dd>
<dt>Elsewhere</dt>
<dd><a href="https://github.com/twitter/bootstrap/">GitHub</a></dd>
<dd><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></dd>
<dd><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></dd>
<dd><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></dd>
</dl>
<dl class="span2">
<dt>Scaffolding</dt>
<dd><a href="./scaffolding.html#grid">Grid system</a></dd>
<dd><a href="./scaffolding.html#layouts">Layouts</a></dd>
<dd><a href="./scaffolding.html#responsive">Responsive design</a></dd>
</dl>
<dl class="span2">
<dt>Base CSS</dt>
<dd><a href="./base-css.html#type">Type</a></dd>
<dd><a href="./base-css.html#tables">Tables</a></dd>
<dd><a href="./base-css.html#forms">Forms</a></dd>
<dd><a href="./base-css.html#buttons">Buttons</a></dd>
<dd><a href="./base-css.html#buttongroups">Button groups</a></dd>
<dd><a href="./base-css.html#icons">Icons</a></dd>
</dl>
<dl class="span2">
<dt>Components</dt>
<dd><a href="./components.html#thumbnails">Thumbnails</a></dd>
<dd><a href="./components.html#autocomplete">Autocomplete</a></dd>
<dd><a href="./components.html#carousel">Carousel</a></dd>
<dd><a href="./components.html#sidenav">Side nav</a></dd>
<dd><a href="./components.html#navbar">Navbar</a></dd>
<dd><a href="./components.html#tabspills">Tabs and pills</a></dd>
<dd><a href="./components.html#stepnav">Step nav</a></dd>
<dd><a href="./components.html#pagination">Pagination</a></dd>
<dd><a href="./components.html#alerts">Alerts and errors</a></dd>
<dd><a href="./components.html#modals">Modals</a></dd>
<dd><a href="./components.html#twipsy">Twipsy tooltips</a></dd>
<dd><a href="./components.html#popover">Popovers</a></dd>
</dl>
<dl class="span2">
<dt>Javascript plugins</dt>
<dd><a href="">Transitions</a></dd>
<dd><a href="./javasript.html#modals">Modals</a></dd>
<dd><a href="./javasript.html#dropdowns">Dropdowns</a></dd>
<dd><a href="./javasript.html#scrollspy">Scrollspy</a></dd>
<dd><a href="./javasript.html#tabs">Tabs</a></dd>
<dd><a href="./javasript.html#twipsy">Twipsy tooltips</a></dd>
<dd><a href="./javasript.html#popovers">Popovers</a></dd>
<dd><a href="./javasript.html#alerts">Alerts</a></dd>
<dd><a href="./javasript.html#buttons">Buttons</a></dd>
<dd><a href="./javasript.html#accordion">Accordion</a></dd>
<dd><a href="./javasript.html#carousel">Carousel</a></dd>
</dl>
<dl class="span2">
<dt>Using LESS</dt>
<dd><a href="./less.html#intro">Introduction to LESS</a></dd>
<dd><a href="./less.html#variables">Variables</a></dd>
<dd><a href="./less.html#mixins">Mixins</a></dd>
<dd><a href="./less.html#compiling">Compiling Bootstrap</a></dd>
</dl>
</div>
<hr>
<p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
......
lib/buttons.less
+ 1
- 0
View file @ 621dd13d
......@@ -13,6 +13,7 @@
&.success:hover,
&.info,
&.info:hover {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white
}
// Danger and error appear as red
......
lib/type.less
+ 2
- 2
View file @ 621dd13d
......@@ -74,7 +74,7 @@ h6 {
// Unordered and Ordered lists
ul, ol {
margin: 13px 0 14px 25px;
margin: 0 0 @baseLineHeight / 2 25px;
}
ul ul,
ul ol,
......@@ -90,7 +90,7 @@ ol {
}
li {
line-height: @baseLineHeight;
color: @grayDark;
color: @gray;
}
ul.unstyled {
margin-left: 0;
......
Supports Markdown
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