Skip to content
Snippets Groups Projects
Commit 15b544c5 authored by Galen Frechette's avatar Galen Frechette
Browse files

makes logo bigger, imporves footer layout with additin of new links

parent d9e293f9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 551 additions and 430 deletions
lms/static/images/header-logo.png 0 → 100644
+ 0
− 0
View file @ 15b544c5
lms/static/images/header-logo.png

3 KiB

lms/static/sass/_about.scss → lms/static/sass/_about_pages.scss
+ 0
− 0
View file @ 15b544c5
File moved
lms/static/sass/_course_info.scss → lms/static/sass/_course_about.scss
+ 70
− 66
View file @ 15b544c5
......@@ -96,70 +96,6 @@
}
}
}
.social-sharing {
@include box-sizing(border-box);
float: left;
height: 44px;
position: relative;
text-align: center;
width: flex-grid(6);
&:hover {
.sharing-message {
opacity: 1;
top: 56px;
}
}
.sharing-message {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%));
border: 1px solid rgba(0,0,0, 0.5);
@include border-radius(4px);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
color: rgb(255,255,255);
float: right;
font-family: $serif;
font-size: 0.9em;
font-style: italic;
left: 50%;
margin-left: -110px;
opacity: 0;
padding: 6px 10px;
position: absolute;
text-align: center;
@include transition(all, 0.15s, ease-out);
top: 65px;
width: 220px;
&:hover {
opacity: 0;
}
}
.share {
height: 44px;
@include inline-block;
margin-right: 10px;
opacity: 0.5;
@include transition(all, 0.15s, linear);
width: 44px;
&:hover {
opacity: 1;
}
img {
width: 100%;
}
&:last-child {
margin-right: 0px;
}
}
}
}
.media {
......@@ -307,12 +243,12 @@
border: 1px solid rgb(200,200,200);
border-top: none;
float: left;
padding: 30px 20px;
padding: 20px 20px 30px;
width: flex-grid(4);
header {
margin-bottom: 30px;
padding-bottom: 26px;
padding-bottom: 20px;
position: relative;
text-align: center;
......@@ -324,6 +260,7 @@
position: absolute;
bottom: 0px;
width: 100%;
z-index: 1;
}
a.university-name {
......@@ -341,6 +278,73 @@
color: $lighter-base-font-color;
}
}
.social-sharing {
@include box-sizing(border-box);
float: left;
height: 44px;
position: relative;
text-align: center;
width: flex-grid(12);
z-index: 2;
float: none;
&:hover {
.sharing-message {
opacity: 1;
top: 56px;
}
}
.sharing-message {
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.9) 0%,
rgba(0,0,0, 0.7) 100%));
border: 1px solid rgba(0,0,0, 0.5);
@include border-radius(4px);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
color: rgb(255,255,255);
float: right;
font-family: $serif;
font-size: 0.9em;
font-style: italic;
left: 50%;
margin-left: -110px;
opacity: 0;
padding: 6px 10px;
position: absolute;
text-align: center;
@include transition(all, 0.15s, ease-out);
top: 65px;
width: 220px;
&:hover {
opacity: 0;
}
}
.share {
height: 44px;
@include inline-block;
margin-right: 10px;
opacity: 0.5;
@include transition(all, 0.15s, linear);
width: 44px;
&:hover {
opacity: 1;
}
img {
width: 100%;
}
&:last-child {
margin-right: 0px;
}
}
}
}
.important-dates {
......
lms/static/sass/_course.scss → lms/static/sass/_course_object.scss
+ 0
− 0
View file @ 15b544c5
File moved
lms/static/sass/_find_courses.scss → lms/static/sass/_courses.scss
+ 0
− 0
View file @ 15b544c5
File moved
lms/static/sass/_index.scss → lms/static/sass/_home.scss
+ 0
− 0
View file @ 15b544c5
File moved
lms/static/sass/_shared_footer.scss deleted 100644 → 0
+ 0
− 132
View file @ d9e293f9
footer {
background: transparent;
border-top: 1px solid rgb(200,200,200);
@include box-shadow(inset 0 1px 3px 0 rgba(0,0,0, 0.1));
margin: 0 auto;
width: flex-grid(12);
&.fixed-bottom {
bottom: 0px;
max-width: 100%;
position: absolute;
}
nav {
@include box-sizing(border-box);
max-width: 1200px;
margin: 0 auto;
padding: 20px 10px 0;
width: flex-grid(12);
.primary-links {
@include clearfix;
margin-bottom: 30px;
}
.secondary-links {
padding-bottom: 10px;
text-align: left;
a {
letter-spacing: 1px;
margin-right: 20px;
}
}
.copyright {
float: left;
padding-top: 2px;
a.logo {
@include background-image(url('/static/images/logo.png'));
background-position: 0 -24px;
background-repeat: no-repeat;
@include inline-block;
float: left;
height: 23px;
margin-right: 15px;
margin-top: 2px;
padding-right: 15px;
position: relative;
width: 47px;
vertical-align: middle;
&:hover {
background-position: 0 0;
}
&::after {
@extend .faded-vertical-divider;
content: "";
display: block;
height: 30px;
right: 0px;
position: absolute;
top: -2px;
width: 1px;
}
}
p {
color: $lighter-base-font-color;
font-style: italic;
@include inline-block;
margin: 0 auto;
padding-top: 1px;
text-align: center;
vertical-align: middle;
a {
color: $lighter-base-font-color;
font-style: italic;
margin-left: 5px;
}
}
}
ol {
float: right;
li {
@include inline-block;
list-style: none;
padding: 0px 15px;
position: relative;
vertical-align: middle;
&::after {
@extend .faded-vertical-divider;
content: "";
display: block;
height: 30px;
right: 0px;
position: absolute;
top: -5px;
width: 1px;
}
a:link, a:visited {
color: $lighter-base-font-color;
letter-spacing: 1px;
padding: 6px 0px;
}
&.social {
border: none;
margin: 0 0 0 5px;
padding: 0;
a {
opacity: 0.7;
padding: 0 0 0 10px;
@include transition(all, 0.1s, linear);
&:hover {
opacity: 1;
}
}
}
}
}
}
}
lms/static/sass/application.css
+ 277
− 206
View file @ 15b544c5
This diff is collapsed.
lms/static/sass/application.scss
+ 17
− 20
View file @ 15b544c5
@import 'bourbon/bourbon';
@import 'reset';
@import 'font_face';
@import 'base';
@import 'base_mixins';
@import 'base_extends';
@import 'base_animations';
@import 'base_styles/reset';
@import 'base_styles/font_face';
@import 'base_styles/base';
@import 'base_styles/base_mixins';
@import 'base_styles/base_extends';
@import 'base_styles/base_animations';
@import 'sass_old/base/variables';
//@import 'sass_old/base/base';
@import 'sass_old/base/extends';
//@import 'sass_old/base/font-face';
@import 'sass_old/base/functions';
//@import 'sass_old/base/reset';
@import 'shared_forms';
@import 'shared_footer';
@import 'shared_header';
@import 'shared_list_of_courses';
@import 'shared_course_filter';
@import 'shared_modal';
@import 'shared_styles/shared_forms';
@import 'shared_styles/shared_footer';
@import 'shared_styles/shared_header';
@import 'shared_styles/shared_list_of_courses';
@import 'shared_styles/shared_course_filter';
@import 'shared_styles/shared_modal';
@import 'index';
@import 'home';
@import 'dashboard';
@import 'course';
@import 'find_courses';
@import 'course_info';
@import 'course_object';
@import 'courses';
@import 'course_about';
@import 'jobs';
@import 'about';
@import 'about_pages';
@import 'press_release';
@import 'sass_old/courseware/courseware';
......
lms/static/sass/_base.scss → lms/static/sass/base_styles/_base.scss
+ 1
− 1
View file @ 15b544c5
......@@ -17,6 +17,7 @@ $yellow: rgb(255, 252, 221);
html, body {
background: rgb(250,250,250);
//background: rgb(77, 82, 99);
font-family: $sans-serif;
font-size: 1em;
line-height: 1em;
......@@ -89,7 +90,6 @@ a:link, a:visited {
}
}
.content-wrapper {
background: rgb(255,255,255);
margin: 0 auto 0;
......
lms/static/sass/shared_styles/_shared_footer.scss 0 → 100644
+ 181
− 0
View file @ 15b544c5
footer {
background: transparent;
border-top: 1px solid rgb(200,200,200);
@include box-shadow(inset 0 1px 3px 0 rgba(0,0,0, 0.1));
margin: 0 auto;
width: flex-grid(12);
&.fixed-bottom {
bottom: 0px;
max-width: 100%;
position: absolute;
}
nav {
@include box-sizing(border-box);
max-width: 1200px;
margin: 0 auto;
padding: 30px 10px 0;
width: flex-grid(12);
.top {
border-bottom: 1px solid rgb(200,200,200);
@include clearfix;
padding-bottom: 30px;
width: flex-grid(12);
text-align: center;
ol {
float: right;
li {
@include inline-block;
list-style: none;
padding: 0px 15px;
position: relative;
vertical-align: middle;
&::after {
@extend .faded-vertical-divider;
content: "";
display: block;
height: 30px;
right: 0px;
position: absolute;
top: -5px;
width: 1px;
}
a:link, a:visited {
color: $lighter-base-font-color;
letter-spacing: 1px;
padding: 6px 0px;
}
}
}
.primary {
@include clearfix;
float: left;
a.logo {
@include background-image(url('/static/images/logo.png'));
background-position: 0 -24px;
background-repeat: no-repeat;
@include inline-block;
height: 22px;
margin-right: 15px;
margin-top: 2px;
padding-right: 15px;
position: relative;
width: 47px;
vertical-align: middle;
&:hover {
background-position: 0 0;
}
&::after {
@extend .faded-vertical-divider;
content: "";
display: block;
height: 30px;
right: 0px;
position: absolute;
top: -3px;
width: 1px;
}
}
a {
color: $lighter-base-font-color;
@include inline-block;
letter-spacing: 1px;
margin-right: 20px;
padding-top: 2px;
vertical-align: middle;
&:hover {
color: $base-font-color;
text-decoration: none;
}
}
}
.social {
float: right;
&.social {
border: none;
margin: 0 0 0 5px;
padding: 0;
a {
opacity: 0.7;
padding: 0 0 0 10px;
@include transition(all, 0.1s, linear);
&:hover {
opacity: 1;
}
}
}
}
}
.bottom {
@include clearfix;
opacity: 0.8;
padding: 10px 0px 30px;
@include transition(all, 0.15s, linear);
width: flex-grid(12);
&:hover {
opacity: 1;
}
.copyright {
float: left;
p {
color: $lighter-base-font-color;
font-style: italic;
@include inline-block;
margin: 0 auto;
padding-top: 1px;
text-align: center;
vertical-align: middle;
a {
color: $lighter-base-font-color;
font-style: italic;
margin-left: 5px;
&:hover {
color: $blue;
}
}
}
}
.secondary {
float: right;
text-align: left;
a {
color: $lighter-base-font-color;
font-family: $serif;
font-style: italic;
letter-spacing: 1px;
line-height: 1.6em;
margin-left: 20px;
text-transform: lowercase;
&:hover {
color: $blue;
}
}
}
}
}
}
lms/static/sass/_shared_header.scss → lms/static/sass/shared_styles/_shared_header.scss
+ 5
− 5
View file @ 15b544c5
......@@ -19,7 +19,7 @@ header.global {
h1.logo {
float: left;
margin: 9px 15px 0px 0px;
margin: 6px 15px 0px 0px;
padding-right: 20px;
position: relative;
......@@ -30,7 +30,7 @@ header.global {
height: 50px;
position: absolute;
right: 1px;
top: -12px;
top: -8px;
width: 1px;
}
......@@ -46,12 +46,12 @@ header.global {
}
a {
@include background-image(url('/static/images/logo.png'));
@include background-image(url('/static/images/header-logo.png'));
background-position: 0 0;
background-repeat: no-repeat;
display: block;
height: 23px;
width: 47px;
height: 31px;
width: 64px;
}
}
......
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