From 3d39a7ac76e217dfa20de670b455504b3268b3ee Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 24 Jan 2012 11:36:45 -0500 Subject: [PATCH 1/3] compiled css --- css/application.css | 30 ++++++++++++++++++++++++++---- css/marketing.css | 9 +++++++++ images/.DS_Store | Bin 6148 -> 6148 bytes 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/css/application.css b/css/application.css index fb519a1d22..c498ecb810 100644 --- a/css/application.css +++ b/css/application.css @@ -56,7 +56,7 @@ blockquote, q { font-weight: bold; src: local("Droid Sans Bold"), local("DroidSans-Bold"), url("http://themes.googleusercontent.com/static/fonts/droidsans/v3/EFpQQyG9GqCrobXxL-KRMXbFhgvWbfSbdVg11QabG8w.woff") format("woff"); } -.clearfix:after, .topbar:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body div.header-wrapper header:after, html body div.header-wrapper header nav ul:after, html body section.main-content:after, html footer:after, div.course-wrapper section.course-content ol.vert-mod li:after, div.book-wrapper section.book nav ul:after, div.wiki-wrapper div#wiki_panel div#wiki_create_form:after { +.clearfix:after, .topbar:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, secondaryHeader:after, html body div.header-wrapper header:after, html body div.header-wrapper header nav ul:after, html body section.main-content:after, html footer:after, div.course-wrapper section.course-content ol.vert-mod li:after, div.book-wrapper section.book nav ul:after, div.wiki-wrapper div#wiki_panel div#wiki_create_form:after { content: "."; display: block; height: 0; @@ -195,16 +195,16 @@ blockquote, q { .sidebar h3.active a, div.course-wrapper div#accordion h3.active a, div.book-wrapper ul#booknav h3.active a, div.wiki-wrapper div#wiki_panel h3.active a, .sidebar div.course-wrapper div#accordion h3.ui-accordion-header.ui-state-active a, div.course-wrapper div#accordion .sidebar h3.ui-accordion-header.ui-state-active a, div.course-wrapper div#accordion h3.ui-accordion-header.ui-state-active a, div.book-wrapper ul#booknav div.course-wrapper div#accordion h3.ui-accordion-header.ui-state-active a, div.course-wrapper div#accordion div.book-wrapper ul#booknav h3.ui-accordion-header.ui-state-active a, div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion h3.ui-accordion-header.ui-state-active a, div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel h3.ui-accordion-header.ui-state-active a, .sidebar div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"] a, div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel .sidebar input.ui-accordion-header.ui-state-active[type="button"] a, div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"] a, div.book-wrapper ul#booknav div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"] a, div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel div.book-wrapper ul#booknav input.ui-accordion-header.ui-state-active[type="button"] a, div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"] a, .sidebar div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion input.ui-accordion-header.ui-state-active[type="button"] a, div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion .sidebar input.ui-accordion-header.ui-state-active[type="button"] a, div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion input.ui-accordion-header.ui-state-active[type="button"] a, div.book-wrapper ul#booknav div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion input.ui-accordion-header.ui-state-active[type="button"] a, div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion div.book-wrapper ul#booknav input.ui-accordion-header.ui-state-active[type="button"] a, div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion input.ui-accordion-header.ui-state-active[type="button"] a, .sidebar div.wiki-wrapper div#wiki_panel input.active[type="button"] a, div.wiki-wrapper div#wiki_panel .sidebar input.active[type="button"] a, div.course-wrapper div#accordion div.wiki-wrapper div#wiki_panel input.active[type="button"] a, div.wiki-wrapper div#wiki_panel div.course-wrapper div#accordion input.active[type="button"] a, div.book-wrapper ul#booknav div.wiki-wrapper div#wiki_panel input.active[type="button"] a, div.wiki-wrapper div#wiki_panel div.book-wrapper ul#booknav input.active[type="button"] a, div.wiki-wrapper div#wiki_panel input.active[type="button"] a { color: #000; } -.topbar, div.book-wrapper section.book nav, div.wiki-wrapper section.wiki-body header { +.topbar, div.book-wrapper section.book nav, div.wiki-wrapper section.wiki-body header, secondaryHeader { background: #F6EFD4; border-bottom: 1px solid #eddfaa; margin: -22.652px -22.652px 22.652px; font-size: 12px; text-shadow: 0 1px 0 #fff; } - .topbar a, div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header a { + .topbar a, div.book-wrapper section.book nav a, div.wiki-wrapper section.wiki-body header a, secondaryHeader a { text-transform: uppercase; color: #292309; } - .topbar a:hover, div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header a:hover { + .topbar a:hover, div.book-wrapper section.book nav a:hover, div.wiki-wrapper section.wiki-body header a:hover, secondaryHeader a:hover { color: #7e691a; } h1 { @@ -401,6 +401,15 @@ div#fancybox-wrap { div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li label { display: block; font-weight: bold; } + div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li ul { + list-style: disc outside none; + margin: 11.326px 0 22.652px 22.652px; } + div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li ul li { + list-style: disc outside none; + margin-bottom: 11.326px; + color: #666; + font-size: 14px; + float: none; } div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="email"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="number"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="password"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="search"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="tel"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="text"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="url"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="color"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="date"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="datetime"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="datetime-local"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="month"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="time"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="week"] { width: 100%; -webkit-box-sizing: border-box; @@ -621,6 +630,8 @@ div.book-wrapper { float: left; } div.book-wrapper section.book nav ul li.next { float: right; } + div.book-wrapper section.book section.page img { + border: 1px solid #dddddd; } div.profile-wrapper { display: table; } @@ -819,6 +830,17 @@ section.activation { padding: 22.652px; margin-top: 22.652px; } +section.help.main-content { + padding: 22.652px; } + section.help.main-content p { + max-width: 700px; } + section.help.main-content dl { + margin-bottom: 22.652px; } + section.help.main-content dl dd, section.help.main-content dl dt { + margin-bottom: 11.326px; } + section.help.main-content dl dt { + font-weight: bold; } + /* ---------------------------------------------------------------------------------------- diff --git a/css/marketing.css b/css/marketing.css index c28c173d07..4167a0d5b7 100644 --- a/css/marketing.css +++ b/css/marketing.css @@ -537,6 +537,15 @@ div#fancybox-wrap { div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li label { display: block; font-weight: bold; } + div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li ul { + list-style: disc outside none; + margin: 12.944px 0 25.888px 25.888px; } + div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li ul li { + list-style: disc outside none; + margin-bottom: 12.944px; + color: #666; + font-size: 14px; + float: none; } div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="email"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="number"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="password"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="search"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="tel"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="text"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="url"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="color"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="date"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="datetime"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="datetime-local"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="month"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="time"], div#fancybox-wrap div#fancybox-outer div#fancybox-content form ol li input[type="week"] { width: 100%; -webkit-box-sizing: border-box; diff --git a/images/.DS_Store b/images/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..b1a053c1f77e330046b069b0f40ec38a941f02a2 100644 GIT binary patch delta 292 zcmZoMXfc=|#>B`mF;Q%yo}wrt0|NsP3otOGGL$f6GUPF&CzVf3Tt3-Agr%O7A(tVM zp@<Bn1{L;LX;^^Rv z{PN(;l+>ieqF6AyB(bEl*eS6HEEAAek^z(fvqSRpbAap^sOs>{l#+mqcmc`kYC|In zBOL{kS{(%-)7(Nw!O+y$qPCWklY>*>35TeXo{dLHVr^Z0LnF{pK)?v{6A17^C^*@? oF;SBZsT5LlNQ49wK{~0oy@I^Z)<= delta 70 zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yA}HsK&PW17jECW_AvK4xj>{$am(+{342+ UKzW7)kiy9(Jj$D6L{=~Z075el%K!iX From e60a20736c16e7f9c051646e41c362f03933e222 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 24 Jan 2012 15:51:30 -0500 Subject: [PATCH 2/3] Sass compile --- css/marketing.css | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/css/marketing.css b/css/marketing.css index 4167a0d5b7..786082592f 100644 --- a/css/marketing.css +++ b/css/marketing.css @@ -56,7 +56,7 @@ blockquote, q { font-weight: 800; src: local("Open Sans Extrabold"), local("OpenSans-Extrabold"), url("http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff") format("woff"); } -.wrapper, header.announcement div, section.index-content, footer { +.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; @@ -68,7 +68,22 @@ blockquote, q { padding: 25.888px; width: 100%; } -.clearfix:after, header.announcement div section:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, footer:after { +.subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { + padding-left: 34.171%; } + .subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p { + margin-bottom: 25.888px; } + .subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 { + margin-bottom: 12.944px; } + .subpage > div h2, section.copyright > div h2, section.tos > div h2, section.privacy-policy > div h2, section.honor-code > div h2 { + font: 18px "Open Sans", Helvetica, Arial, sans-serif; + color: #000; + margin-bottom: 12.944px; } + .subpage > div ul, section.copyright > div ul, section.tos > div ul, section.privacy-policy > div ul, section.honor-code > div ul { + list-style: disc outside none; } + .subpage > div ul li, section.copyright > div ul li, section.tos > div ul li, section.privacy-policy > div ul li, section.honor-code > div ul li { + list-style: disc outside none; } + +.clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, footer:after { content: "."; display: block; height: 0; @@ -128,6 +143,10 @@ body { background-color: #fff; color: #444; font: 16px Georgia, serif; } + body h1 { + font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } + body li { + margin-bottom: 25.888px; } body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea { -webkit-box-shadow: 0 -1px 0 white; -moz-box-shadow: 0 -1px 0 white; @@ -149,14 +168,14 @@ body { border-color: #990000; } header.announcement { - color: #fff; - border-bottom: 1px solid #000; - background: #e3e3e3; -webkit-background-size: cover; -moz-background-size: cover; -ms-background-size: cover; -o-background-size: cover; - background-size: cover; } + background-size: cover; + background: #333; + border-bottom: 1px solid #000; + color: #fff; } @media screen and (min-width: 1200px) { header.announcement.home { background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg"); } } From 1a80cf2b8d34af8a854617ab6d8e0ab47c9a3814 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 24 Jan 2012 17:05:29 -0500 Subject: [PATCH 3/3] Compiled sass --- css/application.css | 13 +++++++++++++ css/marketing.css | 22 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/css/application.css b/css/application.css index c498ecb810..811b1f5124 100644 --- a/css/application.css +++ b/css/application.css @@ -221,6 +221,10 @@ h2 { p { margin-bottom: 22.652px; } +em { + font-style: italic; + font-family: Georgia, serif; } + input[type="email"], input[type="number"], input[type="password"], input[type="search"], input[type="tel"], input[type="text"], input[type="url"], input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="time"], input[type="week"], textarea { -webkit-box-shadow: 0 -1px 0 white; -moz-box-shadow: 0 -1px 0 white; @@ -279,6 +283,15 @@ html { float: left; color: #000; text-shadow: 0 1px 0 #bf4040; } + html body div.header-wrapper header h1 em { + display: -moz-inline-box; + -moz-box-orient: vertical; + display: inline-block; + vertical-align: baseline; + zoom: 1; + *display: inline; + *vertical-align: auto; + padding-right: 22.652px; } html body div.header-wrapper header nav { float: left; display: block; diff --git a/css/marketing.css b/css/marketing.css index 786082592f..f8d022e229 100644 --- a/css/marketing.css +++ b/css/marketing.css @@ -50,12 +50,24 @@ blockquote, q { font-weight: 400; src: local("Open Sans"), local("OpenSans"), url("http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3bO3LdcAZYWl9Si6vvxL-qU.woff") format("woff"); } +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local("Open Sans Italic"), local("OpenSans-Italic"), url("http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBrrIa-7acMAeDBVuclsi6Gc.woff") format("woff"); } + @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 800; src: local("Open Sans Extrabold"), local("OpenSans-Extrabold"), url("http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hqRDOzjiPcYnFooOUGCOsRk.woff") format("woff"); } +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 800; + src: local("Open Sans Extrabold Italic"), local("OpenSans-ExtraboldItalic"), url("http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxsBo4hlZyBvkZICS3KpNonM.woff") format("woff"); } + .wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -132,7 +144,8 @@ blockquote, q { color: #fff; margin: 25.888px 0 12.944px; padding: 6.472px 12.944px; - text-decoration: none; } + text-decoration: none; + -webkit-font-smoothing: antialiased; } .button:hover, header.announcement div section.course section a:hover, section.index-content section.course a:hover, section.index-content section.staff a:hover, section.index-content section.about-course section.cta a.enroll:hover { background-color: #660000; } .button span, header.announcement div section.course section a span, section.index-content section.course a span, section.index-content section.staff a span, section.index-content section.about-course section.cta a.enroll span { @@ -147,6 +160,8 @@ body { font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } body li { margin-bottom: 25.888px; } + body em { + font-style: italic; } body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea { -webkit-box-shadow: 0 -1px 0 white; -moz-box-shadow: 0 -1px 0 white; @@ -175,7 +190,8 @@ header.announcement { background-size: cover; background: #333; border-bottom: 1px solid #000; - color: #fff; } + color: #fff; + -webkit-font-smoothing: antialiased; } @media screen and (min-width: 1200px) { header.announcement.home { background: #e3e3e3 url("/static/images/marketing/shot-1-large.jpg"); } } @@ -228,7 +244,7 @@ header.announcement { *vertical-align: auto; margin-right: 25.888px; } header.announcement div nav h1 a { - font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; + font: italic 800 18px "Open Sans", Helvetica, Arial, sans-serif; color: #fff; text-decoration: none; } header.announcement div nav a.login {