smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of dev.c-base.org:cbmi/cbmi into develop

Browse source
This commit is contained in:
Uwe Kamper 2013-10-25 19:35:51 +02:00
commit 48698d2679
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "static/c-base-bootstrap"]
path = static/c-base-bootstrap
url = git://dev.c-base.org/c-portal/c-portal-bootstrap.git

10
cbmi/templates/base.html
View file

@ -16,8 +16,8 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<link href="/static/css/bootstrap.css" rel="stylesheet"> <link href="/static/c-base-bootstrap/css/bootstrap.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/c-base-bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
<style> <style>
body { body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
@ -119,9 +119,9 @@
</div> </div>
</div><!-- /.container --> </div><!-- /.container -->
{% endblock body %} {% endblock body %}
<script src="/static/js/bootstrap.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<script src="/static/js/bootstrap-transitions.js"></script> <script src="/static/c-base-bootstrap/js/bootstrap.js"></script>
<script src="/static/js/bootstrap-dropdown.js"></script> <script src="/static/c-base-bootstrap/js/bootstrap-transitions.js"></script>
<script src="/static/c-base-bootstrap/js/bootstrap-dropdown.js"></script>
</body> </body>
</html> </html>

1
static/c-base-bootstrap Submodule

@ -0,0 +1 @@
Subproject commit 279f25a00dc1ee300009350a1ddc59963cef0da8