From a761ebf6475eec5987652a8e9a8b327720f8132c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 24 Jan 2012 15:50:49 -0500 Subject: [PATCH] Style for sub pages before the login screen --- copyright.html | 43 +++++++++++++++++++++------- honor.html | 21 +++++++------- privacy.html | 12 ++++---- sass/_index.scss | 74 +++++++++++++++++++++++++++++++++++++----------- tos.html | 24 +++++++--------- 5 files changed, 117 insertions(+), 57 deletions(-) diff --git a/copyright.html b/copyright.html index 0f5dc10b47..eb75b58515 100644 --- a/copyright.html +++ b/copyright.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
+
@@ -13,18 +14,38 @@
-
+
-

Licensing Information

+
+

Licensing Information

- - - - - -
Videos and Ungraded Exercises Creative Commons License
The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
Graded ExercisesGraded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
TextbookTextbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.
Student-generated contentDue to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
Source CodeSource code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.
+
    +
  • +

    Videos and Ungraded Exercises

    +

    Creative Commons License
    The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.

    +
    • -

    MIT and MITx are trademarks of the Massachusetts Instititute of -Technology, and may not be used without permission. +

  • +

    Graded Exercises

    +

    Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.

    +
    • + +
  • +

    Textbook

    +

    Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.

    +
    • + +
  • +

    Student-generated content

    + Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
    • + +
  • +

    Source Code

    +

    Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.

    +
    • +
+ +

MIT and MITx are trademarks of the Massachusetts Institute of Technology, and may not be used without permission.

+
diff --git a/honor.html b/honor.html index fc934c383e..13be4777b8 100644 --- a/honor.html +++ b/honor.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
+
@@ -13,14 +14,14 @@
-
- -

Honor Code

- -
    -
  • I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others. - I agree to never post answers to problems. -
  • I agree to maintain only one account. -
+
+
+

Honor Code

+
    +
  • I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
    • +
  • I agree to never post answers to problems.
    • +
  • I agree to maintain only one account.
    • +
+
diff --git a/privacy.html b/privacy.html index 286e503455..e79a1db5ca 100644 --- a/privacy.html +++ b/privacy.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
+
@@ -13,9 +14,8 @@
-
- -

Privacy Policy

- - +
+
+

Privacy Policy

+
diff --git a/sass/_index.scss b/sass/_index.scss index 71fdd34cde..d886236114 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -12,8 +12,6 @@ src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff') format('woff'); } - - // Extends //---------------------------------------- // .wrapper { @@ -25,6 +23,37 @@ width: flex-grid(12); } +.subpage { + @extend .clearfix; + @extend .wrapper; + + > div { + padding-left: flex-grid(4) + flex-gutter(); + + p { + margin-bottom: lh(); + } + + h1 { + margin-bottom: lh(.5); + } + + h2 { + font: 18px $header-font-family; + color: #000; + margin-bottom: lh(.5); + } + + ul { + list-style: disc outside none; + + li { + list-style: disc outside none; + } + } + } +} + .clearfix:after { content: "."; display: block; @@ -60,25 +89,34 @@ body { color: #444; font: $body-font-size $body-font-family; -#{$all-text-inputs}, textarea { - @include box-shadow(0 -1px 0 #fff); - @include linear-gradient(#eee, #fff); - border: 1px solid #999; - font: $body-font-size $body-font-family; - padding: 4px; - width: 100%; - - &:focus { - border-color: $mit-red; + h1 { + font: 800 24px $header-font-family; + } + + + li { + margin-bottom: lh(); + } + + #{$all-text-inputs}, textarea { + @include box-shadow(0 -1px 0 #fff); + @include linear-gradient(#eee, #fff); + border: 1px solid #999; + font: $body-font-size $body-font-family; + padding: 4px; + width: 100%; + + &:focus { + border-color: $mit-red; + } } -} } header.announcement { - color: #fff; - border-bottom: 1px solid #000; - background: #e3e3e3; @include background-size(cover); + background: #333; + border-bottom: 1px solid #000; + color: #fff; &.home { @media screen and (min-width: 1200px) { @@ -399,6 +437,10 @@ section.index-content { } } +section.copyright, section.tos, section.privacy-policy, section.honor-code { + @extend .subpage; +} + footer { @extend .wrapper; @extend .clearfix; diff --git a/tos.html b/tos.html index 94feac75e2..50350735b5 100644 --- a/tos.html +++ b/tos.html @@ -1,8 +1,9 @@ <%inherit file="marketing.html" /> -
+
@@ -13,18 +14,13 @@
-
- -

Terms of Service

- - - - - - -
Videos and Ungraded Exercises Creative Commons License
The videos on this page are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
Graded ExercisesGraded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
TextbookTextbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work.
Student-generated contentDue to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT.
Source CodeSource code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter.
- -

MIT and MITx are trademarks of the Massachusetts Instititute of -Technology, and may not be used without permission. +

+
+

MITx Terms of Service

+

Welcome to MITx. You must read and agree to these Terms of Service ("TOS") prior to using any portion of this site (”Site“), including accessing any chat room, mailing list, or other electronic service. These TOS, MITx’s Privacy Policy [link] and Honor Code [link] are an agreement between you and the Massachusetts Institute of Technology ("MIT"). By registering for, accessing, browsing, or using any portion of the Site, you acknowledge that you have read, understood and agree to be bound by these TOS, the Privacy Policy and Honor Code.

+

MITx reserves the right to modify these TOS at any time and will publish notice of any such modifications online on the Site’s homepage for a reasonable period of time following such modifications, and by changing the effective date of these TOS. By continuing to access the Site after notice of such modifications has been published, you signify your agreement to be bound by them.

+

Description of MITx

+

MITx offers online courses, professor-to-student and student-to-student interactivity, individual assessment of a student&rsqyo;s work, and the opportunity for students who demonstrate their mastery of subjects to earn a certificate or credential awarded by MITx.

+