Skip to content

Mobile #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zanza00 merged 3 commits into from
Dec 12, 2016
Merged

Mobile #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f2a34b
mobile fix for random
Dec 6, 2016
7afa012
better mobile for all pages
Dec 6, 2016
fc49f3a
better display of informations
Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.winners-list {
background-color: #eceeef;
border: 0px;
}
7 changes: 4 additions & 3 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>pyGlialo - giving away the goodies</title>
<link rel="stylesheet" href="static/css/bootstrap.min.css">
<link rel="stylesheet" href="static/css/bootstrap-theme.min.css">
<!--<link rel="stylesheet" href="static/css/bootstrap-theme.min.css">-->
<link rel="stylesheet" href="static/css/jumbotron-narrow.css">
<link rel="stylesheet" href="static/css/font-awesome.min.css">
<link rel="stylesheet" href="static/css/style.css">
</head>
<body>
<div class="container">
{% include "includes/header.html" %}
<div class="jumbotron clearfix">
<div class="jumbotron clearfix row">
{% block content %}
{% endblock content %}
</div>
Expand Down
8 changes: 3 additions & 5 deletions templates/finalize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
{% block content %}
<h1>Ecco i vincitori</h1>
<img src="static/img/winning.png">
<h2>
<ul class="list-group my-3">
{% for user in winners %}
{{ user }}
{% if not loop.last %}<br>
{% endif %}
<li class="list-group-item winners-list"><h2>{{ user }}</h2></li>
{% endfor %}
</h2>
</ul>
{% endblock content %}
14 changes: 9 additions & 5 deletions templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
{% block content %}
<img class="img-rounded" src="static/img/pyBiscione_200x200.png">
{% if event %}
<h3>{{ event.name }}</h3>
<h4>{{ event.venue.name }}</h4>
<div class="my-2">
<h1>{{ event.name }}</h1>
<h3>{{ event.venue.name }}</h3>
</div>
{% else: %}
<h3 class="alert-danger">Secret key not set</h3>
{% endif %}
Expand All @@ -16,7 +18,9 @@ <h4>
Enjoy.
</p>
</div>
<a class="btn btn-lg btn-warning" href="random" role="button">
Let's Start! <i class="fa fa-play" aria-hidden="true"></i>
</a>
<div class="mt-2">
<a class="btn btn-lg btn-warning" href="random" role="button">
Let's Start! <i class="fa fa-play" aria-hidden="true"></i>
</a>
</div>
{% endblock content %}
4 changes: 2 additions & 2 deletions templates/random.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% block content %}
<p class="lead">{{ lead_text }}</p>
{% if winner %}
<div class="pull-left col-lg-7 clearfix">
<div class="col-xs-12 col-md-8 clearfix">
<a {% if winner.member_id != '000000' %}
href="http://www.meetup.com/Python-Milano/members/{{ winner.member_id }}" target="_blank"
{% else %}
Expand All @@ -14,7 +14,7 @@
<h2 class="text-center">{{ winner.name }}</h2>
</div>

<ul class="list-group pull-right">
<ul class="list-group col-xs-12 col-md-4">
<li class="list-group-item">
{% include "includes/buttons/claim.html" %}
</li>
Expand Down
6 changes: 3 additions & 3 deletions templates/saved.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
{% block content %}
<p class="lead">{{ lead_text }}</p>
<br>
<div class="col-lg-7">
<div class="col-xs-12 col-md-8 clearfix">
<img src="static/img/winning.png" width="300">
<h2>{{ winner.name }}</h2>
<h2 class="my-2">{{ winner.name }}</h2>
</div>
<ul class="list-group pull-right">
<ul class="list-group col-xs-12 col-md-4">
<li class="list-group-item">
{% include "includes/buttons/shuffle.html" %}
</li>
Expand Down