rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity

resolve conflicts

Browse Source
This commit is contained in:
Mark Otto 2011-08-21 20:51:13 -07:00
commit 23ec21d049
7 changed files with 802 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
bootstrap-1.0.0.css vendored
View File

@ -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: Sun Aug 21 20:38:48 PDT 2011
* Date: Sun Aug 21 20:50:48 PDT 2011
*/
/* 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).
@ -121,6 +121,26 @@ aside {
.container:after {
clear: both;
}
/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
display: inline-block;
#gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
padding: @padding;
text-shadow: @textShadow;
color: @textColor;
font-size: @fontSize;
line-height: @baseline;
border: 1px solid;
border-color: #ccc #ccc #bbb;
border-color: borderColor borderColor fadein(@borderColor, 15%);
.border-radius(@borderRadius);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
&:hover {
background-position: 0 -15px;
color: @textColor;
text-decoration: none;
}
}*/
/*
* Scaffolding
* Basic and global styles for generating a grid system, structural layout, and page templates
@ -339,7 +359,7 @@ html, body {
background-color: #fff;
}
body {
margin: 60px 0 0;
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
font-weight: normal;
@ -375,6 +395,7 @@ a {
color: #0069d6;
text-decoration: none;
line-height: inherit;
font-weight: inherit;
}
a:hover {
color: #0050a3;
@ -392,28 +413,24 @@ a:hover {
background-image: linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);
padding: 4px 14px;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
color: #333333;
color: #333;
font-size: 13px;
line-height: 18px;
border: 1px solid;
border-color: #ccc #ccc #bbb;
border-color: borderColor borderColor rgba(0, 0, 0, 0.25);
border: 1px solid #ccc;
border-bottom-color: #bbb;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-webkit-transition: 0.1s linear all;
-moz-transition: 0.1s linear all;
transition: 0.1s linear all;
}
.btn:hover {
background-position: 0 -15px;
color: #333333;
color: #333;
text-decoration: none;
}
.btn.primary {
.primary {
background-color: #0064cd;
background-repeat: repeat-x;
background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
@ -423,6 +440,20 @@ a:hover {
background-image: -webkit-linear-gradient(#049cdb, #0064cd);
background-image: -o-linear-gradient(#049cdb, #0064cd);
background-image: linear-gradient(#049cdb, #0064cd);
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border: 1px solid #004b9a;
border-bottom-color: #003f81;
}
.primary:hover {
color: #fff;
}
.btn {
-webkit-transition: 0.1s linear all;
-moz-transition: 0.1s linear all;
transition: 0.1s linear all;
}
.btn.primary {
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
border-color: #0064cd #0064cd #003f81;
@ -977,6 +1008,13 @@ form.form-stacked .inputs-list li label {
font-weight: normal;
padding-top: 0;
}
form.form-stacked .error {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
margin-top: 0;
margin-left: -10px;
}
form.form-stacked .actions {
margin-left: -20px;
padding-left: 20px;

10
bootstrap-1.0.0.min.css vendored
View File

@ -40,15 +40,16 @@ header,section,footer,article,aside{display:block;}
.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
html,body{background-color:#fff;}
body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
div.container{width:940px;margin:0 auto;}
div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
div.container-fluid:after{clear:both;}
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:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid;border-color:#ccc #ccc #bbb;border-color:borderColor borderColor rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;}
.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
@ -131,6 +132,7 @@ form.form-stacked legend{margin-left:0;}
form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;}
form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
form.form-stacked .error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
form.form-stacked .actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}

34
docs/assets/css/docs.css
View File

@ -44,7 +44,7 @@ section {
font-weight: bold;
}
#masthead {
margin-top: -20px;
margin-top: 40px;
}
#masthead h1,
#masthead p {
@ -146,34 +146,6 @@ div.quickstart form textarea {
.show-grid:hover .column, .show-grid:hover .columns {
background: rgba(0, 0, 0, 0.25);
}
/* Hashgrid.js grid (press G & H to view)
-------------------------------------------------- */
#grid {
width: 980px;
position: absolute;
top: 0;
left: 50%;
margin-left: -490px;
}
#grid div.vert {
background-color: rgba(0, 206, 209, 0.075);
width: 39px;
border: solid darkturquoise;
border-width: 0 1px;
margin-right: 19px;
}
#grid div.vert.first-line {
margin-left: 19px;
}
#grid div.horiz {
height: 19px;
border-bottom: 1px solid rgba(255, 0, 0, 0.1);
margin: 0;
padding: 0;
}
#grid div.horiz:nth-child(5n) {
border-color: rgba(255, 0, 0, 0.25);
}
/* Render mini layout previews
-------------------------------------------------- */
div.mini-layout {
@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body {
width: 450px;
height: 340px;
}
div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-layout-header, div.mini-layout.fluid div.mini-layout-body {
div.mini-layout.fluid div.mini-layout-sidebar,
div.mini-layout.fluid div.mini-layout-header,
div.mini-layout.fluid div.mini-layout-body {
float: left;
}
div.mini-layout.fluid div.mini-layout-sidebar {

123
docs/index.html
View File

@ -31,6 +31,8 @@
<body onload="prettyPrint();">
<!-- Topbar
================================================== -->
<div class="topbar">
<div class="fill">
<div class="container">
@ -52,6 +54,8 @@
</div>
</div>
<!-- Masthead (blueprinty thing)
================================================== -->
<div id="masthead">
<div class="inner">
<div class="container">
@ -65,6 +69,8 @@
</div>
</div>
<!-- Quickstart options
================================================== -->
<div class="quickstart">
<div class="container">
<div class="row">
@ -94,6 +100,10 @@
<div class="container">
<!-- About Bootstrap
================================================== -->
<section id="about">
<div class="page-header">
<h1>About Bootstrap <small>Brief history, browser support, and more</small></h1>
@ -128,6 +138,10 @@
</div> <!-- /row -->
</section>
<!-- Grid system
================================================== -->
<section id="grid-system">
<div class="page-header">
<h1>Grid system <small>Rock the standard 940px or roll your own</small></h1>
@ -230,11 +244,14 @@
<!-- Layouts (Default and fluid)
================================================== -->
<section id="layouts">
<div class="page-header">
<h1>Layouts <small>Basic templates to create webpages</small></h1>
</div>
<!-- Fixed layout -->
<div class="row">
<div class="span4 columns">
<h2>Fixed layout</h2>
@ -252,7 +269,9 @@
&lt;/body&gt;
</pre>
</div>
</div>
</div> <!-- /row -->
<!-- Fluid layout -->
<div class="row">
<div class="span4 columns">
<h2>Fluid layout</h2>
@ -276,16 +295,19 @@
&lt;/body&gt;
</pre>
</div>
</div>
</div> <!-- /row -->
</section>
<!-- Typography
================================================== -->
<section id="typography">
<div class="page-header">
<h1>Typography <small>Headings, paragraphs, lists, and other inline type elements</small></h1>
</div>
<!-- Headings & Paragraph Copy -->
<div class="row">
<div class="span4 columns">
<h2>Headings and copy</h2>
@ -306,6 +328,7 @@
</div>
</div>
<!-- Misc Elements -->
<div class="row">
<div class="span4 columns">
<h2>Misc. elements</h2>
@ -335,8 +358,9 @@
<h3>Abbreviations</h3>
<p>For abbreviations and acronyms, use the <code>&lt;abbr&gt;</code> tag (<code>&lt;acronym&gt;</code> is deprecated in <abbr title="HyperText Markup Langugage 5">HTML5</abbr>). Put the shorthand form within the tag and set a title for the complete name.</p>
</div>
</div>
</div> <!-- /row -->
<!-- Blockquotes -->
<div class="row">
<div class="span4 columns">
<h2>Blockquotes</h2>
@ -353,8 +377,7 @@
<small>Dr. Julius Hibbert</small>
</blockquote>
</div>
</div>
</div> <!-- /row -->
<h2>Lists</h2>
<div class="row">
@ -423,15 +446,18 @@
<dd>Etiam porta sem malesuada magna mollis euismod.</dd>
</dl>
</div>
</div>
</div> <!-- /row -->
</section>
<!-- Tables
================================================== -->
<section id="tables">
<div class="page-header">
<h1>Tables <small>For, you guessed it, tabular data</small></h1>
</div>
<!-- Table structure -->
<div class="row">
<div class="span4 columns">
<h2>Building tables</h2>
@ -486,7 +512,6 @@
&lt;table class="common-table"&gt;
...
&lt;/table&gt;</pre>
<h3>Example: Zebra-striped</h3>
<p>Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.zebra-striped</code> class.</p>
<table class="zebra-striped">
@ -523,7 +548,6 @@
&lt;table class="common-table zebra-striped"&gt;
...
&lt;/table&gt;</pre>
<h3>Example: Zebra-striped w/ TableSorter.js</h3>
<p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column’s header to change the sort.</strong></p>
<table class="zebra-striped" id="sortTableExample">
@ -567,17 +591,17 @@
...
&lt;/table&gt;</pre>
</div>
</div>
</div> <!-- /row -->
</section>
<!-- Forms
================================================== -->
<section id="forms">
<div class="page-header">
<h1>Forms</h1>
</div>
<div class="row">
<div class="span4 columns">
<h2>Default styles</h2>
@ -757,7 +781,7 @@
</fieldset>
</form>
</div>
</div>
</div> <!-- /row -->
<br />
@ -791,6 +815,13 @@
</fieldset>
<fieldset>
<legend>Example form legend</legend>
<div class="clearfix error">
<label for="xlInput">X-Large Input</label>
<div class="input">
<input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
<span class="help-inline">Small snippet of help text</span>
</div>
</div> <!-- /clearfix -->
<div class="clearfix">
<label id="optionsCheckboxes">List of Options</label>
<div class="input">
@ -820,7 +851,7 @@
</div>
</form>
</div>
</div>
</div> <!-- /row -->
<div class="row">
<div class="span4 columns">
@ -832,10 +863,8 @@
<h3>Example buttons</h3>
<p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
<div class="well" style="padding: 14px 19px;">
<form>
<button type="submit" class="btn primary">Submit</button>
<button type="submit" class="btn">Cancel</button>
</form>
</div>
<h3>Alternate sizes</h3>
<p>Fancy larger or smaller buttons? Have at it!</p>
@ -849,7 +878,6 @@
</div>
<h3>Disabled state</h3>
<p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
<p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code>&lt;button&gt;</code> elements as well.
<h4>Links</h4>
<div class="well">
<a href="#" class="btn large primary disabled">Primary action</a>
@ -857,17 +885,17 @@
</div>
<h4>Buttons</h4>
<div class="well">
<form>
<button class="btn large primary disabled" disabled>Primary action</button>
<button class="btn large disabled" disabled>Action</button>
</form>
</div>
<button class="btn large primary" disabled>Primary action</button>
<button class="btn large" disabled>Action</button>
</div>
</div>
</div> <!-- /row -->
</section>
<!-- Navigation
================================================== -->
<section id="navigation">
<div class="page-header">
<h1>Navigation</h1>
@ -875,6 +903,30 @@
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">
<div class="container">
<h3><a href="#">Project Name</a></h3>
<ul>
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
<form action="">
<input type="text" placeholder="Search" />
</form>
<ul class="nav secondary-nav">
<li class="menu">
<a href="#" class="menu">Dropdown</a>
<ul class="menu-dropdown">
<li><a href="#">Secondary link</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Another link</a></li>
</ul>
</li>
</ul>
=======
>>>>>>> .merge_file_ugVE3k
<div class="fill">
<div class="container fixed">
<h3><a href="#">Project Name</a></h3>
@ -959,8 +1011,9 @@
&lt;/ul&gt;
</pre>
</div>
</div>
</div> <!-- /row -->
<!-- Pagination -->
<div class="row">
<div class="span4 columns">
<h2>Pagination</h2>
@ -1022,16 +1075,19 @@
&lt;/div&gt;
</pre>
</div>
</div>
</div> <!-- /row -->
</section>
<!-- Alerts & Messages
================================================== -->
<section id="alerts">
<div class="page-header">
<h1>Alerts &amp; Errors <small>Styles for success, warning, and error messages or alerts</small></h1>
</div>
<!-- Basic alert messages -->
<div class="row">
<div class="span4 columns">
<h2>Basic alerts</h2>
@ -1055,7 +1111,8 @@
<p><strong>Heads up!</strong> This is an alert that needs your attention, but it’s not a huge priority just yet.</p>
</div>
</div>
</div>
</div> <!-- /row -->
<!-- Block messages -->
<div class="row">
<div class="span4 columns">
<h2>Block messages</h2>
@ -1083,10 +1140,12 @@
<p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
</div>
</div>
</div>
</div> <!-- /row -->
</section>
<!-- Popovers
================================================== -->
<section id="popovers">
<div class="page-header">
<h1>Popovers <small>Components for displaying content in modals, tooltips, and popovers</small></h1>
@ -1116,6 +1175,7 @@
</div>
</div> <!-- /row -->
<!-- Tooltips -->
<div class="row">
<div class="span4 columns">
<h2>Tool Tips</h2>
@ -1148,6 +1208,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div>
</div> <!-- /row -->
<!-- Popovers -->
<div class="row">
<div class="span4 columns">
<h2>Popovers</h2>
@ -1165,11 +1226,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div>
</div>
</div>
<<<<<<< HEAD
<img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
=======
<img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
</div>
</div>
</div>
@ -1178,6 +1235,8 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<!-- Using Bootstrap w/ Less
================================================== -->
<section id="less">
<div class="page-header">
<h1>Using Bootstrap with Less <small>Supercharge your CSS with variables, mixins, and functions</small></h1>
@ -1334,6 +1393,8 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div> <!-- /container -->
<div id="footer">
<div class="inner">
<div class="container">

7
lib/forms.less
View File

@ -342,6 +342,13 @@ form.form-stacked {
}
}
}
.error {
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
margin-top: 0;
margin-left: -10px;
}
.actions {
margin-left: -20px;
padding-left: 20px;

8
lib/preboot.less
View File

@ -173,15 +173,15 @@
// CSS3 Content Columns
.content-columns(@columnCount, @columnGap: 20px) {
-webkit-column-count: @columnCount;
-webkit-column-gap: @columnGap;
-moz-column-count: @columnCount;
-moz-column-gap: @columnGap;
column-count: @columnCount;
-webkit-column-gap: @columnGap;
-moz-column-gap: @columnGap;
column-gap: @columnGap;
}
// Buttons
.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
display: inline-block;
#gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
padding: @padding;
@ -200,7 +200,7 @@
color: @textColor;
text-decoration: none;
}
}
}*/
// Add an alphatransparency value to any background or border color (via Elyse Holladay)
#translucent {

37
lib/scaffolding.less
View File

@ -51,7 +51,7 @@ html, body {
background-color: #fff;
}
body {
margin: 60px 0 0; // Add margin to the top of the page for the topbar
margin: 0;
#font > .sans-serif(normal,@basefont,@baseline);
color: @gray;
text-rendering: optimizeLegibility;
@ -87,6 +87,7 @@ a {
color: @linkColor;
text-decoration: none;
line-height: inherit;
font-weight: inherit;
&:hover {
color: @linkColorHover;
text-decoration: underline;
@ -95,10 +96,40 @@ a {
// Buttons
.btn {
.button();
display: inline-block;
#gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
padding: 4px 14px;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
color: #333;
font-size: 13px;
line-height: @baseline;
border: 1px solid #ccc;
border-bottom-color: #bbb;
.border-radius(4px);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
&:hover {
background-position: 0 -15px;
color: #333;
text-decoration: none;
}
}
.primary {
#gradient > .vertical(#049CDB, #0064CD);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border: 1px solid darken(#0064CD, 10%);
border-bottom-color: darken(#0064CD, 15%);
&:hover {
color: #fff;
}
}
.btn {
//.button(#1174C6);
.transition(.1s linear all);
&.primary {
#gradient > .vertical(@blue, @blueDark);
//#gradient > .vertical(@blue, @blueDark);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border-color: @blueDark @blueDark darken(@blueDark, 15%);