Skip to content

Added Registration #41

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.

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
merged 1 commit into from
Jul 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
145 changes: 139 additions & 6 deletions oshc/main/static/main/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@
font-family: "Montserrat", sans-serif
}

html {
position: relative;
min-height: 100%;
}

body {
overflow-x: hidden;
padding-top: 50px;
margin-bottom: 120px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change breaks the layout. You might want to remove it.

}

a {
Expand Down Expand Up @@ -44,17 +49,26 @@ a {
border-color: #24292e;
}

.vertical-align {
display: block;
align-items: center;
margin: 0 auto;
justify-content: center;
float: none;
}


/* SECTION ONE STARTS */

.main-section {
min-height: 70vh;
height: auto;
padding-top: 40px;
padding-top: 100px;
background: white;
background-color: white;
position: relative;
clear: both;
width: 100%;
}

.logo-image {
Expand Down Expand Up @@ -145,13 +159,18 @@ a {

footer {
height: auto;
min-height: 120px;
padding-top: 10px;
background-color: #24292e;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
min-height: 120px;
}

footer .container {
width: 70%;
position: sticky;
display: block;
}
Expand All @@ -162,12 +181,12 @@ footer .container {
margin-top: 15px;
}

.backToTop {
.back-to-top {
float: right;
color: #999;
}

.backToTop a {
.back-to-top a {
text-decoration: none;
}

Expand Down Expand Up @@ -239,3 +258,117 @@ footer .container {
clear: both;
}
}

/*Registration CSS starts*/

.form-title {
color: #555;
font-size: 28px;
font-weight: 400;
display: block;
}

.account-wall {
margin-top: 20px;
padding: 40px 0px 20px 0px;
background-color: #f7f7f7;
-moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
}

.profile-img {
width: 96px;
height: 96px;
margin: 0 auto 10px;
display: block;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
border-radius: 50%;
}

.form-registration {
max-width: 330px;
padding: 15px;
margin: 0 auto;
}

.form-registration .field-title {
font-weight: 400;
color: #000000;
font-size: 14px;
display: block;
}

.form-registration .helptext {
font-weight: 400;
color: #607D8B;
font-size: 12px;
display: block;
}

.form-registration .form-registration-heading, .form-registration .checkbox {
margin-bottom: 10px;
}

.form-registration .checkbox {
font-weight: normal;
}

.form-registration .form-control {
position: relative;
font-size: 16px;
height: auto;
padding: 10px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}

.form-registration .form-control:focus {
z-index: 2;
}

.form-registration input[type="text"] {
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}

.form-registration input[type="email"] {
margin-bottom: -1px;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}

.form-registration input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}

.forgot-password {
margin-top: 10px;
}

.new-account {
display: block;
margin-top: 10px;
}

.form-registration .btn {
background: #0275d8;
}

.form-registration p:hover {
color: #0275d8;
}

.form-registration button:hover {
background: #ffffff;
color: #0275d8;
}

.form-registration button:focus {
background: #0275d8;
}
116 changes: 65 additions & 51 deletions oshc/main/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,44 +1,58 @@
{% load static %}
<!DOCTYPE html>
<html>

<head>
{% include 'header.html' %}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
{% if site.title %}<title>{% if title %}{{ title }} &ndash; {% endif %}{{ site.title }}{% if not title and site.subtitle %} &ndash; {{ site.subtitle }}{% endif %}</title>{% endif %}
{% include 'header.html' %}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> {% if site.title %}
<title>
{% if title %} {{ title }} &ndash; {% endif %} {{ site.title }} {% if not title and site.subtitle %} &ndash; {{ site.subtitle }} {% endif %}
</title>
{% endif %}
</head>

<body>
<nav class="navbar navbar-inverse navbar-static-top navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Open Source Help Community</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q">Sessions</a></li>
<li><a href="https://github.com/OpenSourceHelpCommunity">Resources</a></li>
<li><a href="mailto:[email protected]">Contact</a></li>
<li><a href="https://opensourcehelp.herokuapp.com/">Join Us!</a></li>
</ul>
</div>
</div>
</nav>
<nav class="navbar navbar-inverse navbar-static-top navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'home' %}">Open Source Help Community</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q">Sessions</a></li>
<li><a href="https://github.com/OpenSourceHelpCommunity">Resources</a></li>
<li><a href="mailto:[email protected]">Contact</a></li>
<li><a href="https://opensourcehelp.herokuapp.com/">Join Us!</a></li>
{% if user.is_authenticated %}
<li><a href="#!">Hey {{ user.username }}!</a></li>
<li><a href="{% url 'auth_logout' %}">Logout</a></li>
{% else %}
<li><a href="{% url 'auth_login' %}">Sign In</a></li>
<li><a href="{% url 'registration_register' %}">Sign Up</a></li>
{% endif %}
</ul>
</div>
</div>
</nav>

<div id="content">
{% block content %}{% endblock %}
{% block footer %}
<footer>
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="social">
<ul>
<span class="col-sm-6 left-align">
<div>
{% block content %}{% endblock %}
</div>

{% block footer %}
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="social">
<ul>
<span class="col-sm-6 left-align">
<li>
<a href="https://www.facebook.com/opensourcehelpcommunity/"><i class="fa fa-facebook" aria-hidden="true"></i></a>
</li>
Expand All @@ -52,25 +66,25 @@
<a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q"><i class="fa fa-youtube-play" aria-hidden="true"></i></a>
</li>
</span>
<span class="col-sm-6 backToTop right-align">
<span class="col-sm-6 back-to-top right-align">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation error.

<a id="toTop" name="Back to top!">Back to top</a>
</span>
</ul>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="copyright">
&copy; 2017 Open Source Help Community
</div>
</div>
</div>
</footer>
{% endblock %}
</div>
</ul>
</div>
</div>
</div>
<div class="col-xs-12">
<div class="copyright">
&copy; 2017 Open Source Help Community
</div>
</div>
</div>
</footer>
{% endblock %}

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="{% static "main/js/script.js"%}"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="{% static "main/js/script.js" %}"></script>
</body>

</html>
10 changes: 5 additions & 5 deletions oshc/main/templates/header.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% load static %}
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
{% if site.author %}<meta name="author" content="{{ site.author }}">{% endif %}
{% if site.description %}<meta name="description" content="{{ site.description }}">{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1"> {% if site.author %}
<meta name="author" content="{{ site.author }}">{% endif %} {% if site.description %}
<meta name="description" content="{{ site.description }}">{% endif %}
<meta name="generator" content="mynt v{{ site.version }}">
<link rel="shortcut icon" href="{% static "main/images/favicon.ico"%}" type="image/x-icon">
<link rel="shortcut icon" href="{% static "main/images/favicon.ico" %}" type="image/x-icon">
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,700,900" rel="stylesheet">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link href="{% static "main/css/app.css"%}" rel="stylesheet">
<link href="{% static "main/css/app.css" %}" rel="stylesheet">
<script src="https://use.fontawesome.com/ae7ffc7b99.js"></script>
Loading