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

Jump to bottom

use the new website design from ElementalCode/elemental#220 #233

Merged
merged 4 commits into from
Jul 27, 2016
Merged

use the new website design from ElementalCode/elemental#220 #233

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63cb536
use the new website design from ElementalCode/elemental#220
mrjacobbloom Jul 23, 2016
f648d0c
add shadow animation to all pages whose contents start with a .hero-box
mrjacobbloom Jul 23, 2016
d8f8e17
fix up profile pages
mrjacobbloom Jul 23, 2016
54d8a4e
change index SASS to use classes instead of IDs
mrjacobbloom Jul 23, 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: 2 additions & 2 deletions apps/accounts/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block title %}Login | {% endblock %}
{% block content %}
<div>
<div class="hero-box">
<div class="form-box">
<h3>Log In</h3>
<form method="POST">
Expand All @@ -14,4 +14,4 @@ <h3>Log In</h3>
</form>
</div>
</div>
{% endblock %}
{% endblock %}
27 changes: 19 additions & 8 deletions apps/accounts/templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

{% block morescripts %}
<link rel="stylesheet" href="{% static 'style.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'homepage.css' %}" />
<script>
var ProjectsCount = {{ projects.count }} + 1;
var USERNAME = '{{ user.username }}';
Expand All @@ -12,7 +13,8 @@
{% endblock %}

{% block content %}
<div class="box shadow centered">
<div class="hero-box">
<div class="box centered">
<div class="upper seafoam">
<h1 class="white">{{ user.username }}</h1>
<div style="float:right; margin-top:27px">User</div>
Expand Down Expand Up @@ -43,7 +45,9 @@ <h3>Featured Creation</h3>
</div>
</div>
</div>
<div class="row box shadow centered">
</div>
<div class="carousel-wrapper gray">
<div class="row box centered">
<h3>Shared Creations
<div class="inline float-right see-all see-all-projects">
<a>See All</a>
Expand All @@ -62,7 +66,9 @@ <h3>Shared Creations
</ul>
</div>
</div>
<div class="row box shadow centered">
</div>
<div class="carousel-wrapper">
<div class="row box centered">
<h3>Favorite Creations
<div class="inline float-right see-all see-all-favorites">
<a>See All</a>
Expand All @@ -79,11 +85,13 @@ <h3>Favorite Creations
</ul>
</div>
</div>
<div class="row box shadow centered">
</div>
<div class="carousel-wrapper gray">
<div class="row box centered">
<h3>Following
<div class="inline float-right see-all see-all-following">
<a>See All</a>
</div>
</div>
</h3>
<div>
<ul class="userpage-following-section-carousel user-icons">
Expand All @@ -96,11 +104,13 @@ <h3>Following
</ul>
</div>
</div>
<div class="row box shadow centered">
</div>
<div class="carousel-wrapper">
<div class="row box centered">
<h3>Followers
<div class="inline float-right see-all see-all-followers">
<a>See All</a>
</div>
</div>
</h3>
<div>
<ul class="userpage-followers-section-carousel user-icons">
Expand All @@ -113,8 +123,9 @@ <h3>Followers
</ul>
</div>
</div>
</div>
{% endblock %}

{% block extra_scripts %}
<script src="{% static 'js/profile.js' %}"></script>
{% endblock %}
{% endblock %}
4 changes: 3 additions & 1 deletion apps/accounts/templates/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

{% block title %}Register | {% endblock %}
{% block content %}
<div class="hero-box">
<div class="form-box">
<h3>Sign Up</h3>
<form method="POST">
Expand All @@ -14,4 +15,5 @@ <h3>Sign Up</h3>
<input type="submit" class="submit-button">
</form>
</div>
{% endblock %}
</div>
{% endblock %}
4 changes: 3 additions & 1 deletion apps/core/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<body>
<div class="wrapper">
{% include "includes/navbar.html" %}
{% block content %}{% endblock %}
<div id="content-wrapper">
{% block content %}{% endblock %}
</div>
<div class="push"></div>
</div>
{% include "includes/footer.html" %}
Expand Down
22 changes: 9 additions & 13 deletions apps/core/templates/includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{% load footer %}
<div class="darkBack footerContainer">
<div class="centered">
<div class="footer">
<div><a href="#" class="footerLink">About</a></div>
<div><a href="#" class="footerLink">Help</a></div>
<div><a href="#" class="footerLink">Privacy</a></div>
<div><a href="#" class="footerLink">Contact</a></div>
</div>
<!--removing this temporarily...<div class="white raleway aligncenter ">
{% footer %}
</div>-->
</div>
</div>
<div id="footer-wrapper">
<div id="footer" class="centered">
<span id="hidden_semicolon">;</span>
<a href="#" class="footer-link">About</a>
<a href="#" class="footer-link">Help</a>
<a href="#" class="footer-link">Privacy</a>
<a href="#" class="footer-link">Contact</a>
</div>
</div>
58 changes: 39 additions & 19 deletions apps/core/templates/includes/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
<div id="navbar" class="bg-seafoam full--width inline-block">
<a href="{% url "index" %}" class="inline-block raleway float-left nav-button logo">
<img class="logo"></a>
<a href="{% url "projects:create-project" %}" class="inline-block width-auto float-left raleway nav-button border-left">
<h2>Create</h2></a>
<a href="#" class="inline-block width-auto float-left raleway nav-button border-left">
<h2>Explore</h2></a>
{% if request.user.is_authenticated %}
<a href='{% url "projects:my-projects" %}' class="inline-block width-auto float-right raleway nav-button">
<h2>My Stuff</h2></a>
<a href='{% url "accounts:logout" %}' class="inline-block width-auto float-right raleway nav-button border-right">
<h2>Log Out</h2></a>
{% else %}
<a href="{% url 'accounts:login' %}" class="inline-block width-auto float-right raleway nav-button border-right">
<h2>Log In</h2></a>
<a href="{% url 'accounts:register' %}" class="inline-block width-auto float-right raleway nav-button border-right">
<h2>Sign Up</h2></a>
{% endif %}
</div>
<div id="nav-wrapper">
<script>
var scrollShadow = function() {
var scrollPos = document.documentElement.scrollTop || document.body.scrollTop;
var amnt = (Math.sqrt(-(scrollPos-100)*scrollPos)-50)/15 - 1;
if(scrollPos > 50) {
amnt = 0;
}
if(scrollPos == 0) {
amnt = -5.1;
}
document.getElementById("nav-wrapper").style.boxShadow = "0 1px 5px " + amnt + "px #252E35";
};
window.addEventListener("load", function() {
if(document.getElementById("content-wrapper").children[0] &&
document.getElementById("content-wrapper").children[0].classList.contains("hero-box")) {
scrollShadow();
window.addEventListener("scroll", scrollShadow);
}

});
</script>
<nav id="site-nav" class="centered">
<div id="left-links">
<a href="{% url 'index' %}" class="green-link"><!--<img src="https://elementalcode.herokuapp.com/static/resources/navbarimg1.png" alt="Elemental" />-->Elemental</a>
<a href="{% url 'projects:create-project' %}">Create</a>
<a href="#">Explore</a>
</div>
<div id="right-links">
{% if request.user.is_authenticated %}
<a href="{% url 'projects:my-projects' %}" class="bordered-link">My Stuff</a>
<a href="{% url 'accounts:logout' %}" class="unbordered-link">Log Out</a>
{% else %}
<a href="{% url 'accounts:register' %}" class="bordered-link">Register</a>
<a href="{% url 'accounts:login' %}" class="unbordered-link">Sign In</a>
{% endif %}
</div>
</nav>
</div>
Loading