Skip to content

E
edx-platform
Commit 9bcdcec6 by Galen Frechette
Options

adds about and jobs pages, cleans up header and login modal

parent 9d0c52df
Showing with 195 additions and 136 deletions
lms/static/sass/_base_extends.scss
.faded-hr-divider {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%, rgba(200,200,200, 0.8) 15%, rgb(200,200,200) 50%, rgba(200,200,200, 0.8) 85%, rgba(255,255,255, 0)));
@include background-image(linear-gradient(180deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 1px;
width: 100%;
}
.faded-hr-divider-light {
@include background-image(linear-gradient(180deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.8) 50%,
rgba(255,255,255, 0)));
height: 1px;
width: 100%;
}
.faded-vertical-divider {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%, rgba(200,200,200, 0.6) 25%, rgb(200,200,200) 50%, rgba(200,200,200, 0.6) 75%, rgba(255,255,255, 0)));
@include background-image(linear-gradient(90deg, rgba(200,200,200, 0) 0%,
rgba(200,200,200, 1) 50%,
rgba(200,200,200, 0)));
height: 100%;
width: 1px;
}
.faded-vertical-divider-light {
@include background-image(linear-gradient(90deg, rgba(255,255,255, 0) 0%,
rgba(255,255,255, 0.6) 50%,
rgba(255,255,255, 0)));
height: 100%;
width: 1px;
}
.vertical-divider {
@extend .faded-vertical-divider;
position: relative;
&::after {
@extend .faded-vertical-divider-light;
content: "";
display: block;
position: absolute;
left: 1px;
}
}
.horizontal-divider {
@extend .faded-hr-divider;
position: relative;
&::after {
@extend .faded-hr-divider-light;
content: "";
display: block;
position: absolute;
top: 1px;
}
}
lms/static/sass/_base_mixins.scss
......@@ -5,5 +5,5 @@
min-height: $height;
min-width: $width;
position: fixed;
top: 35%;
top: 45%;
}
lms/static/sass/_index.scss
......@@ -87,7 +87,7 @@
}
a {
@include button(shiny, $pink);
@include button(shiny, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
@include inline-block;
......@@ -95,20 +95,7 @@
padding: 15px 0px;
text-transform: uppercase;
text-align: center;
width: flex-grid(6);
&:first-child {
margin-right: flex-gutter();
}
&.find-courses {
@include button(shiny, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
@include inline-block;
font: normal italic 1.2rem/1.6rem $serif;
padding: 15px 0px;
}
width: flex-grid(12);
}
form {
......
lms/static/sass/_shared_header.scss
......@@ -18,75 +18,87 @@ header.app {
display: block;
float: left;
height: 100%;
margin: 16px 30px 0px 0px;
position: relative;
&::after {
@extend .faded-vertical-divider;
content: "";
display: block;
height: 50px;
position: absolute;
right: -15px;
top: -12px;
}
margin: 16px 15px 0px 0px;
}
a.discover-courses {
@include background-image(linear-gradient(-90deg, rgb(245,245,245) 0%, rgb(243,243,243) 50%, rgb(237,237,237) 50%, rgb(235,235,235) 100%));
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
color: $base-font-color;
display: block;
float: left;
font: normal 1rem/1.2rem $sans-serif;
height: 15px;
margin-top: 12px;
padding: 8px 10px;
text-decoration: none;
text-transform: uppercase;
text-shadow: 0 1px rgba(255,255,255, 0.6);
&:hover {
}
.divider {
@extend .vertical-divider;
@include inline-block;
height: 40px;
vertical-align: middle;
}
nav.guest {
float: right;
nav {
height: 40px;
margin-top: 8px;
&.find-courses {
float: left;
}
&.guest {
float: right;
}
ol {
font-size: 0em;
li {
@include inline-block;
margin-top: 12px;
padding: 0px 5px;
position: relative;
vertical-align: bottom;
vertical-align: top;
}
&:last-child {
padding-right: 0px;
}
li.secondary {
margin: 0px 15px;
a {
@include border-radius(3px);
border: 1px solid transparent;
color: $base-font-color;
@include box-sizing(border-box);
color: $lighter-base-font-color;
display: block;
font: normal italic 1.2rem/1.2rem $serif;
height: 15px;
padding: 8px;
font: normal italic 1.2rem/1.4rem $serif;
height: 30px;
@include inline-block;
margin: 5px 15px 5px 0px;
padding: 7px 2px;
text-decoration: none;
text-transform: lowercase;
text-shadow: 0 1px rgba(255,255,255, 0.6);
vertical-align: middle;
&:last-child {
margin-right: 0px;
}
&:hover {
color: $base-font-color;
}
}
}
li.primary {
a {
border: 1px solid transparent;
@include border-radius(3px);
@include box-sizing(border-box);
color: $base-font-color;
display: block;
font: normal 1.2rem/1.4rem $sans-serif;
height: 30px;
@include inline-block;
margin: 5px;
padding: 6px 8px;
text-decoration: none;
text-transform: uppercase;
text-shadow: 0 1px rgba(255,255,255, 0.6);
vertical-align: middle;
&:hover {
background: rgb(220,220,220);
@include background-image(linear-gradient(-90deg, rgb(245,245,245) 0%, rgb(243,243,243) 50%, rgb(237,237,237) 50%, rgb(235,235,235) 100%));
border-color: rgb(200,200,200);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
color: $base-font-color;
}
}
}
......
lms/static/sass/_shared_login_modal.scss
.modal-wrapper {
@include background-image(radial-gradient(50% 50%, circle cover, rgba(0,0,0, 0.3), rgba(0,0,0, 0.7)));
@include background-image(radial-gradient(50% 45%, circle cover, rgba(0,0,0, 0.3), rgba(0,0,0, 0.8)));
bottom: 0;
content: "";
display: none;
......@@ -16,48 +16,58 @@
.login-modal {
background: rgba(0,0,0, 0.6);
border: 1px solid rgba(0, 0, 0, 0.9);
@include border-radius(4px);
@include box-shadow(0 10px 60px 10px rgba(0,0,0, 0.5));
@include border-radius(0px);
@include box-shadow(0 15px 70px 5px rgba(0,0,0, 0.5));
color: #fff;
padding: 10px;
width: grid-width(7);
@include vertically-and-horizontally-centered(400px, grid-width(7));
padding: 8px;
width: grid-width(6);
@include vertically-and-horizontally-centered(410px, grid-width(6));
z-index: 10;
.inner-wrapper {
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
@include border-radius(4px);
background: rgb(240,240,240);
@include border-radius(0px);
border: 1px solid rgba(0, 0, 0, 0.9);
@include box-shadow(inset 0 1px 0 0 rgba(255, 255, 255, 0.7));
height: 380px;
height: 410px;
overflow: hidden;
padding: 30px;
position: relative;
&::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 1) 0%, rgba(255,255,255, 0) 100%));
content: "";
display: block;
height: 400px;
left: 0px;
margin: 0 auto;
position: absolute;
bottom: -140px;
width: 100%;
}
header {
margin-bottom: 30px;
padding-top: 5px;
overflow: hidden;
padding: 28px 20px 0px;
position: relative;
z-index: 2;
&::after {
@extend .faded-hr-divider;
bottom: 0px;
&::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 0.8) 0%, rgba(255,255,255, 0) 100%));
content: "";
display: block;
height: 400px;
left: 0px;
margin: 0 auto;
position: absolute;
top: -140px;
width: 100%;
z-index: 1;
}
hr {
@extend .faded-hr-divider-light;
border: none;
margin: 0px;
position: relative;
z-index: 2;
&::after {
@extend .faded-hr-divider;
bottom: 0px;
content: "";
display: block;
position: absolute;
top: -1px;
}
}
h3 {
......@@ -68,12 +78,15 @@
text-shadow: 0 1px rgba(255,255,255, 0.4);
text-transform: uppercase;
vertical-align: middle;
position: relative;
z-index: 2;
}
}
form {
@include clearfix;
margin-bottom: 12px;
padding: 0px 20px;
position: relative;
z-index: 2;
......@@ -81,37 +94,30 @@
display: none;
}
label.remember-me {
background: rgb(230,230,230);
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
display: block;
margin-bottom: 60px;
padding: 8px 10px;
position: relative;
&::before {
@extend .faded-hr-divider;
bottom: -30px;
content: "";
display: block;
position: absolute;
}
}
input[type="checkbox"] {
margin-right: 5px;
}
input[type="email"],
input[type="password"] {
background: rgb(255,255,255);
display: block;
height: 45px;
margin-bottom: 20px;
width: 100%;
}
label.remember-me {
background: rgb(230,230,230);
border: 1px solid rgb(200,200,200);
@include border-radius(3px);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
display: block;
margin-bottom: 38px;
padding: 8px 10px;
position: relative;
}
input[type="submit"] {
display: block;
height: 45px;
......@@ -121,9 +127,8 @@
}
.login-extra {
padding: 15px 0px;
position: relative;
z-index: 2;
p {
color: $lighter-base-font-color;
......@@ -134,6 +139,10 @@
color: $lighter-base-font-color;
font: normal italic 1.2rem/1.6rem $serif;
text-decoration: underline;
&:hover {
color: $base-font-color;
}
}
span + a {
......@@ -143,17 +152,14 @@
}
.close-modal {
//background: rgb(240,240,240);
//border: 1px solid rgba(180,180,180, 0.7);
@include border-radius(2px);
//@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.4), inset 0 0 2px 0 rgba(0,0,0, 0.1));
cursor: pointer;
@include inline-block;
padding: 5px 10px;
padding: 10px;
position: absolute;
right: 5px;
top: 5px;
@include transition(all, 0.15s, ease-out);
right: 2px;
top: 0px;
z-index: 3;
.inner {
p {
......@@ -166,9 +172,6 @@
}
&:hover {
//background: rgb(235,235,235);
//@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.4), inset 0 0 2px 0 rgba(0,0,0, 0.125));
p {
color: $base-font-color;
}
......
lms/templates/about.html 0 → 100644
<%inherit file="main.html" />
<h1>About Us</h1>
lms/templates/index.html
......@@ -22,7 +22,6 @@
<div class="signup-wrapper">
<section class="sign-up">
<a href="#" class="find-courses">Find Courses</a>
<a href="#" class="create-account">Sign Up</a>
</section>
</div>
</section>
......
lms/templates/jobs.html 0 → 100644
<%inherit file="main.html" />
<h1>Jobs</h1>
lms/templates/login_modal.html
......@@ -5,6 +5,7 @@
<div class="inner-wrapper">
<header>
<h3>Log In</h3>
<hr>
</header>
<form id="login_form" method="post">
......
lms/templates/navigation.html
......@@ -7,7 +7,20 @@
<a href="${ MITX_ROOT_URL }" class="logo">
<img src="${static.url('images/logo.png')}" />
</a>
<a href="/courses" class="discover-courses">Find Courses</a>
<nav class="find-courses">
<ol>
<li class="primary">
<div class="divider"></div>
<a href="/courses">Find Courses</a>
<div class="divider"></div>
</li>
<li class="secondary">
<a href="/about">About</a>
<a href="#">Blog</a>
<a href="/jobs">Jobs</a>
</li>
</ol>
</nav>
%if user.is_authenticated():
<nav class="user">
......@@ -31,20 +44,12 @@
%else:
<nav class="guest">
<ol>
<li>
<a href="#">About</a>
</li>
<li>
<a href="#">Blog</a>
</li>
<li>
<a href="#">Jobs</a>
</li>
<li>
<li class="primary">
<div class="divider"></div>
<a href="#" class="login">Log In</a>
</li>
<li>
<a href="#">Sign Up</a>
<div class="divider"></div>
<a href="#" class="signup">Sign Up</a>
<div class="divider"></div>
</li>
</ol>
</nav>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment