Permalink
Browse files

Updated Twitter Bootstrap and moved to common directory.

  • Loading branch information...
1 parent f265673 commit 6d504d96d93495ffdf5263b46aa106c8095684c6 unknown committed Jun 2, 2012

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -31,16 +31,16 @@
<title>Xindi</title>
- <link href="assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
- <link href="assets/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
+ <link href="#rc.basehref#common/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+ <link href="#rc.basehref#common/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
<link href="assets/css/smoothness/jquery-ui-1.8.19.custom.css" rel="stylesheet">
<link href="assets/css/core.css?r=#rc.config.revision#" rel="stylesheet">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.9/jquery.validate.min.js" type="text/javascript"></script>
<script src="assets/js/jquery-ui-1.8.19.custom.min.js"></script>
<script src="assets/js/jquery.field.min.js"></script>
- <script src="assets/bootstrap/js/bootstrap.min.js"></script>
+ <script src="#rc.basehref#common/bootstrap/js/bootstrap.min.js"></script>
<script src="assets/ckeditor/ckeditor.js"></script>
<script src="assets/js/core.js?r=#rc.config.revision#"></script>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Deleted file not rendered
Deleted file not rendered

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,7 +1,7 @@
/* import Twitter Bootstrap styles */
-@import url(../bootstrap/css/bootstrap.min.css);
-@import url(../bootstrap/css/bootstrap-responsive.min.css);
+@import url(../../common/bootstrap/css/bootstrap.min.css);
+@import url(../../common/bootstrap/css/bootstrap-responsive.min.css);
/* tag styles */
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.0.3
+ * Bootstrap Responsive v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -683,11 +683,18 @@
body {
padding-top: 0;
}
- .navbar-fixed-top {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
position: static;
+ }
+ .navbar-fixed-top {
margin-bottom: 18px;
}
- .navbar-fixed-top .navbar-inner {
+ .navbar-fixed-bottom {
+ margin-top: 18px;
+ }
+ .navbar-fixed-top .navbar-inner,
+ .navbar-fixed-bottom .navbar-inner {
padding: 5px;
}
.navbar .container {
Oops, something went wrong.

0 comments on commit 6d504d9

Please sign in to comment.