From 5eab8ba70b40e03cf91d44168b18d9cbf9a9c295 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Wed, 25 Jan 2012 13:43:09 -0500 Subject: [PATCH] switch from fancybox to leanmodal and update .hgignore --- .hgignore | 2 + index.html | 25 +++------ login.html | 2 +- main.html | 39 ++++++------- marketing.html | 14 ++--- sass/_courseware.scss | 21 ++++++- sass/_leanmodal.scss | 126 ++++++++++++++++++++++++++++++++++++++++++ sass/application.scss | 2 +- sass/marketing.scss | 2 +- 9 files changed, 180 insertions(+), 53 deletions(-) create mode 100644 sass/_leanmodal.scss diff --git a/.hgignore b/.hgignore index 146ee64b8a..70b2a84d7d 100644 --- a/.hgignore +++ b/.hgignore @@ -2,3 +2,5 @@ syntax: glob *.pyc *~ *.scssc +*.swp +*.orig diff --git a/index.html b/index.html index 5f74afa364..24317c0faf 100644 --- a/index.html +++ b/index.html @@ -4,14 +4,14 @@

Circuits & Electronics

6.002

- Enroll in 6.002 Circuits & Electronics + Enroll in 6.002 Circuits & Electronics

Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, “6.002x Circuits and Electronics” is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012.

@@ -50,7 +50,7 @@
- Enroll in Circuits & Electronics + Enroll in Circuits & Electronics
@@ -101,21 +101,10 @@ -
-
<%include file="create_account.html" />
-
- -
-
<%include file="login.html" />
-
- -
-
<%include file="password_reset_form.html" />
-
- -
-
-
+
<%include file="create_account.html" />
+
<%include file="login.html" />
+
<%include file="password_reset_form.html" />
+
+ @@ -27,15 +28,11 @@ - - + <%block name="headextra"/> @@ -50,38 +47,34 @@ $(function() {

Copyright (c). 2011. MIT. Some rights reserved.

-
-
- Found a bug? Got an idea for improving our system? Let us know. +
+

Found a bug? Got an idea for improving our system? Let us know.

    -
    2. -
    3. +
    4. +
-
-
-
- +
+ - + -

Supported operations: ^ * / + - || ()

Supported suffixes: %kMGTcmunp

+

Supported operations: ^ * / + - || ()

-
+ - + <%block name="headextra"/> diff --git a/sass/_courseware.scss b/sass/_courseware.scss index 4952a29168..7efdf60ba8 100644 --- a/sass/_courseware.scss +++ b/sass/_courseware.scss @@ -5,6 +5,17 @@ div.course-wrapper { div#accordion { @extend .sidebar; + div#open_close_accordion { + position: absolute; + right: 0px; + width: 20px; + height: 20px; + background: #ccc; + border: 1px solid black; + right: -22px; + top: 5px; + } + h3 { overflow: hidden; margin: 0; @@ -165,7 +176,7 @@ div.course-wrapper { float: left; li { - margin-bottom: 8px; + margin-bottom: 0px; cursor: pointer; border: 0; padding: 0; @@ -179,6 +190,14 @@ div.course-wrapper { &:hover { color: $mit-red; } + + div { + margin-bottom: 8px; + } + + div:empty { + margin-bottom: 0px; + } } } } diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss new file mode 100644 index 0000000000..b7d91384df --- /dev/null +++ b/sass/_leanmodal.scss @@ -0,0 +1,126 @@ +#lean_overlay { + position: fixed; + z-index:100; + top: 0px; + left: 0px; + height:100%; + width:100%; + background: #000; + display: none; +} + +div.leanModal_box { + @include border-radius(3px); + @include box-shadow(0 0 6px #000); + @include box-sizing(border-box); + display: none; + border: none; + max-width: 600px; + background: #fff; + padding: lh(2); + + h1 { + font-size: 24px; + margin-top: 0; + font-family: "Oswald"; + padding-bottom: lh(); + border-bottom: 1px solid #eee; + margin-bottom: lh(); + } + + form { + text-align: left; + + div#enroll_error { + padding-bottom: lh(); + color: #DF8B2C; + text-transform: uppercase; + letter-spacing: 1px; + font-weight: bold; + } + + ol { + li { + margin-bottom: lh(); + width: grid-width(6); + float: left; + + &:nth-child(odd) { + margin-right: $gw-gutter; + } + + &.terms, &.remember { + float: none; + width: auto; + clear: both; + padding-top: lh(); + border-top: 1px solid #eee; + } + + &.honor-code { + width: auto; + float: none; + } + + label { + display: block; + font-weight: bold; + } + + #{$all-text-inputs}, textarea { + width: 100%; + @include box-sizing(border-box); + } + + input[type="checkbox"] { + margin-right: 10px; + } + } + } + + input[type="button"] { + @include button($mit-red); + font-size: 18px; + padding: lh(.5); + } + } + + div#login { + min-width: 300px; + + ol { + li { + width: auto; + float: none; + } + } + } + + div.lost-password { + text-align: left; + margin-top: lh(); + + a { + color: #999; + + &:hover { + color: #444; + } + } + } +} + +div#feedback_div{ + form{ + ol { + li { + float: none; + width: 100%; + + textarea#feedback_message { + height: 100px; + } + } + } + } +} diff --git a/sass/application.scss b/sass/application.scss index 39ccb804e8..c3b53d00da 100644 --- a/sass/application.scss +++ b/sass/application.scss @@ -5,7 +5,7 @@ // Base layout @import "base-variables", "base-extends", "base"; @import "layout"; -@import "fancybox"; +@import "leanmodal"; // pages @import "courseware"; diff --git a/sass/marketing.scss b/sass/marketing.scss index 99c1cc2904..545fe122f0 100644 --- a/sass/marketing.scss +++ b/sass/marketing.scss @@ -3,4 +3,4 @@ // pages @import "index-functions", "index-variables", "index"; -@import "fancybox"; +@import "leanmodal";