Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

common/lib/capa/capa/templates/optioninput.html

@@ -10,7 +10,7 @@
           > ${option_description}</option>
       % endfor
     </select>
-   
+
   <span id="answer_${id}"></span>
 
   % if state == 'unsubmitted':

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 {

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%;
 }