diff --git a/common/lib/capa/capa/templates/optioninput.html b/common/lib/capa/capa/templates/optioninput.html index 6ceba78c1c..0a1562c38d 100644 --- a/common/lib/capa/capa/templates/optioninput.html +++ b/common/lib/capa/capa/templates/optioninput.html @@ -10,7 +10,7 @@ > ${option_description} % endfor - + % if state == 'unsubmitted': diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss index a745129a68..8c3ab322e2 100644 --- a/common/lib/xmodule/xmodule/css/sequence/display.scss +++ b/common/lib/xmodule/xmodule/css/sequence/display.scss @@ -41,11 +41,11 @@ nav.sequence-nav { &:hover { background-repeat: no-repeat; background-position: center; - background-color: #F6F6F6; + background-color: #F3F3F3; } &.visited { - background-color: #F6F6F6; + background-color: #F3F3F3; &:hover { background-position: center center; @@ -64,18 +64,6 @@ nav.sequence-nav { } } - &.progress-none { - background-color: lighten(red, 50%); - } - - &.progress-some { - background-color: yellow; - } - - &.progress-done { - background-color: green; - } - //video &.seq_video { &.inactive { @@ -120,6 +108,18 @@ nav.sequence-nav { &.active { background-image: url('../images/sequence-nav/list-icon-current.png'); } + + &.progress-none { + background-image: url('../images/sequence-nav/list-unstarted.png'); + } + + &.progress-some, &.progress-in_progress { + background-image: url('../images/sequence-nav/list-unfinished.png'); + } + + &.progress-done { + background-image: url('../images/sequence-nav/list-finished.png'); + } } p { diff --git a/common/static/images/sequence-nav/document-icon-current.png b/common/static/images/sequence-nav/document-icon-current.png index 4eeedd8f76..153a067d3d 100644 Binary files a/common/static/images/sequence-nav/document-icon-current.png and b/common/static/images/sequence-nav/document-icon-current.png differ diff --git a/common/static/images/sequence-nav/document-icon-normal.png b/common/static/images/sequence-nav/document-icon-normal.png index d508136647..2bc266bfe2 100644 Binary files a/common/static/images/sequence-nav/document-icon-normal.png and b/common/static/images/sequence-nav/document-icon-normal.png differ diff --git a/common/static/images/sequence-nav/document-icon-visited.png b/common/static/images/sequence-nav/document-icon-visited.png index c0a1c7d099..681ea1fcac 100644 Binary files a/common/static/images/sequence-nav/document-icon-visited.png and b/common/static/images/sequence-nav/document-icon-visited.png differ diff --git a/common/static/images/sequence-nav/list-finished.png b/common/static/images/sequence-nav/list-finished.png new file mode 100644 index 0000000000..e2b11e9e0a Binary files /dev/null and b/common/static/images/sequence-nav/list-finished.png differ diff --git a/common/static/images/sequence-nav/list-icon-current.png b/common/static/images/sequence-nav/list-icon-current.png index 602f0da61b..d9a1473526 100644 Binary files a/common/static/images/sequence-nav/list-icon-current.png and b/common/static/images/sequence-nav/list-icon-current.png differ diff --git a/common/static/images/sequence-nav/list-icon-normal.png b/common/static/images/sequence-nav/list-icon-normal.png index 09867e09c8..1e445b02bc 100644 Binary files a/common/static/images/sequence-nav/list-icon-normal.png and b/common/static/images/sequence-nav/list-icon-normal.png differ diff --git a/common/static/images/sequence-nav/list-icon-visited.png b/common/static/images/sequence-nav/list-icon-visited.png index dca52dd3cc..a3704f3b98 100644 Binary files a/common/static/images/sequence-nav/list-icon-visited.png and b/common/static/images/sequence-nav/list-icon-visited.png differ diff --git a/common/static/images/sequence-nav/list-unfinished.png b/common/static/images/sequence-nav/list-unfinished.png new file mode 100644 index 0000000000..fa0687e040 Binary files /dev/null and b/common/static/images/sequence-nav/list-unfinished.png differ diff --git a/common/static/images/sequence-nav/list-unstarted.png b/common/static/images/sequence-nav/list-unstarted.png new file mode 100644 index 0000000000..48081ead7d Binary files /dev/null and b/common/static/images/sequence-nav/list-unstarted.png differ diff --git a/common/static/images/sequence-nav/other-icon.png b/common/static/images/sequence-nav/other-icon.png deleted file mode 100644 index 01c0bab93c..0000000000 Binary files a/common/static/images/sequence-nav/other-icon.png and /dev/null differ diff --git a/common/static/images/sequence-nav/problem-icon-alt.png b/common/static/images/sequence-nav/problem-icon-alt.png deleted file mode 100644 index 364e041bad..0000000000 Binary files a/common/static/images/sequence-nav/problem-icon-alt.png and /dev/null differ diff --git a/common/static/images/sequence-nav/vertical-icon.png b/common/static/images/sequence-nav/vertical-icon.png deleted file mode 100644 index 064c6ba046..0000000000 Binary files a/common/static/images/sequence-nav/vertical-icon.png and /dev/null differ diff --git a/common/static/images/sequence-nav/video-icon-current.png b/common/static/images/sequence-nav/video-icon-current.png index a7a787ee8b..2674a7a950 100644 Binary files a/common/static/images/sequence-nav/video-icon-current.png and b/common/static/images/sequence-nav/video-icon-current.png differ diff --git a/common/static/images/sequence-nav/video-icon-normal.png b/common/static/images/sequence-nav/video-icon-normal.png index df907e83a0..4b0baeeca0 100644 Binary files a/common/static/images/sequence-nav/video-icon-normal.png and b/common/static/images/sequence-nav/video-icon-normal.png differ diff --git a/common/static/images/sequence-nav/video-icon-visited.png b/common/static/images/sequence-nav/video-icon-visited.png index 49ab808567..62a5b9d6c4 100644 Binary files a/common/static/images/sequence-nav/video-icon-visited.png and b/common/static/images/sequence-nav/video-icon-visited.png differ diff --git a/common/static/images/sequence-nav/video-icon.png b/common/static/images/sequence-nav/video-icon.png deleted file mode 100644 index 715a38eb96..0000000000 Binary files a/common/static/images/sequence-nav/video-icon.png and /dev/null differ diff --git a/lms/static/sass/course/base/_base.scss b/lms/static/sass/course/base/_base.scss index 9f0be9c298..952ff91365 100644 --- a/lms/static/sass/course/base/_base.scss +++ b/lms/static/sass/course/base/_base.scss @@ -27,6 +27,33 @@ form { } } +textarea, +input[type="text"], +input[type="email"], +input[type="password"] { + background: rgb(250,250,250); + border: 1px solid rgb(200,200,200); + @include border-radius(0); + @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6), inset 0 0 3px 0 rgba(0,0,0, 0.1)); + @include box-sizing(border-box); + font: normal 1em $sans-serif; + height: 35px; + padding: 5px 12px; + vertical-align: top; + -webkit-font-smoothing: antialiased; + + &:last-child { + margin-right: 0px; + } + + &:focus { + border-color: lighten($blue, 20%); + @include box-shadow(0 0 6px 0 rgba($blue, 0.4), inset 0 0 4px 0 rgba(0,0,0, 0.15)); + outline: none; + } +} + + img { max-width: 100%; }