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

fixing conflict and recompiling

Browse Source
This commit is contained in:
Mark Otto
2011-09-16 09:47:36 -07:00
parent b188c0da8b d1b594db7a
commit 8ff18a9ffc
18 changed files with 61 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/assets/css/docs.css
View File

@@ -184,8 +184,8 @@ section > .row {
margin-bottom: 10px;
}
.show-grid [class*="span"] {
background-color: #eee;
background-color: rgba(0,0,0,.1);
background: #eee;
background: rgba(0,0,0,.1);
text-align: center;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -194,8 +194,8 @@ section > .row {
line-height: 30px;
}
.show-grid:hover [class*="span"] {
background-color: #ddd;
background-color: rgba(0,0,0,.2);
background: #ddd;
background: rgba(0,0,0,.2);
}
.show-grid .show-grid {
margin-top: 0;

2
docs/assets/js/application.js
View File

@@ -36,7 +36,7 @@ $(document).ready(function(){
// POSITION STATIC TWIPSIES
// ========================
$(window).load(function () {
$(window).bind( 'load resize', function () {
$(".twipsies a").each(function () {
$(this)
.twipsy({

18
docs/index.html
View File

@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -37,7 +37,7 @@
<!-- Topbar
================================================== -->
<div class="topbar" data-scrollspy="x" >
<div class="topbar" data-scrollspy="scrollspy" >
<div class="topbar-inner">
<div class="container">
<a class="brand" href="#">Bootstrap</a>
@@ -84,7 +84,7 @@
<h6>Hotlink the CSS</h6>
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
<form>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.3.0.min.css"></textarea>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
</form>
</div>
<div class="span5">
@@ -128,7 +128,7 @@
<div class="span-one-third">
<h3>Browser support</h3>
<p>Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.</p>
<img src="assets/img/browsers.png" width="258px" height="48px" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
<img src="assets/img/browsers.png" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
<ul>
<li>Latest Safari</li>
<li>Latest Google Chrome</li>
@@ -143,7 +143,7 @@
<ul>
<li><span class="label">New in 1.3</span> <a href="./javascript.html">Javascript plugins</a></li>
<li>All original .less files</li>
<li>Fully <a href="../bootstrap-1.3.0.css">compiled</a> and <a href="../bootstrap-1.3.0.min.css">minified</a> CSS</li>
<li>Fully <a href="../bootstrap.css">compiled</a> and <a href="../bootstrap.min.css">minified</a> CSS</li>
<li>Complete styleguide documentation</li>
<li>Three example pages with different layouts</li>
</ul>
@@ -1303,7 +1303,7 @@
</div>
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar" data-dropdown="x" >
<div class="topbar" data-dropdown="dropdown" >
<div class="topbar-inner">
<div class="container">
<h3><a href="#">Project Name</a></h3>
@@ -1372,7 +1372,7 @@
<li><a href="#">Messages</a></li>
<li><a href="#">Settings</a></li>
<li><a href="#">Contact</a></li>
<li class="dropdown" data-dropdown="x">
<li class="dropdown" data-dropdown="dropdown">
<a href="#" class="dropdown-toggle">Dropdown</a>
<ul class="dropdown-menu">
<li><a href="#">Secondary link</a></li>
@@ -1682,7 +1682,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div>
</div>
</div>
<img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
<img class="large-bird" src="assets/img/bird.png" >
</div>
</div>
</div>
@@ -1896,7 +1896,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
<td>Command line</td>
<td>
<p>If you already have the less command line tool installed, simply run the following command:</p>
<pre>$ lessc ./lib/bootstrap.less > bootstrap-1.3.0.css</pre>
<pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
<p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
</td>
</tr>

18
docs/javascript.html
View File

@@ -24,7 +24,7 @@
<script src="../js/bootstrap-tabs.js"></script>
<!-- Le styles -->
<link href="../bootstrap-1.3.0.css" rel="stylesheet">
<link href="../bootstrap.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -39,7 +39,7 @@
<!-- Topbar
================================================== -->
<div class="topbar" data-scrollspy="x" >
<div class="topbar" data-scrollspy="scrollspy" >
<div class="fill">
<div class="container">
<h3><a href="#">Bootstrap JS</a></h3>
@@ -221,7 +221,7 @@ $('#my-modal').bind('hidden', function () {
<pre class="prettyprint linenums">
&lt;ul class="tabs"&gt;
&lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
&lt;li class="dropdown" data-dropdown="x" &gt;
&lt;li class="dropdown" data-dropdown="dropdown" &gt;
&lt;a href="#" class="dropdown-toggle"&gt;Dropdown&lt;/a&gt;
&lt;ul class="dropdown-menu"&gt;
&lt;li&gt;&lt;a href="#"&gt;Secondary link&lt;/a&gt;&lt;/li&gt;
@@ -239,7 +239,7 @@ $('#my-modal').bind('hidden', function () {
</p>
<h3>Demo</h3>
<div class="topbar-wrapper">
<div id="topbar-example" class="topbar" data-dropdown="x">
<div id="topbar-example" class="topbar" data-dropdown="dropdown">
<div class="topbar-inner">
<div class="container">
<h3><a href="#">Project Name</a></h3>
@@ -295,7 +295,7 @@ $('#my-modal').bind('hidden', function () {
<pre class="prettyprint linenums">$('#topbar').dropdown()</pre>
<h3>Markup</h3>
<p>To easily add scrollspy behavior to your nav, just add the <code>data-scrollspy</code> attribute to the <code>.topbar</code>.
<pre class="prettyprint linenums">&lt;div class="topbar" data-scrollspy="x" &gt;...&lt;/div&gt;</pre>
<pre class="prettyprint linenums">&lt;div class="topbar" data-scrollspy="scrollspy" &gt;...&lt;/div&gt;</pre>
<h3>Methods</h3>
<h4>$().scrollspy()</h4>
<p>
@@ -330,7 +330,7 @@ $('#my-modal').bind('hidden', function () {
<pre class="prettyprint linenums">$('.tabs').tabs()</pre>
<h3>Markup</h3>
<p>You can activate a tab or pill navigation without writing any javascript by simply giving them a <code>data-tabs</code> or <code>data-pills</code> attribute.</p>
<pre class="prettyprint linenums"> &lt;ul class="tabs" data-tabs="x" &gt;...&lt;/ul&gt;</pre>
<pre class="prettyprint linenums"> &lt;ul class="tabs" data-tabs="tabs" &gt;...&lt;/ul&gt;</pre>
<h3>Methods</h3>
<h4>$().tabs or $().pills</h4>
<p>
@@ -358,7 +358,7 @@ $('#my-modal').bind('hidden', function () {
&lt;/script&gt;</pre>
</p>
<h3>Demo</h3>
<ul class="tabs" data-tabs="x" >
<ul class="tabs" data-tabs="tabs" >
<li class="active"><a href="#home">Home</a></li>
<li><a href="#profile">Profile</a></li>
<li><a href="#messages">Messages</a></li>
@@ -644,11 +644,11 @@ $('#my-modal').bind('hidden', function () {
<p>Closes an alert.</p>
<pre class="prettyprint linenums">$(".alert-message").alert('close')</pre>
<h3>Demo</h3>
<div class="alert-message warning fade in" data-alert="x" >
<div class="alert-message warning fade in" data-alert="alert" >
<a class="close" href="#">&times;</a>
<p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
</div>
<div class="alert-message block-message error fade in" data-alert="x" >
<div class="alert-message block-message error fade in" data-alert="alert" >
<a class="close" href="#">&times;</a>
<p><strong>Oh snap! You got an error!</strong> Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
<div class="alert-actions">