Skip to content

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

rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html

parent 588cb1c0
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 91 deletions
Makefile
View file @ 4fb1c5bd
DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap-1.1.1.css
BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
BOOTSTRAP = ./bootstrap-1.2.0.css
BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
......
README.md
View file @ 4fb1c5bd
......@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
Or if you prefer, the standard css way:
<link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
<link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
For more info, refer to the docs!
......
bootstrap-1.1.1.css → bootstrap-1.2.0.css
View file @ 4fb1c5bd
/*!
* Bootstrap v1.1.1
* Bootstrap v1.2.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Aug 30 23:25:32 PDT 2011
* Date: Tue Aug 30 23:30:34 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).
......
docs/index.html
View file @ 4fb1c5bd
......@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
......@@ -78,7 +78,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.1.1.min.css"></textarea>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
</form>
</div>
<div class="span5 columns">
......
examples/hero.html
View file @ 4fb1c5bd
......@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
......@@ -27,7 +27,7 @@
<div class="fill">
<div class="container">
<h3><a href="#">Project name</a></h3>
<ul>
<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>
......
lib/bootstrap.less
View file @ 4fb1c5bd
/*!
* Bootstrap v1.1.1
* Bootstrap v1.2.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
......
templates/fluid.html deleted 100644 → 0
View file @ 588cb1c0
<!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.0.0.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<!-- Le javascript -->
<script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
<script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="assets/js/application.js"></script>
<!-- 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="container-fluid">
<h3><a href="#">Project name</a></h3>
<ul>
<li class="active"><a href="#">Home</a></li>
<li><a href="#grid-system">About</a></li>
<li><a href="#layouts">Contact</a></li>
</ul>
</div>
</div>
<div class="container-fluid">
<!-- Sidebar for navigation and secondary content -->
<div class="sidebar">
<nav class="well">
<ul>
<li><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
</ul>
</nav>
</div> <!-- /sidebar -->
<div class="content">
<!-- Main hero unit for a primary marketing message or call to action -->
<div class="hero-unit">
<h1>Fluid page template</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 btn-large">Learn more &raquo;</a></p>
</div>
<!-- Example row of columns -->
<div class="row">
<div class="span6">
<h2>Heading</h2>
</div>
<div class="span5">
<h2>Heading</h2>
</div>
<div class="span5">
<h2>Heading</h2>
</div>
</div>
</div> <!-- /content -->
</div> <!-- /container -->
</body>
</html>
\ No newline at end of file
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