You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/10/06 10:45:39 UTC
svn commit: r1529602 - /isis/site/trunk/templates/isis-template.html
Author: danhaywood
Date: Sun Oct 6 08:45:39 2013
New Revision: 1529602
URL: http://svn.apache.org/r1529602
Log:
to bootstrap3
Modified:
isis/site/trunk/templates/isis-template.html
Modified: isis/site/trunk/templates/isis-template.html
URL: http://svn.apache.org/viewvc/isis/site/trunk/templates/isis-template.html?rev=1529602&r1=1529601&r2=1529602&view=diff
==============================================================================
--- isis/site/trunk/templates/isis-template.html (original)
+++ isis/site/trunk/templates/isis-template.html Sun Oct 6 08:45:39 2013
@@ -97,7 +97,7 @@
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
}
- div.isis-tweak form {
+ div.XXXisis-tweak form {
margin-top: 6px;
margin-bottom: -2px;
}
@@ -106,13 +106,11 @@
border-top: 1px solid #eeeeee;
}
-
.container {
width: 940px;
}
</style>
<!--
-
<DISABLEDscript type="text/javascript">
function fbshare () {
window.open(
@@ -137,45 +135,18 @@
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="{{base}}images/favicon.ico">
- <!--
- <link rel="apple-touch-icon" href="{{base}}images/apple-touch-icon.png">
- <link rel="apple-touch-icon" sizes="72x72" href="{{base}}images/apple-touch-icon-72x72.png">
- <link rel="apple-touch-icon" sizes="114x114" href="{{base}}images/apple-touch-icon-114x114.png">
- -->
<script src="{{base}}javascript/prettify.js" type="text/javascript"></script>
- <!--
- <script src="{{base}}javascript/jquery-latest.js"></script>
- -->
<script src="//code.jquery.com/jquery.js"></script>
+ <script src="{{base}}javascript/prettyprint.js"></script>
+ <script src="{{base}}bootstrap-3.0.0/js/bootstrap.js"></script>
<script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
<!--
<DISABLEDscript src="{{base}}javascript/common.js"></DISABLEDscript>
-->
- <script src="{{base}}javascript/prettyprint.js"></script>
-
- <script src="{{base}}bootstrap-3.0.0/js/bootstrap.js"></script>
- <!--
- <script src="{{base}}javascript/bootstrap-alert.js"></script>
- <script src="{{base}}javascript/bootstrap-dropdown.js"></script>
- <script src="{{base}}javascript/bootstrap-tooltip.js"></script>
- <script src="{{base}}javascript/bootstrap-modal.js"></script>
- <script src="{{base}}javascript/bootstrap-transition.js"></script>
- <script src="{{base}}javascript/bootstrap-button.js"></script>
- <script src="{{base}}javascript/bootstrap-popover.js"></script>
- <script src="{{base}}javascript/bootstrap-scrollspy.js"></script>
- <script src="{{base}}javascript/bootstrap-typeahead.js"></script>
- <script src="{{base}}javascript/bootstrap-carousel.js"></script>
- <script src="{{base}}javascript/bootstrap-tab.js"></script>
- <script src="{{base}}javascript/bootstrap-collapse.js"></script>
- -->
-
- <!--
- <script src="{{base}}javascript/bootstrap-alerts.js"></script>
- -->
{% if headers.atom %}<link rel="alternate" href="{{ headers.atom.url }}" type="application/atom+xml" title="{{ headers.atom.title }}" />{% endif %}
{% if headers.base %}<base href="{{ headers.base }}" />{% endif %}
@@ -186,15 +157,12 @@
$().dropdown()
</script>
- <!-- GAQ stuff removed here -->
-
-
</head>
<body>
- <div class="container">
- <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+ <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+ <div class="container">
<a class="navbar-brand" href="{{base}}index.html">Apache Isis™</a>
<ul class="nav navbar-nav">
<li class="dropdown">
@@ -244,8 +212,10 @@
</div>
</FORM>
- </nav>
+ </div>
+ </nav>
+ <div class="container">
<div class="markdown-content">
{% block content %}{{ content|markdown }}{% endblock %}
</div>