Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2011-07-01 00:51:13 +0400
committerMark Otto <markdotto@gmail.com>2011-07-01 00:51:13 +0400
commitc53e394f71e54359e204f4e5f35eecb93dac65ef (patch)
treecaf7c417e9feb5ea82e06a4ca513f0239eb264f8
parentf725d60a76e6e9cca8e321589ad3d017f38965f4 (diff)
changing stacked forms to be lined up left side w/ 20px
-rw-r--r--bootstrap-1.0.0.css7
-rw-r--r--bootstrap-1.0.0.min.css3
-rw-r--r--docs/assets/js/application.js1
-rw-r--r--docs/index.html24
-rw-r--r--lib/forms.less5
5 files changed, 26 insertions, 14 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index fe3e12fd96..6d5536c05a 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -862,6 +862,9 @@ ul.inputs-list li:first-child {
ul.inputs-list input[type=radio], ul.inputs-list input[type=checkbox] {
margin-bottom: 0;
}
+form.form-stacked {
+ padding-left: 20px;
+}
form.form-stacked fieldset {
padding-top: 9px;
}
@@ -893,6 +896,10 @@ form.form-stacked ul.inputs-list li label {
font-weight: normal;
padding-top: 0;
}
+form.form-stacked div.actions {
+ margin-left: -20px;
+ padding-left: 20px;
+}
/*
* Tables.less
* Tables for, you guessed it, tabular data
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index 9f0df6e35d..23457db919 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -107,11 +107,12 @@ ul.inputs-list li label small{font-size:12px;font-weight:normal;}
ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
ul.inputs-list li:first-child{padding-top:5px;}
ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;}
-form.form-stacked fieldset{padding-top:9px;}
+form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;}
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 div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;}
form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;}
+form.form-stacked div.actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f5f5f5;}
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 3993c353e7..e5cdefdee0 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -34,7 +34,6 @@ $(document).ready(function(){
}
});
-
// Copy code blocks in docs
$(".copy-code").focus(function() {
$(this).select();
diff --git a/docs/index.html b/docs/index.html
index b2f9134145..e7929e8eec 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -397,10 +397,10 @@
<dl>
<dt>Description lists</dt>
<dd>A description list is perfect for defining terms.</dd>
- <dt>Your mom</dt>
+ <dt>Euismod</dt>
<dd>Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
<dd>Donec id elit non mi porta gravida at eget metus.</dd>
- <dt>And your dad</dt>
+ <dt>Malesuada porta</dt>
<dd>Etiam porta sem malesuada magna mollis euismod.</dd>
</dl>
</div>
@@ -446,8 +446,8 @@
<tbody>
<tr>
<td>1</td>
- <td>Your</td>
- <td>Mom</td>
+ <td>Some</td>
+ <td>One</td>
<td>English</td>
</tr>
<tr>
@@ -483,8 +483,8 @@
<tbody>
<tr>
<td>1</td>
- <td>Your</td>
- <td>Mom</td>
+ <td>Some</td>
+ <td>One</td>
<td>English</td>
</tr>
<tr>
@@ -521,7 +521,7 @@
<tr>
<td>1</td>
<td>Your</td>
- <td>Mom</td>
+ <td>One</td>
<td>English</td>
</tr>
<tr>
@@ -856,21 +856,21 @@
<h3><a class="logo" href="">Project Name</a></h3>
<ul>
<li class="active"><a href="">Home</a></li>
- <li><a href="">Profile</a></li>
- <li><a href="">Messages</a></li>
- <li><a href="">Who to Follow</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">Username</a>
+ <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="">Sign Out</a></li>
+ <li><a href="">Another link</a></li>
</ul>
</li>
</ul>
diff --git a/lib/forms.less b/lib/forms.less
index ab82c6a09b..74aa7a4dff 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -291,6 +291,7 @@ ul.inputs-list {
// Stacked forms
form.form-stacked {
+ padding-left: 20px;
fieldset {
padding-top: @baseline / 2;
}
@@ -322,4 +323,8 @@ form.form-stacked {
}
}
}
+ div.actions {
+ margin-left: -20px;
+ padding-left: 20px;
+ }
}