Skip to content

B
bootstrap
Commit cf23dc4f authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

parents 2883888a 168551cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 69 deletions
bootstrap-1.2.0.css
View file @ cf23dc4f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Sep 2 21:06:46 PDT 2011 * Date: Fri Sep 2 23:08:36 PDT 2011
*/ */
/* Reset.less /* 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). * 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).
...@@ -185,17 +185,18 @@ textarea { ...@@ -185,17 +185,18 @@ textarea {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.container { .fixed-container {
width: 940px; width: 940px;
margin: 0 auto; margin-left: auto;
margin-right: auto;
zoom: 1; zoom: 1;
margin-bottom: 18px; margin-bottom: 18px;
} }
.container:before, .container:after { .fixed-container:before, .fixed-container:after {
display: table; display: table;
content: ""; content: "";
} }
.container:after { .fixed-container:after {
clear: both; clear: both;
} }
.btn.danger, .btn.danger,
...@@ -396,6 +397,15 @@ body { ...@@ -396,6 +397,15 @@ body {
width: 940px; width: 940px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
zoom: 1;
margin-bottom: 18px;
}
.container:before, .container:after {
display: table;
content: "";
}
.container:after {
clear: both;
} }
.container-fluid { .container-fluid {
padding-left: 20px; padding-left: 20px;
...@@ -435,6 +445,12 @@ a:hover { ...@@ -435,6 +445,12 @@ a:hover {
color: #0050a3; color: #0050a3;
text-decoration: underline; text-decoration: underline;
} }
.pull-right {
float: right;
}
.pull-left {
float: left;
}
/* Typography.less /* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system * Headings, body text, lists, code, and more for a versatile and durable typography system
* ---------------------------------------------------------------------------------------- */ * ---------------------------------------------------------------------------------------- */
...@@ -713,12 +729,13 @@ textarea { ...@@ -713,12 +729,13 @@ textarea {
height: auto; height: auto;
} }
.uneditable-input { .uneditable-input {
background-color: #eee; background-color: #fff;
display: block; display: block;
border-color: #ccc; border-color: #eee;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
cursor: not-allowed;
} }
:-moz-placeholder { :-moz-placeholder {
color: #bfbfbf; color: #bfbfbf;
...@@ -736,7 +753,7 @@ input, select, textarea { ...@@ -736,7 +753,7 @@ input, select, textarea {
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
} }
input:focus, textarea:focus { input:focus, select:focus, textarea:focus {
outline: none; outline: none;
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
...@@ -808,14 +825,17 @@ select.xxlarge { ...@@ -808,14 +825,17 @@ select.xxlarge {
width: 530px; width: 530px;
} }
textarea.xxlarge { textarea.xxlarge {
overflow-y: scroll; overflow-y: auto;
} }
input[readonly]:focus, textarea[readonly]:focus, input.disabled { input[disabled],
background: #f5f5f5; select[disabled],
textarea[disabled],
input[readonly],
select[readonly],
textarea[readonly] {
background-color: #f5f5f5;
border-color: #ddd; border-color: #ddd;
-webkit-box-shadow: none; cursor: not-allowed;
-moz-box-shadow: none;
box-shadow: none;
} }
.actions { .actions {
background: #f5f5f5; background: #f5f5f5;
...@@ -1145,6 +1165,13 @@ table .headerSortUp.purple, table .headerSortDown.purple { ...@@ -1145,6 +1165,13 @@ table .headerSortUp.purple, table .headerSortDown.purple {
font-weight: 200; font-weight: 200;
line-height: 1; line-height: 1;
} }
.topbar p {
margin: 0;
line-height: 40px;
}
.topbar p a:hover {
background-color: transparent;
}
.topbar form { .topbar form {
float: left; float: left;
margin: 5px 0 0 0; margin: 5px 0 0 0;
...@@ -1446,6 +1473,7 @@ a.menu:after, .dropdown-toggle:after { ...@@ -1446,6 +1473,7 @@ a.menu:after, .dropdown-toggle:after {
display: block; display: block;
} }
.tabs { .tabs {
float: left;
width: 100%; width: 100%;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
...@@ -1510,7 +1538,6 @@ a.menu:after, .dropdown-toggle:after { ...@@ -1510,7 +1538,6 @@ a.menu:after, .dropdown-toggle:after {
} }
.hero-unit { .hero-unit {
background-color: #f5f5f5; background-color: #f5f5f5;
margin-top: 60px;
margin-bottom: 30px; margin-bottom: 30px;
padding: 60px; padding: 60px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
......
bootstrap-1.2.0.min.css
View file @ cf23dc4f
This diff is collapsed.
docs/index.html
View file @ cf23dc4f
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
<fieldset> <fieldset>
<legend>Example form legend</legend> <legend>Example form legend</legend>
<div class="clearfix"> <div class="clearfix">
<label for="xlInput">X-Large Input</label> <label for="xlInput">X-Large input</label>
<div class="input"> <div class="input">
<input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" /> <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
</div> </div>
...@@ -652,19 +652,25 @@ ...@@ -652,19 +652,25 @@
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label>Uneditable Input</label> <label>Uneditable input</label>
<div class="input"> <div class="input">
<span class="uneditable-input">Some Value Here</span> <span class="uneditable-input">Some value here</span>
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label for="disabledInput">Disabled Input</label> <label for="disabledInput">Disabled input</label>
<div class="input"> <div class="input">
<input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here… carry on." disabled /> <input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here… carry on." disabled />
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix">
<label for="disabledInput">Disabled textarea</label>
<div class="input">
<textarea class="xxlarge" name="textarea" id="textarea" rows="3" disabled></textarea>
</div>
</div><!-- /clearfix -->
<div class="clearfix error"> <div class="clearfix error">
<label for="xlInput2">X-Large Input</label> <label for="xlInput2">X-Large input</label>
<div class="input"> <div class="input">
<input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" /> <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
<span class="help-inline">Small snippet of help text</span> <span class="help-inline">Small snippet of help text</span>
...@@ -674,7 +680,7 @@ ...@@ -674,7 +680,7 @@
<fieldset> <fieldset>
<legend>Example form legend</legend> <legend>Example form legend</legend>
<div class="clearfix"> <div class="clearfix">
<label for="prependedInput">Prepended Text</label> <label for="prependedInput">Prepended text</label>
<div class="input"> <div class="input">
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on">@</span> <span class="add-on">@</span>
...@@ -683,7 +689,7 @@ ...@@ -683,7 +689,7 @@
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label for="prependedInput2">Prepended Checkbox</label> <label for="prependedInput2">Prepended checkbox</label>
<div class="input"> <div class="input">
<div class="input-prepend"> <div class="input-prepend">
<label class="add-on"><input type="checkbox" name="" id="" value="" /></label> <label class="add-on"><input type="checkbox" name="" id="" value="" /></label>
...@@ -692,7 +698,7 @@ ...@@ -692,7 +698,7 @@
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label for="appendedInput">Appended Checkbox</label> <label for="appendedInput">Appended checkbox</label>
<div class="input"> <div class="input">
<div class="input-append"> <div class="input-append">
<input class="mini" id="appendedInput" name="appendedInput" size="16" type="text" /> <input class="mini" id="appendedInput" name="appendedInput" size="16" type="text" />
...@@ -701,7 +707,7 @@ ...@@ -701,7 +707,7 @@
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label for="fileInput">File Input</label> <label for="fileInput">File input</label>
<div class="input"> <div class="input">
<input class="input-file" id="fileInput" name="fileInput" type="file" /> <input class="input-file" id="fileInput" name="fileInput" type="file" />
</div> </div>
...@@ -710,7 +716,7 @@ ...@@ -710,7 +716,7 @@
<fieldset> <fieldset>
<legend>Example form legend</legend> <legend>Example form legend</legend>
<div class="clearfix"> <div class="clearfix">
<label id="optionsCheckboxes">List of Options</label> <label id="optionsCheckboxes">List of options</label>
<div class="input"> <div class="input">
<ul class="inputs-list"> <ul class="inputs-list">
<li> <li>
...@@ -744,7 +750,7 @@ ...@@ -744,7 +750,7 @@
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label>Date Range</label> <label>Date range</label>
<div class="input"> <div class="input">
<div class="inline-inputs"> <div class="inline-inputs">
<input class="small" type="text" value="May 1, 2011" /> <input class="small" type="text" value="May 1, 2011" />
...@@ -759,14 +765,14 @@ ...@@ -759,14 +765,14 @@
<div class="clearfix"> <div class="clearfix">
<label for="textarea">Textarea</label> <label for="textarea">Textarea</label>
<div class="input"> <div class="input">
<textarea class="xxlarge" id="textarea" name="textarea"></textarea> <textarea class="xxlarge" id="textarea2" name="textarea2" rows="3"></textarea>
<span class="help-block"> <span class="help-block">
Block of help text to describe the field above if need be. Block of help text to describe the field above if need be.
</span> </span>
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label id="optionsRadio">List of Options</label> <label id="optionsRadio">List of options</label>
<div class="input"> <div class="input">
<ul class="inputs-list"> <ul class="inputs-list">
<li> <li>
...@@ -785,7 +791,7 @@ ...@@ -785,7 +791,7 @@
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="actions"> <div class="actions">
<input type="submit" class="btn primary" value="Save Changes">&nbsp;<button type="reset" class="btn">Cancel</button> <input type="submit" class="btn primary" value="Save changes">&nbsp;<button type="reset" class="btn">Cancel</button>
</div> </div>
</fieldset> </fieldset>
</form> </form>
...@@ -804,7 +810,7 @@ ...@@ -804,7 +810,7 @@
<fieldset> <fieldset>
<legend>Example form legend</legend> <legend>Example form legend</legend>
<div class="clearfix"> <div class="clearfix">
<label for="xlInput3">X-Large Input</label> <label for="xlInput3">X-Large input</label>
<div class="input"> <div class="input">
<input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" /> <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" />
</div> </div>
...@@ -825,14 +831,14 @@ ...@@ -825,14 +831,14 @@
<fieldset> <fieldset>
<legend>Example form legend</legend> <legend>Example form legend</legend>
<div class="clearfix error"> <div class="clearfix error">
<label for="xlInput4">X-Large Input</label> <label for="xlInput4">X-Large input</label>
<div class="input"> <div class="input">
<input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" /> <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" />
<span class="help-inline">Small snippet of help text</span> <span class="help-inline">Small snippet of help text</span>
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label id="optionsCheckboxes">List of Options</label> <label id="optionsCheckboxes">List of options</label>
<div class="input"> <div class="input">
<ul class="inputs-list"> <ul class="inputs-list">
<li> <li>
...@@ -855,7 +861,7 @@ ...@@ -855,7 +861,7 @@
</div><!-- /clearfix --> </div><!-- /clearfix -->
</fieldset> </fieldset>
<div class="actions"> <div class="actions">
<button type="submit" class="btn primary">Save Changes</button>&nbsp;<button type="reset" class="btn">Cancel</button> <button type="submit" class="btn primary">Save changes</button>&nbsp;<button type="reset" class="btn">Cancel</button>
</div> </div>
</form> </form>
</div> </div>
......
examples/fluid.html 0 → 100644
View file @ cf23dc4f
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Bootstrap, from Twitter</title>
<meta name="description" content="">
<meta name="author" content="">
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
}
</style>
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
</head>
<body>
<div class="topbar">
<div class="topbar-inner">
<div class="container-fluid">
<h3><a href="#">Project name</a></h3>
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
</ul>
<p class="pull-right">Logged in as <a href="#">username</a></p>
</div>
</div>
</div>
<div class="container-fluid">
<div class="sidebar">
<div class="well">
<h5>Sidebar</h5>
<ul>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
<h5>Sidebar</h5>
<ul>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
<h5>Sidebar</h5>
<ul>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
</ul>
</div>
</div>
<div class="content">
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="hero-unit">
<h1>Hello, world!</h1>
<p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
<p><a class="btn primary large">Learn more &raquo;</a></p>
</div>
<!-- Example row of columns -->
<div class="row">
<div class="span6">
<h2>Heading</h2>
<p>Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span5">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span5">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
</div>
<footer>
<p>&copy; Company 2011</p>
</footer>
</div>
</div>
</body>
</html>
\ No newline at end of file
examples/hero.html
View file @ cf23dc4f
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
<!-- Le styles --> <!-- Le styles -->
<link href="../bootstrap-1.2.0.css" rel="stylesheet"> <link href="../bootstrap-1.2.0.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 60px;
}
</style>
<!-- Le fav and touch icons --> <!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico"> <link rel="shortcut icon" href="images/favicon.ico">
......
lib/forms.less
View file @ cf23dc4f
...@@ -113,11 +113,13 @@ textarea { ...@@ -113,11 +113,13 @@ textarea {
height: auto; height: auto;
} }
// For text that needs to appear as an input but should not be an input
.uneditable-input { .uneditable-input {
background-color: #eee; background-color: #fff;
display: block; display: block;
border-color: #ccc; border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.075)); .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
cursor: not-allowed;
} }
// Placeholder text gets special styles; can't be bundled together though for some reason // Placeholder text gets special styles; can't be bundled together though for some reason
...@@ -130,12 +132,14 @@ textarea { ...@@ -130,12 +132,14 @@ textarea {
// Focus states // Focus states
input, input,
select, textarea { select,
textarea {
@transition: border linear .2s, box-shadow linear .2s; @transition: border linear .2s, box-shadow linear .2s;
.transition(@transition); .transition(@transition);
.box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
} }
input:focus, input:focus,
select:focus,
textarea:focus { textarea:focus {
outline: none; outline: none;
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
...@@ -175,35 +179,56 @@ form div.error { ...@@ -175,35 +179,56 @@ form div.error {
} }
// Form element sizes // Form element sizes
.input-mini, input.mini, textarea.mini, select.mini { .input-mini,
input.mini,
textarea.mini,
select.mini {
width: 60px; width: 60px;
} }
.input-small, input.small, textarea.small, select.small { .input-small,
input.small,
textarea.small,
select.small {
width: 90px; width: 90px;
} }
.input-medium, input.medium, textarea.medium, select.medium { .input-medium,
input.medium,
textarea.medium,
select.medium {
width: 150px; width: 150px;
} }
.input-large, input.large, textarea.large, select.large { .input-large,
input.large,
textarea.large,
select.large {
width: 210px; width: 210px;
} }
.input-xlarge, input.xlarge, textarea.xlarge, select.xlarge { .input-xlarge,
input.xlarge,
textarea.xlarge,
select.xlarge {
width: 270px; width: 270px;
} }
.input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge { .input-xxlarge,
input.xxlarge,
textarea.xxlarge,
select.xxlarge {
width: 530px; width: 530px;
} }
textarea.xxlarge { textarea.xxlarge {
overflow-y: scroll; overflow-y: auto;
} }
// Turn off focus for disabled (read-only) form elements // Disabled and read-only inputs
input[readonly]:focus, input[disabled],
textarea[readonly]:focus, select[disabled],
input.disabled { textarea[disabled],
background: #f5f5f5; input[readonly],
select[readonly],
textarea[readonly] {
background-color: #f5f5f5;
border-color: #ddd; border-color: #ddd;
.box-shadow(none); cursor: not-allowed;
} }
// Actions (the buttons) // Actions (the buttons)
......
lib/patterns.less
View file @ cf23dc4f
...@@ -46,6 +46,15 @@ ...@@ -46,6 +46,15 @@
} }
} }
// Plain text in topbar
p {
margin: 0;
line-height: 40px;
a:hover {
background-color: transparent;
}
}
// Search Form // Search Form
form { form {
float: left; float: left;
...@@ -312,6 +321,7 @@ a.menu:after, ...@@ -312,6 +321,7 @@ a.menu:after,
// Basic Tabs // Basic Tabs
.tabs { .tabs {
float: left;
width: 100%; width: 100%;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
> li { > li {
...@@ -385,7 +395,6 @@ a.menu:after, ...@@ -385,7 +395,6 @@ a.menu:after,
.hero-unit { .hero-unit {
background-color: #f5f5f5; background-color: #f5f5f5;
margin-top: 60px;
margin-bottom: 30px; margin-bottom: 30px;
padding: 60px; padding: 60px;
.border-radius(6px); .border-radius(6px);
......
lib/preboot.less
View file @ cf23dc4f
...@@ -121,9 +121,10 @@ ...@@ -121,9 +121,10 @@
} }
// Grid System // Grid System
.container { .fixed-container {
width: @siteWidth; width: @siteWidth;
margin: 0 auto; margin-left: auto;
margin-right: auto;
.clearfix(); .clearfix();
} }
.columns(@columnSpan: 1) { .columns(@columnSpan: 1) {
......
lib/scaffolding.less
View file @ cf23dc4f
...@@ -73,9 +73,7 @@ body { ...@@ -73,9 +73,7 @@ body {
// Container (centered, fixed-width layouts) // Container (centered, fixed-width layouts)
.container { .container {
width: @siteWidth; .fixed-container();
margin-left: auto;
margin-right: auto;
} }
// Fluid layouts (left aligned, with sidebar, min- & max-width content) // Fluid layouts (left aligned, with sidebar, min- & max-width content)
...@@ -103,6 +101,7 @@ body { ...@@ -103,6 +101,7 @@ body {
display: block; display: block;
} }
// BASE STYLES // BASE STYLES
// ----------- // -----------
...@@ -117,3 +116,11 @@ a { ...@@ -117,3 +116,11 @@ a {
text-decoration: underline; text-decoration: underline;
} }
} }
// Quick floats
.pull-right {
float: right;
}
.pull-left {
float: left;
}
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