Skip to content
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

Made changes to UI #1

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Made changes to UI #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions .idea/Votr.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

910 changes: 910 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions static/css/materialize.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4034,6 +4034,7 @@ nav i.material-icons {
font-size: 24px;
height: 56px;
line-height: 56px;
color: #000;
}

nav .nav-wrapper {
Expand Down Expand Up @@ -4196,8 +4197,8 @@ nav .input-field label.active {

@media only screen and (min-width: 601px) {
nav, nav .nav-wrapper i, nav a.button-collapse, nav a.button-collapse i {
height: 64px;
line-height: 64px;
height: 80px;
line-height: 80px;
}
.navbar-fixed {
height: 64px;
Expand Down
50 changes: 48 additions & 2 deletions static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ p {
}

nav .brand-logo {
font-family: 'Hipstelvetica';
font-family: 'PT Sans', sans-serif;
padding-top: 5px;
}

.jumbotron-column {
margin-top: 60px;
margin-top: 500px;
font-weight: bold;
}

Expand All @@ -88,6 +88,16 @@ nav .brand-logo {
background-color: #272D4E;
background-image: url(../images/pattern.png);
padding-bottom: 40px;
height: 820px;
font-size: 10px;
}
#index-banner-small {
color: #ffffff;
background-color: #272D4E;
background-image: url(../images/pattern.png);
padding-top: 160px;
height: 500px;
font-size: 10px;
}

nav ul li {
Expand Down Expand Up @@ -126,3 +136,39 @@ nav ul li {
height: 60px;
width: 220px;
}

#search {
width:550px;
}

#cta {
text-align: center;
margin-top: 500px;
font-size: 50px;
}

.icon-pink {
color: #e91e63;
}

.icon-red {
color: #f44336;

}

.icon-indigo {
color: #3f51b5;

}

.icon-lgreen {
color: #8bc34a;
}

.icon-test{
color: #3e2723;
}
.icon-yellow {
color: #ffd600;

}
19 changes: 16 additions & 3 deletions templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="static/css/style.css"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>
<title>Votr! - Create polls online</title>

<!-- CSS -->
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Dosis" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=PT+Sans" rel="stylesheet">
<link href="{{ url_for('static', filename='css/materialize.css') }}" type="text/css" rel="stylesheet" media="screen,projection"/>
<link href="{{ url_for('static', filename='css/style.css') }}" type="text/css" rel="stylesheet" media="screen,projection"/>

Expand All @@ -20,16 +21,28 @@
</head>

<body>
<nav class="white" role="navigation">
<nav class=".deep-orange.accent-1" role="navigation">
<div class="nav-wrapper container">
<a id="logo-container" href="{{ url_for('home') }}" class="brand-logo">VOTR</a>
<ul class="right hide-on-med-and-down">
<li>
<form>
<div class="input-field">
<input id="search" type="search" placeholder="Search a poll" required>
<label for="search"><i class="material-icons">search</i></label>
<i class="material-icons">close</i>
</div>
</form>
<li><a href="{{ url_for('polls') }}">Dashboard</a></li>
<li><a href="{{ url_for('polls') }}">Polls</a></li>
<li><a href="{{ url_for('polls') }}">How it works</a></li>
<li><a href="{{ url_for('polls') }}">Featured Polls</a></li>
</li>
<ul id="dropdown" class="dropdown-content">
<li><a href="https://danidee.auth0.com/v2/logout?returnTo=http%3A%2F%2Flocalhost%3A5000%2Flogout">Logout</a></li>
</ul>


{% if session['profile'] %}<li><a class="dropdown-button" data-activates="dropdown" href="#">{{ session['profile']['nickname'] }} <img style="margin-top: 5px;" height="30" src="{{session['profile']['picture'] }}" class="circle" /></a></li>{% endif %}
</ul>

Expand Down
91 changes: 42 additions & 49 deletions templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h5 class="header col s12 light"></h5>
</div>

<div class="row col s12 m6">
<h2 style="text-align: center; margin-top: 60px;">Get Feedback On What Your Audience thinks!</h2>
<h2 id="cta">Get Feedback On What Your Audience thinks!</h2>
</div>
</div>
</div>
Expand All @@ -25,65 +25,71 @@ <h4 class="center bt-blue-text">Much more than polls</h4>
<!-- Icon Section -->
<div class="row">
<div class="col s12 m3">
<div class="icon-block">
<div class="icon-block icon-red">
<h2 class="center"><i class="material-icons">lock_outline</i></h2>
<h5 class="center">Secure</h5>
</div>
</div>

<div class="col s12 m3">
<div class="icon-block">
<div class="icon-block icon-pink">
<h2 class="center"><i class="material-icons">thumb_up</i></h2>
<h5 class="center">It"s free</h5>
</div>
</div>

<div class="col s12 m3">
<div class="icon-block">
<div class="icon-block icon-indigo">
<h2 class="center"><i class="material-icons">stay_current_portrait</i></h2>
<h5 class="center">Optimized for mobile</h5>
</div>
</div>

<div class="col s12 m3">
<div class="icon-block">
<div class="icon-block icon-lgreen">
<h2 class="center"><i class="material-icons">question_answer</i></h2>
<h5 class="center">Integrated comments</h5>
</div>
</div>

</div>

<div class="row">

<div class="col s12 m4">
<div class="icon-block">
{# Extra Icons Section #}
<div class="row" style="margin-top: 80px;">
<div class="col s12 m3">
<div class="icon-block icon-yellow">
<h2 class="center"><i class="material-icons">supervisor_account</i></h2>
<h5 class="center">Share on social media</h5>
<h5 class="center">Social media integration</h5>
</div>
</div>

<div class="col s12 m4">
<div class="icon-block">
<div class="col s12 m3">
<div class="icon-block icon-test">
<h2 class="center"><i class="material-icons">code</i></h2>
<h5 class="center">Developer API</h5>
<h5 class="center">It"s free</h5>
</div>
</div>

<div class="col s12 m4">
<div class="col s12 m3">
<div class="icon-block">
<h2 class="center"><i class="material-icons">trending_up</i></h2>
<h5 class="center">Analytics on results</h5>
<h5 class="center">Optimized for mobile</h5>
</div>
</div>

<div class="col s12 m3">
<div class="icon-block">
<h2 class="center"><i class="material-icons">settings</i></h2>
<h5 class="center">Fully Customizable</h5>
</div>
</div>
</div>

</div>
</div>


<div id="index-banner" class="section no-pad-bot">
<div id="index-banner-small" class="section no-pad-bot">
<div class="row center">
<h4 class="header col s12 teal-text text-lighten-2">
VOTR Supports popular chat clients, so you never have to leave to run a poll
Expand Down Expand Up @@ -114,19 +120,6 @@ <h4 class="header col s12 teal-text text-lighten-2">
</div>
</div>

<div class="row">
<div class="col S12 m3">
<div class="card-panel bt-blue featured">
<h5 class="white-text">FEATURED POLLS</h5>
</div>
</div>
</div>

<div id="polls-container">

</div>


<div class="parallax-container valign-wrapper">
<div class="section no-pad-bot">
<div class="container">
Expand Down Expand Up @@ -166,26 +159,26 @@ <h5 class="white-text">About Votr</h5>
</p>
</div>

<div class="col l3 s12">

</div>

<div class="col l3 s12">
<h5 class="white-text">Contact us</h5>
<ul>
<li><a class="white-text" href="https://github.com/danidee10/Votr">Github</a></li>
<li><a class="white-text" href="#!">https://twitter.com/osaetindaniel</a></li>
<li><a class="white-text" href="#!">Email</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
Votr
</div>
</div>
</footer>
{# <div class="col l3 s12">#}
{##}
{# </div>#}
{##}
{# <div class="col l3 s12">#}
{# <h5 class="white-text">Contact us</h5>#}
{# <ul>#}
{# <li><a class="white-text" href="https://github.com/danidee10/Votr">Github</a></li>#}
{# <li><a class="white-text" href="#!">https://twitter.com/osaetindaniel</a></li>#}
{# <li><a class="white-text" href="#!">Email</a></li>#}
{# </ul>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="footer-copyright">#}
{# <div class="container">#}
{# Votr#}
{# </div>#}
{# </div>#}
{#</footer>#}


<!-- Scripts-->
Expand Down
Binary file added votr.db
View file
Open in desktop
Binary file not shown.