From 4b22520fb0f711271004517561add7dd1c2aca9c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 30 May 2012 11:43:45 -0400 Subject: [PATCH 1/4] some minor touches for the ui making rounded courners work throughout the site and changing around the wiki help bar --- static/sass/base/_extends.scss | 9 ++++++++- static/sass/courseware/_courseware.scss | 5 ++--- static/sass/courseware/_sequence-nav.scss | 9 ++++++++- static/sass/layout/_layout.scss | 2 +- static/sass/wiki/_wiki.scss | 4 +++- templates/simplewiki_instructions.html | 10 ++++++---- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/static/sass/base/_extends.scss b/static/sass/base/_extends.scss index 4626afc2fa..880f6cd3ca 100644 --- a/static/sass/base/_extends.scss +++ b/static/sass/base/_extends.scss @@ -16,6 +16,11 @@ div.table-wrapper { display: table; width: flex-grid(12); + overflow: hidden; + + @media screen and (min-width: 1400px) { + @include border-radius(4px); + } } } @@ -83,6 +88,7 @@ h1.top-header { padding: lh(); vertical-align: top; width: flex-grid(9) + flex-gutter(); + overflow: hidden; @media print { @include box-shadow(none); @@ -196,7 +202,8 @@ h1.top-header { @extend .clearfix; background: $cream; border-bottom: 1px solid darken($cream, 10%); - @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); + border-top: 1px solid #fff; + // @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff); font-size: 12px; height:46px; line-height: 46px; diff --git a/static/sass/courseware/_courseware.scss b/static/sass/courseware/_courseware.scss index 520440c234..cf6b10235c 100644 --- a/static/sass/courseware/_courseware.scss +++ b/static/sass/courseware/_courseware.scss @@ -17,9 +17,7 @@ div.course-wrapper { section.course-content { @extend .content; - overflow: hidden; - @include border-top-right-radius(4px); - @include border-bottom-right-radius(4px); + @include border-radius(0 4px 4px 0); h1 { margin: 0 0 lh(); @@ -186,6 +184,7 @@ div.course-wrapper { margin-top: 8px; text-align: right; padding-right: 0; + border-right: 0; } } diff --git a/static/sass/courseware/_sequence-nav.scss b/static/sass/courseware/_sequence-nav.scss index 0e541e7f07..ac0f110f63 100644 --- a/static/sass/courseware/_sequence-nav.scss +++ b/static/sass/courseware/_sequence-nav.scss @@ -222,7 +222,7 @@ nav.sequence-nav { &.next { a { background-image: url('../images/sequence-nav/next-icon.png'); - @include border-top-right-radius(4px); + // @include border-top-right-radius(4px); &:hover { background-color: none; @@ -237,6 +237,13 @@ nav.sequence-nav { section.course-content { position: relative; + ol.vert-mod { + nav.sequence-nav { + margin-top: -15px; + @include border-radius(0); + } + } + nav.sequence-bottom { margin: lh(2) 0 0; text-align: center; diff --git a/static/sass/layout/_layout.scss b/static/sass/layout/_layout.scss index 1b476a30db..7f4645dd5a 100644 --- a/static/sass/layout/_layout.scss +++ b/static/sass/layout/_layout.scss @@ -17,7 +17,6 @@ html { @include box-shadow(0 0 4px #dfdfdf); @include box-sizing(border-box); margin-top: 3px; - overflow: hidden; @media print { border-bottom: 0; @@ -27,6 +26,7 @@ html { @media screen and (min-width: 1400px) { @include border-radius(4px); margin-top: lh(.5); + overflow: hidden; } } diff --git a/static/sass/wiki/_wiki.scss b/static/sass/wiki/_wiki.scss index 179902223b..9c878ad263 100644 --- a/static/sass/wiki/_wiki.scss +++ b/static/sass/wiki/_wiki.scss @@ -5,12 +5,14 @@ div.wiki-wrapper { section.wiki-body { @extend .clearfix; @extend .content; + @include border-radius(0 4px 4px 0); position: relative; header { @extend .topbar; - @include box-shadow(inset 0 1px 0 white); + @include border-radius(0 4px 0 0); height:46px; + overflow: hidden; &:empty { border-bottom: 0; diff --git a/templates/simplewiki_instructions.html b/templates/simplewiki_instructions.html index 58ef12a47c..449b92b004 100644 --- a/templates/simplewiki_instructions.html +++ b/templates/simplewiki_instructions.html @@ -1,12 +1,12 @@
- This wiki uses Markdown for styling. There are several useful guides online. -
-
MITx Additions: + This wiki uses Markdown for styling. +

MITx Additions:

circuit-schematic:

$LaTeX Math Expression$

To create a new wiki article, create a link to it. Clicking the link gives you the creation page.

[Article Name](wiki:ArticleName)

- Other useful examples:
+ +

Useful examples:

[Link](http://google.com)

Huge Header
====

@@ -19,4 +19,6 @@
  - Sub Item 2

1. Ordered
2. List

+ +

Need more help? There are several useful guides online.

From ff3d474d4d16bf3a646733dc31df51477b0fc770 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 30 May 2012 14:40:07 -0400 Subject: [PATCH 2/4] Added highlihgts to the inputs for problems made check / save buttons a little bigger and gave the next / prev buttons in the sequnce nav hovers --- static/sass/courseware/_courseware.scss | 15 +++++++++++++++ static/sass/courseware/_sequence-nav.scss | 17 +++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/static/sass/courseware/_courseware.scss b/static/sass/courseware/_courseware.scss index cf6b10235c..c93854edaf 100644 --- a/static/sass/courseware/_courseware.scss +++ b/static/sass/courseware/_courseware.scss @@ -120,11 +120,20 @@ div.course-wrapper { > span { display: block; margin-bottom: lh(.5); + + &[answer] { + border-top: 1px solid #ededed; + border-bottom: 1px solid #ededed; + background: #f3f3f3; + margin: 0 (-(lh())); + padding: lh(.5) lh(); + } } } input[type="text"] { display: inline-block; + width: 50%; } center { @@ -136,6 +145,11 @@ div.course-wrapper { section.action { margin-top: lh(); + + input[type="button"] { + padding: lh(.4) lh(); + text-shadow: 0 -1px 0 #666; + } } } @@ -172,6 +186,7 @@ div.course-wrapper { header { @extend h1.top-header; + @include border-radius(0 4px 0 0); margin-bottom: -16px; h1 { diff --git a/static/sass/courseware/_sequence-nav.scss b/static/sass/courseware/_sequence-nav.scss index ac0f110f63..1ad84286b3 100644 --- a/static/sass/courseware/_sequence-nav.scss +++ b/static/sass/courseware/_sequence-nav.scss @@ -171,7 +171,7 @@ nav.sequence-nav { } ul { - list-style: none !important; + list-style: none; height: 100%; position: absolute; right: 0; @@ -194,12 +194,10 @@ nav.sequence-nav { cursor: pointer; display: block; text-indent: -9999px; + @include transition(all, .2s, $ease-in-out-quad); &:hover { - background-color: none; - color: darken($cream, 60%); - text-decoration: none; - text-decoration: none; + opacity: .5; } &.disabled { @@ -214,7 +212,7 @@ nav.sequence-nav { background-image: url('../images/sequence-nav/previous-icon.png'); &:hover { - background-color: none; + background-color: $cream; } } } @@ -222,10 +220,9 @@ nav.sequence-nav { &.next { a { background-image: url('../images/sequence-nav/next-icon.png'); - // @include border-top-right-radius(4px); &:hover { - background-color: none; + background-color: $cream; } } } @@ -270,11 +267,11 @@ section.course-content { display: block; padding: lh(.5) 4px; text-indent: -9999px; - @include transition(all, .4s, $ease-in-out-quad); + @include transition(all, .2s, $ease-in-out-quad); width: 45px; &:hover { - background-color: darken($cream, 10%); + background-color: $cream; color: darken($cream, 60%); opacity: .5; text-decoration: none; From a7cace4da96eddbdb4738394ec324d9b0cf04a17 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 30 May 2012 16:00:17 -0400 Subject: [PATCH 3/4] Added fix for closing the courseware sidebar --- static/sass/courseware/_courseware.scss | 14 +++++++++++++- static/sass/courseware/_sidebar.scss | 8 ++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/static/sass/courseware/_courseware.scss b/static/sass/courseware/_courseware.scss index c93854edaf..7231394279 100644 --- a/static/sass/courseware/_courseware.scss +++ b/static/sass/courseware/_courseware.scss @@ -305,9 +305,11 @@ div.course-wrapper { &.closed { section.course-index { width: flex-grid(.6); + overflow: hidden; header#open_close_accordion { padding: 0; + min-height: 47px; a { background-image: url('../images/slide-right-icon.png'); @@ -316,7 +318,7 @@ div.course-wrapper { h2 { visibility: hidden; width: 10px; - padding: 0; + // white-space: nowrap; } } @@ -324,6 +326,16 @@ div.course-wrapper { visibility: hidden; width: 10px; padding: 0; + + nav { + white-space: pre; + overflow: hidden; + + ul { + overflow: hidden; + white-space: nowrap; + } + } } } diff --git a/static/sass/courseware/_sidebar.scss b/static/sass/courseware/_sidebar.scss index 845821c5f4..44e9d02c28 100644 --- a/static/sass/courseware/_sidebar.scss +++ b/static/sass/courseware/_sidebar.scss @@ -2,6 +2,14 @@ section.course-index { @extend .sidebar; @extend .tran; + header { + max-height: 47px; + + h2 { + white-space: nowrap; + } + } + div#accordion { h3 { From da0e2d5f5cd03d6740c1c0475633c7923073a769 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Fri, 1 Jun 2012 13:42:20 -0400 Subject: [PATCH 4/4] Remove usless comment --- static/sass/courseware/_courseware.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/static/sass/courseware/_courseware.scss b/static/sass/courseware/_courseware.scss index 7231394279..922ae21b7d 100644 --- a/static/sass/courseware/_courseware.scss +++ b/static/sass/courseware/_courseware.scss @@ -318,7 +318,6 @@ div.course-wrapper { h2 { visibility: hidden; width: 10px; - // white-space: nowrap; } }