mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-11 16:14:04 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.1.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navs.less
This commit is contained in:
Mark Otto
2012-10-01 11:27:40 -07:00
parent 8da78223ff c6c1ada600
commit e6d6c7a413
7 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
docs/assets/css/bootstrap.css vendored
View File

@@ -73,7 +73,8 @@ img {
-ms-interpolation-mode: bicubic; -ms-interpolation-mode: bicubic;
} }
#map_canvas img { #map_canvas img,
.google-maps img {
max-width: none; max-width: none;
} }
@@ -3385,7 +3386,41 @@ input[type="button"].btn-block {
margin-top: 9px; margin-top: 9px;
} }
<<<<<<< HEAD
.nav .divider { .nav .divider {
=======
.nav-list {
padding-right: 15px;
padding-left: 15px;
margin-bottom: 0;
}
.nav-list > li > a,
.nav-list .nav-header {
margin-right: -15px;
margin-left: -15px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
}
.nav-list > li > a {
padding: 3px 15px;
}
.nav-list > .active > a,
.nav-list > .active > a:hover {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
background-color: #0088cc;
}
.nav-list [class^="icon-"],
.nav-list [class*=" icon-"] {
margin-right: 2px;
}
.nav-list .divider {
*width: 100%;
>>>>>>> 2.1.2-wip
height: 1px; height: 1px;
margin: 9px 1px; margin: 9px 1px;
overflow: hidden; overflow: hidden;

5
docs/assets/css/docs.css
View File

@@ -756,7 +756,7 @@ form.bs-docs-example {
} }
.bs-docs-sidenav > li > a { .bs-docs-sidenav > li > a {
display: block; display: block;
*width: 190px; width: 190px \9;
margin: 0 0 -1px; margin: 0 0 -1px;
padding: 8px 14px; padding: 8px 14px;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
@@ -823,6 +823,9 @@ form.bs-docs-example {
.bs-docs-sidenav { .bs-docs-sidenav {
width: 258px; width: 258px;
} }
.bs-docs-sidenav > li > a {
width: 230px \9; /* Override the previous IE8-9 hack */
}
} }
/* Desktop /* Desktop

37
docs/base-css.html
View File

@@ -873,25 +873,29 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
<h2 id="forms-default">Default styles</h2> <h2 id="forms-default">Default styles</h2>
<p>Individual form controls receive styling, but without any required base class on the <code>&lt;form&gt;</code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.</p> <p>Individual form controls receive styling, but without any required base class on the <code>&lt;form&gt;</code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.</p>
<form class="bs-docs-example"> <form class="bs-docs-example">
<legend>Legend</legend> <fieldset>
<label>Label name</label> <legend>Legend</legend>
<input type="text" placeholder="Type something…"> <label>Label name</label>
<span class="help-block">Example block-level help text here.</span> <input type="text" placeholder="Type something…">
<label class="checkbox"> <span class="help-block">Example block-level help text here.</span>
<input type="checkbox"> Check me out <label class="checkbox">
</label> <input type="checkbox"> Check me out
<button type="submit" class="btn">Submit</button> </label>
<button type="submit" class="btn">Submit</button>
</fieldset>
</form> </form>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;form&gt; &lt;form&gt;
&lt;legend&gt;Legend&lt;/legend&gt; &lt;fieldset&gt;
&lt;label&gt;Label name&lt;/label&gt; &lt;legend&gt;Legend&lt;/legend&gt;
&lt;input type="text" placeholder="Type something…"&gt; &lt;label&gt;Label name&lt;/label&gt;
&lt;span class="help-block"&gt;Example block-level help text here.&lt;/span&gt; &lt;input type="text" placeholder="Type something…"&gt;
&lt;label class="checkbox"&gt; &lt;span class="help-block"&gt;Example block-level help text here.&lt;/span&gt;
&lt;input type="checkbox"&gt; Check me out &lt;label class="checkbox"&gt;
&lt;/label&gt; &lt;input type="checkbox"&gt; Check me out
&lt;button type="submit" class="btn"&gt;Submit&lt;/button&gt; &lt;/label&gt;
&lt;button type="submit" class="btn"&gt;Submit&lt;/button&gt;
&lt;/fieldset&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
@@ -945,7 +949,6 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
<li>Wrap any associated controls in <code>.controls</code> for proper alignment</li> <li>Wrap any associated controls in <code>.controls</code> for proper alignment</li>
</ul> </ul>
<form class="bs-docs-example form-horizontal"> <form class="bs-docs-example form-horizontal">
<legend>Legend</legend>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputEmail">Email</label> <label class="control-label" for="inputEmail">Email</label>
<div class="controls"> <div class="controls">

2
docs/scaffolding.html
View File

@@ -404,7 +404,7 @@
</table> </table>
<h3>When to use</h3> <h3>When to use</h3>
<p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.</p> <p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.</p>
<h3>Responsive utilities test case</h3> <h3>Responsive utilities test case</h3>
<p>Resize your browser or load on different devices to test the above classes.</p> <p>Resize your browser or load on different devices to test the above classes.</p>

37
docs/templates/pages/base-css.mustache vendored
View File

@@ -812,25 +812,29 @@
<h2 id="forms-default">{{_i}}Default styles{{/i}}</h2> <h2 id="forms-default">{{_i}}Default styles{{/i}}</h2>
<p>{{_i}}Individual form controls receive styling, but without any required base class on the <code>&lt;form&gt;</code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}</p> <p>{{_i}}Individual form controls receive styling, but without any required base class on the <code>&lt;form&gt;</code> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.{{/i}}</p>
<form class="bs-docs-example"> <form class="bs-docs-example">
<legend>Legend</legend> <fieldset>
<label>{{_i}}Label name{{/i}}</label> <legend>Legend</legend>
<input type="text" placeholder="{{_i}}Type something…{{/i}}"> <label>{{_i}}Label name{{/i}}</label>
<span class="help-block">{{_i}}Example block-level help text here.{{/i}}</span> <input type="text" placeholder="{{_i}}Type something…{{/i}}">
<label class="checkbox"> <span class="help-block">{{_i}}Example block-level help text here.{{/i}}</span>
<input type="checkbox"> {{_i}}Check me out{{/i}} <label class="checkbox">
</label> <input type="checkbox"> {{_i}}Check me out{{/i}}
<button type="submit" class="btn">{{_i}}Submit{{/i}}</button> </label>
<button type="submit" class="btn">{{_i}}Submit{{/i}}</button>
</fieldset>
</form>{{! /example }} </form>{{! /example }}
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;form&gt; &lt;form&gt;
&lt;legend&gt;{{_i}}Legend{{/i}}&lt;/legend&gt; &lt;fieldset&gt;
&lt;label&gt;{{_i}}Label name{{/i}}&lt;/label&gt; &lt;legend&gt;{{_i}}Legend{{/i}}&lt;/legend&gt;
&lt;input type="text" placeholder="{{_i}}Type something…{{/i}}"&gt; &lt;label&gt;{{_i}}Label name{{/i}}&lt;/label&gt;
&lt;span class="help-block"&gt;Example block-level help text here.&lt;/span&gt; &lt;input type="text" placeholder="{{_i}}Type something…{{/i}}"&gt;
&lt;label class="checkbox"&gt; &lt;span class="help-block"&gt;Example block-level help text here.&lt;/span&gt;
&lt;input type="checkbox"&gt; {{_i}}Check me out{{/i}} &lt;label class="checkbox"&gt;
&lt;/label&gt; &lt;input type="checkbox"&gt; {{_i}}Check me out{{/i}}
&lt;button type="submit" class="btn"&gt;{{_i}}Submit{{/i}}&lt;/button&gt; &lt;/label&gt;
&lt;button type="submit" class="btn"&gt;{{_i}}Submit{{/i}}&lt;/button&gt;
&lt;/fieldset&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
@@ -884,7 +888,6 @@
<li>{{_i}}Wrap any associated controls in <code>.controls</code> for proper alignment{{/i}}</li> <li>{{_i}}Wrap any associated controls in <code>.controls</code> for proper alignment{{/i}}</li>
</ul> </ul>
<form class="bs-docs-example form-horizontal"> <form class="bs-docs-example form-horizontal">
<legend>Legend</legend>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="inputEmail">{{_i}}Email{{/i}}</label> <label class="control-label" for="inputEmail">{{_i}}Email{{/i}}</label>
<div class="controls"> <div class="controls">

2
docs/templates/pages/scaffolding.mustache vendored
View File

@@ -339,7 +339,7 @@
</table> </table>
<h3>{{_i}}When to use{{/i}}</h3> <h3>{{_i}}When to use{{/i}}</h3>
<p>{{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.{{/i}}</p> <p>{{_i}}Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation. Responsive utilities should not be used with tables, and as such are not supported.{{/i}}</p>
<h3>{{_i}}Responsive utilities test case{{/i}}</h3> <h3>{{_i}}Responsive utilities test case{{/i}}</h3>
<p>{{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}</p> <p>{{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}</p>

3
less/reset.less
View File

@@ -83,7 +83,8 @@ img {
} }
// Prevent max-width from affecting Google Maps // Prevent max-width from affecting Google Maps
#map_canvas img { #map_canvas img,
.google-maps img {
max-width: none; max-width: none;
} }