Skip to content
GitLab
Commit 41242b5c authored by Jacob Thornton's avatar Jacob Thornton
Browse files

more js chagnes

parent 0e13f8dc
1 merge request!1631.3 wip
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 58 deletions
+8 -58
bootstrap-1.2.0.css
+ 1
- 5
View file @ 41242b5c
......@@ -6,11 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
<<<<<<< HEAD:bootstrap-1.1.1.css
* Date: Sun Aug 28 17:50:10 PDT 2011
=======
* Date: Fri Sep 2 15:07:03 PDT 2011
>>>>>>> 2589c0ac4ecc86feed81cfc5df344e0eb78cda64:bootstrap-1.2.0.css
* Date: Fri Sep 2 21:04:38 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).
......
bootstrap-1.2.0.min.css
+ 6
- 52
View file @ 41242b5c
This diff is collapsed.
examples/javascript.html
+ 1
- 1
View file @ 41242b5c
......@@ -22,7 +22,7 @@
<script src="assets/js/bootstrap-dropdown.js"></script>
<!-- Le styles -->
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<link href="assets/css/bootstrap-js.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
......
Supports Markdown
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