martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Responsive :)

Browse Source 
- Android routenplaner support
This commit is contained in:
Martin Bauer
2013-11-10 20:47:05 +01:00
parent 81120ab385
commit c693b7b1e5
19 changed files with 313 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/static/css/bootstrap-responsive.css vendored
View File

@@ -1,11 +1,11 @@
/*!
* Bootstrap Responsive v2.3.2
*
* Copyright 2012 Twitter, Inc
* Copyright 2013 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.
* Designed and built with all the love in the world by @mdo and @fat.
*/
.clearfix {

4
website/static/css/bootstrap-responsive.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
website/static/css/bootstrap.css vendored
View File

@@ -1,11 +1,11 @@
/*!
* Bootstrap v2.3.2
*
* Copyright 2012 Twitter, Inc
* Copyright 2013 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.
* Designed and built with all the love in the world by @mdo and @fat.
*/
.clearfix {

4
website/static/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

15
website/static/css/coming-soon.css
View File

@@ -136,16 +136,15 @@
display: inline-block;
}
#coming_soon .count .circle{
background: rgba(0,0,0,0.8);
width: 100px;
height: 100px;
}
#coming_soon .count .circle span{
font-size: 35px;
margin-top: 39px;
height: 73px;
width: 73px;
}
#coming_soon .count p{
color: #333;
font-size: 10px;
}
#coming_soon .count .circle span{
margin-top: 26px;
font-size: 30px;
}
}

3
website/static/css/concert_route.css
View File

@@ -33,7 +33,7 @@
box-shadow: 0 0 7px 0 rgba(26, 26, 26, 0.4);
padding: 33px 0 33px;
background: white;
top: 67%;
top: 62%;
border-radius: 4px;
}
#concert_route .map .box_wrapp .box_cont{
@@ -169,6 +169,7 @@
visibility: visible;
}
#route_info_box a.btn
{
visibility:hidden;

4
website/static/css/portfolio.css
View File

@@ -114,9 +114,7 @@
#portfolio #filters li a{
font-size: 18px;
}
#portfolio #gallery_container .photo{
margin-left: 35px;
}
#portfolio #gallery_container .photo img{
left: 10%;
}

2
website/static/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
website/static/js/jquery-2.0.3.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

15
website/templates/website/base.html
View File

@@ -2,7 +2,6 @@
<!---------------------------------------------- CSS --------------------------------------------------->
{% addtoblock "css" strip %} <link rel="stylesheet" href="{{STATIC_URL}}/css/bootstrap.min.css" > {% endaddtoblock %}
{% addtoblock "css" strip %} <link rel="stylesheet" href="{{STATIC_URL}}/css/bootstrap-responsive.min.css" > {% endaddtoblock %}
@@ -21,10 +20,10 @@
<!-------------------------------------------- JavaScript --------------------------------------------------->
{% addtoblock "js" strip %} <script src="http://code.jquery.com/jquery-latest.js"></script> {% endaddtoblock %}
{% addtoblock "js" strip %} <script src="{{STATIC_URL}}/js/bootstrap.min.js"></script> {% endaddtoblock %}
{% addtoblock "js" strip %} <script src="{{STATIC_URL}}/js/jquery-2.0.3.min.js"></script> {% endaddtoblock %}
{% addtoblock "js" strip %} <script src="{{STATIC_URL}}/js/bootstrap.min.js"></script> {% endaddtoblock %}
{% addtoblock "js" strip %} <script src="{{STATIC_URL}}/js/jquery.countdown.min.js"></script> {% endaddtoblock %}
{% addtoblock "js" strip %} <script src="{{STATIC_URL}}/js/theme.js"></script> {% endaddtoblock %}
{% addtoblock "js" strip %} <script src="{{STATIC_URL}}/js/index-slider.js" type="text/javascript" ></script>{% endaddtoblock %}
@@ -89,19 +88,21 @@ $.ajaxSetup({
<body class="pull_top">
<!-- Menu -->
<div id="menu" class="{% block navbar_options %}navbar transparent navbar-inverse navbar-fixed-top {% endblock %}">
<div class="{% block navbar_options %}navbar transparent navbar-inverse navbar-fixed-top {% endblock %}">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
{% if not request.device.android %}
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse" type="button">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
{% endif %}
<a class="brand" href="/">
<img alt="Blechreiz" src="{{STATIC_URL}}/img/blechreiz_logo.png">
</a>
<div class="nav-collapse collapse">
<div {% if not request.device.android %}class="nav-collapse collapse"{% endif %}>
<ul class="nav pull-right">
{% block menu_contents %}
<li><a href="/">HOME</a></li>