Skip to content

Commit 11f9561

Browse files
rayt86rayt86
committed
fixed responsive issues with page header background image. Resolved issues with footer content layout.
1 parent 568a765 commit 11f9561

10 files changed

+1187
-423
lines changed

‎pycon/static/img/headergraphicSm.png

83.6 KB
Loading

‎pycon/static/less/responsive-site.less

+328-75
Large diffs are not rendered by default.

‎pycon/static/less/site.less

+318-254
Large diffs are not rendered by default.

‎pycon/templates/comps/responsive_base.html

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{% extends "comps/site_base.html" %}
2+
3+
{% load compress static sitetree %}
4+
{% load i18n %}
5+
6+
{% block style_base %}
7+
{% compress css %}
8+
<link href="{% static "pinax/css/theme.css" %}" rel="stylesheet" type="text/css">
9+
{% endcompress %}
10+
11+
{% if debug %}
12+
<link rel="stylesheet/less" type="text/css" media="all" href="{{ STATIC_URL }}less/responsive-site.less" />
13+
<script src="{{ STATIC_URL }}js/less-1.3.3.min.js"></script>
14+
{% else %}
15+
{% compress css %}
16+
<link rel="stylesheet" type="text/less" media="all" href="{{ STATIC_URL }}less/responsive-site.less" />
17+
{% endcompress %}
18+
{% endif %}
19+
20+
{% compress css %}
21+
{% include "markedit/includes/markedit-css.html" %}
22+
{% endcompress %}
23+
24+
{% block extra_style %}{% endblock %}
25+
{% endblock %}
26+
27+
28+
{% block topbar_base %}
29+
{% include "_messages.html" %}
30+
<header class="main">
31+
<a id="skip" href="#content">{% trans "Skip to main content" %}</a>
32+
<div class="container">
33+
<a class="logo-smaller" href="{% url 'home' %}">PyCon 2014 in Montr&#233;al</a>
34+
<div class="account-bar{% if user.is_authenticated %} {% trans "loggedin" %}{% endif %}">
35+
{% block account_bar %}
36+
{% include "_account_bar.html" %}
37+
{% endblock %}
38+
</div>
39+
{% block main_nav %}
40+
<nav>
41+
<a class="logo-small" href="{% url 'home' %}">PyCon 2014 in Montr&#233;al</a>
42+
43+
<div class="navbar navbar-inverse">
44+
<div class="navbar-inner">
45+
46+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
47+
<span class="icon-bar"></span>
48+
<span class="icon-bar"></span>
49+
<span class="icon-bar"></span>
50+
</a>
51+
52+
<div class="nav-collapse collapse">
53+
{% block topbar %}
54+
{% block nav %}
55+
{% sitetree_menu from "main" include "trunk" %}
56+
{% endblock %}
57+
{% endblock %}
58+
</div>
59+
</div>
60+
</div>
61+
</nav>
62+
{% endblock %}
63+
</div>
64+
</header>
65+
{% block banner %}{% endblock %}
66+
{% endblock %}

‎pycon/templates/comps/site_base.html

+180
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
{% extends "theme_base.html" %}
2+
3+
{% load url from future %}
4+
5+
{% load cache %}
6+
{% load compress %}
7+
{% load static %}
8+
{% load metron_tags %}
9+
{% load i18n %}
10+
{% load sponsorship_tags %}
11+
{% load thumbnail %}
12+
{% load sitetree %}
13+
14+
{% block head_title_base %}{% block head_title %}{% endblock %} | PyCon 2015 in Montr&#233;al{% endblock %}
15+
16+
{% block style_base %}
17+
{% compress css %}
18+
<link href="{% static "pinax/css/theme.css" %}" rel="stylesheet" type="text/css">
19+
{% endcompress %}
20+
21+
{% if debug %}
22+
<link rel="stylesheet/less" type="text/css" media="all" href="{{ STATIC_URL }}less/site.less" />
23+
<script src="{{ STATIC_URL }}js/less-1.3.3.min.js"></script>
24+
{% else %}
25+
{% compress css %}
26+
<link rel="stylesheet" type="text/less" media="all" href="{{ STATIC_URL }}less/site.less" />
27+
{% endcompress %}
28+
{% endif %}
29+
30+
{% compress css %}
31+
{% include "markedit/includes/markedit-css.html" %}
32+
{% endcompress %}
33+
34+
{% block extra_style %}{% endblock %}
35+
{% endblock %}
36+
37+
{% block extra_head_base %}
38+
<meta property="og:image" content="https://us.pycon.org/2014/site_media/static/img/logo.png" />
39+
<link href="{{ STATIC_URL }}img/favicon.ico" rel="shortcut icon" />
40+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
41+
{% include "markedit/includes/markedit-js.html" %}
42+
{% block extra_head %}{% endblock %}
43+
<meta name="google-site-verification" content="fG_DG4G4eFtBcgIKht-bJKdirGhDa_51X6yeCS8daDs" />
44+
{% endblock %}
45+
46+
{% block extra_body_base %}
47+
{% analytics %}
48+
{% block extra_body %}{% endblock %}
49+
{% endblock %}
50+
51+
{% block topbar_base %}
52+
<header class="main">
53+
<a id="skip" href="#content">{% trans "Skip to main content" %}</a>
54+
<div class="container">
55+
<div class="account-bar{% if user.is_authenticated %} {% trans "loggedin" %}{% endif %}">
56+
{% block account_bar %}
57+
{% include "_account_bar.html" %}
58+
{% endblock %}
59+
</div>
60+
{% block main_nav %}
61+
<nav>
62+
<div class="container">
63+
<a class="logo-small" href="{% url 'home' %}">PyCon 2015 in Montr&#233;al</a>
64+
<div class="navbar navbar-inverse">
65+
<div class="navbar-inner">
66+
{% block topbar %}
67+
{% block nav %}
68+
{% sitetree_menu from "main" include "trunk" %}
69+
{% endblock %}
70+
{% endblock %}
71+
</div>
72+
</div>
73+
</div>
74+
</nav>
75+
{% endblock %}
76+
</div>
77+
</header>
78+
{% block banner %}{% endblock %}
79+
{% endblock %}
80+
81+
{% block body_base %}
82+
<div id="content">
83+
{% block body_outer %}
84+
<div class="page-head">
85+
<div class="container">
86+
<div itemprop="summary" class="logo">
87+
<a href="{% url 'home' %}"><img class="img-responsive logo" src="{{ STATIC_URL }}img/pycon2015-logo.png" alt="PyCon 2015 Montreal Canada"></a>
88+
</div>
89+
</div>
90+
</div>
91+
<div class="page-content">
92+
{% include "_messages.html" %}
93+
{% block page_content %}
94+
<div class="container">
95+
96+
<div class="row">
97+
<div class="row pageTitle">
98+
<div class="container">
99+
<h1>{% block page_title %}{% endblock %}</h1>
100+
{% block breadcrumbs %}{% endblock %}
101+
<div class="skyline"></div>
102+
</div>
103+
</div>
104+
<div class="span9">
105+
{% block edit_page %}{% endblock %}
106+
<div class="box">
107+
<div class="box-content">{% block body %}{% endblock %}</div>
108+
</div>
109+
</div>
110+
<aside class="span2">
111+
{% block sidebar %}
112+
{% cache 600 "sidebar" %}
113+
<div class="sponsor-list">
114+
<h2>{% trans "SPONSORS" %}</h2>
115+
{% sponsor_levels as levels %}
116+
{% for level in levels %}
117+
{% if level.sponsors %}
118+
<h3{% if forloop.first %} style="margin-top: 20px;"{% endif %}>{{ level.name }}</h3>
119+
{% for sponsor in level.sponsors %}
120+
<a href="{{ sponsor.external_url }}">
121+
<img src="{% thumbnail sponsor.website_logo '100x60' %}" alt="{{ sponsor.name }}" />
122+
</a>
123+
{% endfor %}
124+
{% endif %}
125+
{% endfor %}
126+
</div>
127+
{% endcache %}
128+
{% endblock %}
129+
</aside>
130+
</div>
131+
</div>
132+
{% endblock %}
133+
</div>
134+
{% endblock %}
135+
</div>
136+
<div class=bottombg>
137+
<img class="img-responsive" src="{{ STATIC_URL }}img/bottombg.png" alt="bottom band background">
138+
</div>
139+
<footer>
140+
<div class="container">
141+
{% block footer %}
142+
<div class="row-fluid footer-content col-centered">
143+
<div class="span5">
144+
<div class="footer-left">
145+
<p>
146+
{% blocktrans %}
147+
PyCon 2015 in Montr&#233;al is a production of the <a href="http://python.org/psf/">Python Software Foundation</a>.
148+
Site built by <a href="http://caktusgroup.com">Caktus Consulting Group, LLC.</a> using <a href="http://eldarion.com/symposion/" title="Symposion — An Open Platform for Conference Websites">Symposion</a>.
149+
{% endblocktrans %}
150+
</p>
151+
</div>
152+
</div>
153+
<div class="span2">
154+
<div class="row-fluid">
155+
<a href="http://caktusgroup.com">
156+
<img class="caktus-logo col-centered" src="{{ STATIC_URL }}img/caktusgroup-logo.png" alt="Caktus Consulting Group">
157+
</a>
158+
</div>
159+
</div>
160+
<div class="span5">
161+
<div class="footer-right">
162+
<p>
163+
{% blocktrans %}
164+
Hosting provided by <a href="http://osuosl.org">OSU Open Source Lab</a>.
165+
Questions? Comments? Contact <a href="mailto:[email protected]">[email protected]</a>
166+
{% endblocktrans %}
167+
</p>
168+
</div>
169+
</div>
170+
</div>
171+
{% endblock %}
172+
</div>
173+
</footer>
174+
{% endblock %}
175+
176+
{% block script_base %}
177+
<script src="{% static "bootstrap/js/bootstrap.min.js" %}"></script>
178+
<script src="{% static "pinax/js/theme.js" %}"></script>
179+
{% block extra_script %}{% endblock %}
180+
{% endblock %}

0 commit comments

Comments
 (0)