Commit 0a2b7411 by Brian Talbot

studio - nav and soft landing various QA fixes

parent 540710f5
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
</div> </div>
<div class="field text" id="field-course-grading-assignment-shortname"> <div class="field text" id="field-course-grading-assignment-shortname">
<label for="course-grading-shortname">Abbreviation:</label> <label for="course-grading-assignment-shortname">Abbreviation:</label>
<input type="text" class="short" id="course-grading-assignment-shortname" value="<%= model.get('short_label') %>" /> <input type="text" class="short" id="course-grading-assignment-shortname" value="<%= model.get('short_label') %>" />
<span class="tip tip-inline">e.g. HW, Midterm</span> <span class="tip tip-inline">e.g. HW, Midterm</span>
</div> </div>
<div class="field text" id="field-course-grading-assignment-gradeweight"> <div class="field text" id="field-course-grading-assignment-gradeweight">
<label for="course-grading-gradeweight">Weight of Total Grade</label> <label for="course-grading-assignment-gradeweight">Weight of Total Grade</label>
<input type="text" class="short" id="course-grading-assignment-gradeweight" value = "<%= model.get('weight') %>" /> <input type="text" class="short" id="course-grading-assignment-gradeweight" value = "<%= model.get('weight') %>" />
<span class="tip tip-inline">e.g. 25%</span> <span class="tip tip-inline">e.g. 25%</span>
</div> </div>
<div class="field text" id="field-course-grading-assignment-totalassignments"> <div class="field text" id="field-course-grading-assignment-totalassignments">
<label for="course-grading-gradeweight">Total <label for="course-grading-assignment-totalassignments">Total
Number</label> Number</label>
<input type="text" class="short" id="course-grading-assignment-totalassignments" value = "<%= model.get('min_count') %>" /> <input type="text" class="short" id="course-grading-assignment-totalassignments" value = "<%= model.get('min_count') %>" />
<span class="tip tip-inline">total exercises assigned</span> <span class="tip tip-inline">total exercises assigned</span>
</div> </div>
<div class="field text" id="field-course-grading-assignment-droppable"> <div class="field text" id="field-course-grading-assignment-droppable">
<label for="course-grading-gradeweight">Number of <label for="course-grading-assignment-droppable">Number of
Droppable</label> Droppable</label>
<input type="text" class="short" id="course-grading-assignment-droppable" value = "<%= model.get('drop_count') %>" /> <input type="text" class="short" id="course-grading-assignment-droppable" value = "<%= model.get('drop_count') %>" />
<span class="tip tip-inline">total exercises that won't be graded</span> <span class="tip tip-inline">total exercises that won't be graded</span>
......
...@@ -145,6 +145,13 @@ body.signup, body.signin { ...@@ -145,6 +145,13 @@ body.signup, body.signin {
:-ms-input-placeholder { :-ms-input-placeholder {
color: $gray-l3; color: $gray-l3;
} }
&:focus {
+ .tip {
color: $gray;
}
}
} }
textarea.long { textarea.long {
...@@ -163,6 +170,7 @@ body.signup, body.signin { ...@@ -163,6 +170,7 @@ body.signup, body.signin {
} }
.tip { .tip {
@include transition(color, 0.15s, ease-in-out);
@include font-size(13); @include font-size(13);
display: block; display: block;
margin-top: ($baseline/4); margin-top: ($baseline/4);
......
...@@ -53,9 +53,6 @@ ...@@ -53,9 +53,6 @@
float: right; float: right;
} }
// general nav styles
// ====================
// ==================== // ====================
// specific elements - branding // specific elements - branding
...@@ -515,6 +512,7 @@ body.course.export .nav-course-tools-export, ...@@ -515,6 +512,7 @@ body.course.export .nav-course-tools-export,
a { a {
color: $blue; color: $blue;
pointer-events: none;
} }
} }
......
...@@ -240,7 +240,6 @@ ...@@ -240,7 +240,6 @@
margin-right: flex-gutter(); margin-right: flex-gutter();
padding: ($baseline*0.75) $baseline; padding: ($baseline*0.75) $baseline;
color: $gray-l1; color: $gray-l1;
cursor: pointer;
.title { .title {
@include font-size(16); @include font-size(16);
...@@ -254,7 +253,7 @@ ...@@ -254,7 +253,7 @@
background: $blue-l5; background: $blue-l5;
top: -($baseline/5); top: -($baseline/5);
.title, strong { .title {
color: $blue; color: $blue;
} }
} }
......
...@@ -47,6 +47,7 @@ body.course.settings { ...@@ -47,6 +47,7 @@ body.course.settings {
// UI hints/tips/messages // UI hints/tips/messages
.tip { .tip {
@include transition(color, 0.15s, ease-in-out);
@include font-size(13); @include font-size(13);
display: block; display: block;
margin-top: ($baseline/4); margin-top: ($baseline/4);
...@@ -127,6 +128,13 @@ body.course.settings { ...@@ -127,6 +128,13 @@ body.course.settings {
&.error { &.error {
border-color: $red; border-color: $red;
} }
&:focus {
+ .tip {
color: $gray;
}
}
} }
textarea.long { textarea.long {
...@@ -157,10 +165,10 @@ body.course.settings { ...@@ -157,10 +165,10 @@ body.course.settings {
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(3px); @include border-radius(3px);
background: $gray-l5; background: $gray-l5;
padding: ($baseline/2); padding: $baseline;
&:last-child { &:last-child {
padding-bottom: ($baseline/2); padding-bottom: $baseline;
} }
.actions { .actions {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="bit"> <div class="bit">
<h3 class="title-3">Need Help?</h3> <h3 class="title-3">Need Help?</h3>
<p>Having trouble with your account? Use <a href="" rel="external">our support center</a> to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.</p> <p>Having trouble with your account? Use <a href="http://help.edge.edx.org" rel="external">our support center</a> to look over self help steps, find solutions others have found to the same problem, or let us know of your issue.</p>
</div> </div>
</aside> </aside>
</section> </section>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a> <a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
</li> </li>
<li class="nav-item nav-peripheral-contact"> <li class="nav-item nav-peripheral-contact">
<a href="#">Contact edX</a> <a href="https://www.edx.org/contact" rel="external">Contact edX</a>
</li> </li>
% if user.is_authenticated(): % if user.is_authenticated():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment