Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Temp commit.
  • Loading branch information
mithro committed Jan 3, 2014
1 parent 134a35e commit a8d1339
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
16 changes: 2 additions & 14 deletions website/frontend/static/css/style.css
Expand Up @@ -2,17 +2,6 @@
---------------------- Pycon Styles -------------------------
------------------------------------------------------------*/

@font-face {
font-family: 'LeagueGothicRegular';
src: url('https://us.pycon.org/2012/site_media/static/fonts/league_gothic-webfont.eot');
src: url('https://us.pycon.org/2012/site_media/static/fonts/league_gothic-webfont.eot?#iefix') format('embedded-opentype'),
url('https://us.pycon.org/2012/site_media/static/fonts/league_gothic-webfont.woff') format('woff'),
url('https://us.pycon.org/2012/site_media/static/fonts/league_gothic-webfont.ttf') format('truetype'),
url('https://us.pycon.org/2012/site_media/static/fonts/league_gothic-webfont.svg#LeagueGothicRegular') format('svg');
font-weight: normal;
font-style: normal;
}

body {
background-image: url('/static/img/bg.png');
color: #222;
Expand Down Expand Up @@ -54,7 +43,6 @@ hr {
height:2px;
background:none;
border:0;
background: url('https://us.pycon.org/2012/site_media/static/img/thin_stripe.png') repeat-x 0 0;
}

.sponsor-cell {
Expand Down Expand Up @@ -219,8 +207,8 @@ body {
width: 100%;
height: 100%;
margin: 0;
background-color: black;
font-family: "Century Gothic",Arial, Helvetica, Sans-Serif;
background-color: white;
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
text-align:center;
padding: 1px;
}
Expand Down
3 changes: 1 addition & 2 deletions website/frontend/views.py
Expand Up @@ -84,8 +84,7 @@ def index(request, template="index"):

def get_current_next(group, howmany=2):
if group in data:
tz = pytz.timezone('US/Pacific')
now = str(datetime.now(tz))
now = str(datetime.utcnow())
return islice(
ifilter(
lambda x: x['end'] > now,
Expand Down

0 comments on commit a8d1339

Please sign in to comment.