Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release/1.0

Browse Source 
Conflicts:
	lms/templates/index.html
This commit is contained in:
Bridger Maxwell
2012-07-17 15:24:25 -04:00
parent 30d0a9bd7f ba6346cb22
commit 6ed9f71608
15 changed files with 368 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lms/static/images/about_1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 566 KiB

BIN
lms/static/images/brazilstory_blog_arthur.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 382 KiB

BIN
lms/static/images/laffont_temp.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

44
lms/static/sass/_about_pages.scss
View File

@@ -37,6 +37,14 @@
margin-bottom: 80px;
}
h2.mission-quote {
font-style: italic;
margin: 0 auto 120px;;
text-align: center;
text-transform: none;
width: flex-grid(10);
}
.message {
@include clearfix;
margin-bottom: 60px;
@@ -60,7 +68,7 @@
img {
background: rgb(245,245,245);
display: block;
height: 200px;
//height: 200px;
width: 100%;
}
}
@@ -88,6 +96,19 @@
margin-bottom: 0px;
}
}
.partners {
@include clearfix;
> article {
float: left;
width: flex-grid(6);
&:first-child {
margin-right: flex-gutter();
}
}
}
}
.faq {
@@ -146,27 +167,6 @@
}
.press {
.press-resources {
@include clearfix;
margin-bottom: 60px;
.pressreleases, .identity-assets {
background: rgb(245,245,245);
border: 1px solid rgb(200,200,200);
@include box-sizing(border-box);
@include border-radius(4px);
float: left;
padding: 20px 30px;
text-align: center;
width: flex-grid(6);
}
.pressreleases {
margin-right: flex-gutter();
}
}
.press-story {
border-bottom: 1px solid rgb(220,220,220);
@include clearfix;

19
lms/static/sass/_course_about.scss
View File

@@ -10,21 +10,21 @@
@include box-shadow(0 1px 80px 0 rgba(0,0,0, 0.5));
border-bottom: 1px solid rgb(100,100,100);
@include box-shadow(inset 0 1px 5px 0 rgba(0,0,0, 0.1));
height: 280px;
margin-top: -69px;
padding-top: 150px;
overflow: hidden;
padding: 134px 0px 60px;
position: relative;
width: 100%;
.intro-inner-wrapper {
background: rgba(255,255,255, 0.9);
background: rgba(255,255,255, 0.93);
border: 1px solid rgb(100,100,100);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
@include clearfix;
margin: 0 auto;
max-width: 1200px;
padding: 0px 10px;
position: relative;
width: grid-width(12);
z-index: 2;
@@ -34,6 +34,7 @@
@include box-sizing(border-box);
@include clearfix;
float: left;
height: 180px;
padding: 20px 20px;
position: relative;
width: flex-grid(8) + flex-gutter();
@@ -42,8 +43,8 @@
> hgroup {
border-bottom: 1px solid rgb(210,210,210);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6));
margin-bottom: 30px;
padding-bottom: 15px;
margin-bottom: 27px;
padding-bottom: 20px;
width: 100%;
h1 {
@@ -100,18 +101,20 @@
}
.media {
background: #fff;
background: transparent;
border-left: 1px solid rgb(100,100,100);
@include box-sizing(border-box);
display: block;
float: right;
padding: 1px;
height: 180px;
padding: 20px;
position: relative;
width: flex-grid(4);
z-index: 2;
.hero {
height: 180px;
border: 1px solid rgb(100,100,100);
height: 100%;
overflow: hidden;
position: relative;

19
lms/static/sass/_courses.scss
View File

@@ -4,10 +4,10 @@
header.search {
background: rgb(240,240,240);
//@include background-image(url('/static/images/shot-2-large.jpg'));
background-size: cover;
border-bottom: 1px solid rgb(100,100,100);
@include box-shadow(inset 0 -1px 8px 0 rgba(0,0,0, 0.2), inset 0 1px 12px 0 rgba(0,0,0, 0.3));
height: 430px;
margin-top: -69px;
width: 100%;
@@ -15,26 +15,13 @@
height: 120px;
margin: 0 auto;
max-width: 1200px;
overflow: hidden;
padding: 154px 0px 80px;
padding-top: 200px;
position: relative;
text-align: center;
width: flex-grid(12);
&::before {
@include background-image(radial-gradient(50% 50%, circle closest-side, rgba(255,255,255, 1) 0%, rgba(255,255,255, 0) 100%));
bottom: -300px;
content: "";
display: none;
height: 600px;
margin: 0 auto;
position: absolute;
width: 100%;
z-index: 1;
}
> hgroup {
background: rgba(255,255,255, 0.9);
background: rgba(255,255,255, 0.93);
border: 1px solid rgb(100,100,100);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
padding: 20px 30px;

374
lms/static/sass/_home.scss
View File

@@ -8,218 +8,179 @@
border-bottom: 1px solid rgb(80,80,80);
@include box-shadow(0 1px 0 0 rgba(255,255,255, 0.9), inset 0 -1px 5px 0 rgba(0,0,0, 0.1));
@include clearfix;
height: 430px;
margin-top: -69px;
overflow: hidden;
padding: 149px 0px 90px;
padding: 0px;
width: flex-grid(12);
.outer-wrapper {
@extend .animation-home-header-pop-up;
max-width: 1200px;
margin: 0 auto;
padding: 0 10px;
padding: 200px 10px 0px;
position: relative;
text-align: center;
&:hover {
.main-cta {
@include box-shadow(0 1px 16px 0 rgba($blue, 0.35));
}
}
}
.inner-wrapper {
background: rgba(255,255,255, 0.9);
border: 1px solid rgb(100,100,100);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include inline-block;
padding: 20px 30px 30px;
position: relative;
text-align: center;
z-index: 1;
width: grid-width(12);
}
.title {
background: rgba(255,255,255, 0.93);
border: 1px solid rgb(100,100,100);
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
@include box-sizing(border-box);
height: 120px;
@include inline-block;
margin-left: grid-width(1) + $gw-gutter;
margin-right: $gw-gutter;
position: relative;
text-align: left;
vertical-align: middle;
text-align: center;
@include transition(all, 0.2s, linear);
vertical-align: top;
&::after {
@extend .faded-vertical-divider-light;
content: "";
display: block;
height: 170px;
position: absolute;
right: -1px;
top: -20px;
}
&:hover {
height: 165px;
h1 {
border-bottom: 1px solid rgb(200,200,200);
margin-bottom: 25px;
padding-bottom: 15px;
text-align: left;
text-shadow: 0 1px rgba(255,255,255, 0.6);
}
.main-cta {
@include clearfix;
float: left;
margin-right: flex-gutter();
@include transition(all, 0.15s, linear);
width: flex-grid(6);
> a.find-courses {
@include button(shiny, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
display: block;
font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px;
padding: 10px 0px;
text-transform: uppercase;
text-align: center;
width: flex-grid(12);
&:hover {
color: rgb(255,255,255);
> hgroup {
h1 {
border-bottom: 1px solid rgb(200,200,200);
padding-bottom: 10px;
}
}
}
.secondary-actions {
@include box-sizing(border-box);
@include clearfix;
float: left;
height: 47px;
width: flex-grid(6);
a.intro-video {
background: rgb(245,245,245);
@include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(235,235,235)));
border: 1px solid rgb(200,200,200);
@include border-radius(30px);
@include box-sizing(border-box);
@include box-shadow(inset 0 -1px 0 0 rgba(255,255,255, 0.8), inset 0 1px 0 0 rgba(255,255,255, 0.8));
@include clearfix;
display: block;
float: left;
height: 100%;
overflow: hidden;
text-align: middle;
width: flex-grid(6);
&:hover {
text-decoration: none;
p {
color: $base-font-color;
}
.video {
opacity: 1;
}
}
.video {
@include background-image(url('/static/images/shot-2-large.jpg'));
background-size: cover;
border-right: 1px solid rgb(200,200,200);
@include border-left-radius(30px);
@include box-shadow(1px 0 0 0 rgba(255,255,255, 0.6), inset 1px 0 0 0 rgba(255,255,255, 0.8), inset 0 0 0 1px rgba(255,255,255, 0.7));
float: left;
height: 100%;
opacity: 0.8;
position: relative;
@include transition(all, 0.15s, linear);
width: 60px;
vertical-align: middle;
.play {
@include background-image(url('/static/images/portal-icons/video-play-icon.png'));
background-size: cover;
height: 31px;
margin-left: -13px;
margin-top: -15px;
left: 50%;
position: absolute;
top: 50%;
width: 31px;
}
}
p {
color: $lighter-base-font-color;
font-style: italic;
padding-top: 10px;
text-align: center;
text-shadow: 0 1px rgba(255,255,255, 0.6);
@include transition(all, 0.15s, linear);
vertical-align: middle;
}
}
.social-sharing {
@include box-sizing(border-box);
float: left;
height: 44px;
margin-right: flex-gutter();
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;
h2 {
opacity: 0;
padding: 6px 10px;
position: absolute;
}
}
.actions {
opacity: 1;
}
}
> hgroup {
@include box-sizing(border-box);
height: 120px;
@include inline-block;
left: 0px;
opacity: 1;
padding: 20px 30px;
top: 0px;
@include transition(all, 0.2s, linear);
text-align: left;
h1 {
margin-bottom: 0px;
text-align: left;
text-shadow: 0 1px rgba(255,255,255, 0.6);
text-transform: none;
}
h2 {
font-style: italic;
margin-bottom: 0px;
text-transform: lowercase;
}
}
.actions {
@include clearfix;
@include box-sizing(border-box);
left: 0px;
opacity: 0;
padding: 20px 30px 0px;
position: absolute;
@include transition(opacity, 0.2s, linear);
top: 75px;
width: flex-grid(12);
.main-cta {
float: left;
margin-right: flex-gutter();
width: flex-grid(6);
> a.find-courses {
@include button(shiny, $blue);
@include box-sizing(border-box);
@include border-radius(3px);
display: block;
font: normal 1.2rem/1.6rem $sans-serif;
letter-spacing: 1px;
padding: 10px 0px;
text-transform: uppercase;
text-align: center;
@include transition(all, 0.15s, ease-out);
top: 65px;
width: 220px;
width: flex-grid(12);
&:hover {
opacity: 0;
color: rgb(255,255,255);
}
}
}
.share {
.secondary-actions {
@include box-sizing(border-box);
@include clearfix;
float: left;
width: flex-grid(6);
.social-sharing {
@include box-sizing(border-box);
float: left;
height: 44px;
@include inline-block;
margin-right: 10px;
opacity: 0.5;
@include transition(all, 0.15s, linear);
width: 44px;
margin-right: flex-gutter();
position: relative;
text-align: center;
width: flex-grid(12);
&:hover {
opacity: 1;
.sharing-message {
opacity: 1;
top: 50px;
}
}
img {
width: 100%;
.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: 25px;
width: 220px;
&:hover {
opacity: 0;
}
}
&:last-child {
margin-right: 0px;
.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;
}
}
}
}
@@ -227,20 +188,23 @@
}
.media {
background: #fff;
border: 1px solid rgb(200,200,200);
background: rgba(255,255,255, 0.93);
border: 1px solid rgb(100,100,100);
@include box-sizing(border-box);
float: left;
@include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5));
height: 120px;
@include inline-block;
padding: 1px;
padding: 4px;
position: relative;
vertical-align: middle;
//width: 210px;
width: flex-grid(3);
vertical-align: top;
width: 210px;
z-index: 2;
&:hover {
text-decoration: underline;
}
.hero {
//height: 125px;
height: 100%;
overflow: hidden;
position: relative;
@@ -249,15 +213,16 @@
@include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75)));
@include border-radius(4px);
@include box-shadow(0 1px 12px 0 rgba(0,0,0, 0.4));
@include box-sizing(border-box);
border: 2px solid rgba(255,255,255, 0.8);
height: 80px;
height: 60px;
left: 50%;
margin-top: -40px;
margin-left: -40px;
margin-top: -30px;
margin-left: -30px;
position: absolute;
top: 50%;
@include transition(all, 0.15s, linear);
width: 80px;
width: 60px;
&::after {
color: rgba(255,255,255, 0.8);
@@ -491,10 +456,14 @@
.news {
@include box-sizing(border-box);
@include box-shadow(inset 0 0 3px 0 rgba(0,0,0, 0.15));
padding: 20px;
width: flex-grid(12);
.blog-posts {
border-bottom: 1px solid rgb(220,220,220);
margin-bottom: 20px;
padding-bottom: 20px;
@include clearfix;
> article {
@@ -552,11 +521,28 @@
.post-date {
color: $lighter-base-font-color;
display: none;
letter-spacing: 1px;
}
}
}
}
.press-links {
h3 {
display: inline;
font-family: $sans-serif;
font-weight: 700;
line-height: 1.6em;
}
a {
line-height: 1.6em;
font-family: $serif;
font-style: italic;
margin-left: 10px;
}
}
}
}
}

2
lms/static/sass/base/_base.scss
View File

@@ -18,7 +18,7 @@ h1 {
letter-spacing: 1px;
margin-bottom: 30px;
text-align: center;
text-transform: uppercase;
//text-transform: uppercase;
}
h2 {