diff --git a/lms/static/sass/_about.scss b/lms/static/sass/_about.scss index 249b0e3b48..96b0f4e994 100644 --- a/lms/static/sass/_about.scss +++ b/lms/static/sass/_about.scss @@ -138,6 +138,27 @@ } .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; @@ -179,7 +200,10 @@ font-weight: bold; } - a { + span.post-date { + color: $lighter-base-font-color; + font: 300 italic 1.2rem/1.6rem $sans-serif; + margin-right: 10px; } } } diff --git a/lms/static/sass/_index.scss b/lms/static/sass/_index.scss index 2ff36051d8..ea1777b487 100644 --- a/lms/static/sass/_index.scss +++ b/lms/static/sass/_index.scss @@ -1,5 +1,5 @@ .home { - padding: 0px 0px 100px; + padding: 0px; > header { background: rgb(255,255,255); @@ -46,7 +46,7 @@ text-align: left; vertical-align: middle; - &::after { + &::before { @extend .faded-vertical-divider; content: ""; display: block; @@ -56,6 +56,16 @@ top: -20px; } + &::after { + @extend .faded-vertical-divider-light; + content: ""; + display: block; + height: 170px; + position: absolute; + right: -1px; + top: -20px; + } + h1 { border-bottom: 1px solid rgb(200,200,200); margin-bottom: 25px; @@ -245,9 +255,8 @@ } .highlighted-courses { - border-bottom: 1px solid rgb(210,210,210); @include box-sizing(border-box); - margin-bottom: 60px; + margin-bottom: 0px; position: relative; width: flex-grid(12); z-index: 1; @@ -259,6 +268,7 @@ border-top-color: rgb(190,190,190); @include box-shadow(inset 0 0 0 1px rgba(255,255,255, 0.4), 0 0px 12px 0 rgba(0,0,0, 0.2)); color: $lighter-base-font-color; + //display: none; letter-spacing: 1px; margin-bottom: 0px; margin-top: -15px; @@ -275,6 +285,7 @@ } .university-partners { + //@include background-image(linear-gradient(-90deg, rgb(250,250,250), rgb(240,240,240))); @include background-image(linear-gradient(180deg, rgba(245,245,245, 0) 0%, rgba(245,245,245, 1) 50%, rgba(245,245,245, 0) 100%)); @@ -407,29 +418,101 @@ } .more-info { - margin-bottom: 60px; + //background: rgb(245,245,245); + //border-top: 1px solid rgb(200,200,200); + padding: 40px 0px 80px; width: flex-grid(12); - h2 { - color: $lighter-base-font-color; - font: normal 1.4rem/1.8rem $serif; - letter-spacing: 1px; - margin-bottom: 20px; + header { + border-bottom: 1px solid rgb(220,220,220); + @include clearfix; + margin-bottom: 30px; + + h2 { + float: left; + } + + a { + color: $lighter-base-font-color; + float: right; + font: italic 1.2rem/1.6rem $serif; + padding-top: 5px; + + &:hover { + color: $base-font-color; + } + } } .news { - font-size: 0em; + //border: 1px solid rgb(200,200,200); + @include box-sizing(border-box); + //padding: 20px; width: flex-grid(12); - > article { - background: rgb(240,240,240); - @include inline-block; - height: 150px; - margin-right: flex-gutter(); - width: flex-grid(3); + .blog-posts { + @include clearfix; + //border-bottom: 1px solid rgb(220,220,220); + //margin-bottom: 30px; + //padding-bottom: 30px; - &:last-child { - margin-right: 0px; + > article { + //background: rgb(250,250,250); + border-left: 1px dotted rgb(220,220,220); + @include box-sizing(border-box); + //@include box-shadow(0 1px 10px 0 rgba(0,0,0, 0.1)); + @include clearfix; + float: left; + margin-right: flex-gutter(); + padding: 10px 0px 10px 20px; + width: flex-grid(4); + + &:last-child { + margin-right: 0px; + } + + .post-graphics { + border: 1px solid rgb(190,190,190); + @include box-sizing(border-box); + float: left; + height: 65px; + margin-right: flex-gutter(); + overflow: hidden; + width: flex-grid(4); + vertical-align: top; + + img { + min-height: 100%; + max-width: 100%; + } + } + + .post-name { + float: left; + width: flex-grid(8); + vertical-align: top; + + h3 { + font: 700 1.2rem/1.6rem $sans-serif; + margin-bottom: 5px; + + a { + color: $base-font-color; + font: 700 1.2rem/1.6rem $sans-serif; + + &:hover { + color: $blue; + text-decoration: underline; + } + } + } + + .post-date { + color: $lighter-base-font-color; + font: italic 300 1.2rem/1.6rem $sans-serif; + letter-spacing: 1px; + } + } } } } diff --git a/lms/templates/index.html b/lms/templates/index.html index a4acb6f829..f6be27fd6b 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -39,7 +39,7 @@
-

Explore courses from edX universities

+

Explore courses from edX universities

    @@ -76,15 +76,48 @@ %endfor
+
-
-

edX News & Announcements

+
+
+
+

edX News & Announcements

+ Read More → +
-
-
-
-
+
+ + + + + +
+
diff --git a/lms/templates/press.html b/lms/templates/press.html index 4a11e38f6e..7aea1aff14 100644 --- a/lms/templates/press.html +++ b/lms/templates/press.html @@ -11,6 +11,14 @@
+
+
+

View our Press Release

+
+
+

Download our Logos

+
+
@@ -18,6 +26,7 @@

Online Classes Cut Costs, But Do They Dilute Brands?

+ http://n.pr/Lt5ydM

"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."

@@ -31,6 +40,7 @@

Online Classes Cut Costs, But Do They Dilute Brands?

+ http://n.pr/Lt5ydM

"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."

@@ -44,6 +54,7 @@

Online Classes Cut Costs, But Do They Dilute Brands?

+ http://n.pr/Lt5ydM

"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."

@@ -57,6 +68,7 @@

Online Classes Cut Costs, But Do They Dilute Brands?

+ http://n.pr/Lt5ydM

"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."