Skip to content

E
edx-platform
Commit 3450c728 by Don Mitchell
Options

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into… 

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
parents 6f3a954d f1ad0505
Showing with 76 additions and 25 deletions
cms/static/client_templates/course_grade_policy.html
......@@ -6,26 +6,26 @@
</div>
<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') %>" />
<span class="tip tip-inline">e.g. HW, Midterm</span>
</div>
<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') %>" />
<span class="tip tip-inline">e.g. 25%</span>
</div>
<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>
<input type="text" class="short" id="course-grading-assignment-totalassignments" value = "<%= model.get('min_count') %>" />
<span class="tip tip-inline">total exercises assigned</span>
</div>
<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>
<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>
......
cms/static/sass/_account.scss
......@@ -145,6 +145,13 @@ body.signup, body.signin {
:-ms-input-placeholder {
color: $gray-l3;
}
&:focus {
+ .tip {
color: $gray;
}
}
}
textarea.long {
......@@ -163,6 +170,7 @@ body.signup, body.signin {
}
.tip {
@include transition(color, 0.15s, ease-in-out);
@include font-size(13);
display: block;
margin-top: ($baseline/4);
......
cms/static/sass/_base.scss
......@@ -157,6 +157,22 @@ h1 {
margin-bottom: 0;
}
}
.nav-related {
.nav-item {
margin-bottom: ($baseline/4);
border-bottom: 1px dotted $gray-l4;
padding-bottom: ($baseline/4);
&:last-child {
margin-bottom: 0;
border: none;
padding-bottom: 0;
}
}
}
}
}
......@@ -568,4 +584,14 @@ body.hide-wip {
.wip-box {
display: none;
}
}
// ====================
// needed fudges for now
body.dashboard {
.my-classes {
margin-top: $baseline;
}
}
\ No newline at end of file
cms/static/sass/_header.scss
......@@ -53,9 +53,6 @@
float: right;
}
// general nav styles
// ====================
// ====================
// specific elements - branding
......@@ -66,7 +63,7 @@
.branding {
position: relative;
margin: 0 ($baseline*0.75) 0 0;
margin: 0 ($baseline/2) 0 0;
padding-right: ($baseline*0.75);
a {
......@@ -123,6 +120,7 @@
width: 100%;
max-width: 220px;
overflow: hidden;
margin-top: -4px;
white-space: nowrap;
text-overflow: ellipsis;
@include font-size(16);
......@@ -205,11 +203,17 @@
.account-username {
display: inline-block;
vertical-align: middle;
width: 80%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.icon-expand {
display: inline-block;
vertical-align: middle;
}
}
}
......@@ -224,6 +228,7 @@
.icon-expand {
@include font-size(14);
@include transition (color 0.5s ease-in-out, opacity 0.5s ease-in-out);
display: inline-block;
margin-left: 2px;
opacity: 0.5;
color: $gray-l2;
......@@ -308,7 +313,7 @@
.wrapper-nav-sub {
top: 27px;
left: auto;
right: -($baseline/2);
right: -13px;
width: 110px;
}
......@@ -515,6 +520,7 @@ body.course.export .nav-course-tools-export,
a {
color: $blue;
pointer-events: none;
}
}
......
cms/static/sass/_index.scss
......@@ -240,7 +240,6 @@
margin-right: flex-gutter();
padding: ($baseline*0.75) $baseline;
color: $gray-l1;
cursor: pointer;
.title {
@include font-size(16);
......@@ -254,7 +253,7 @@
background: $blue-l5;
top: -($baseline/5);
.title, strong {
.title {
color: $blue;
}
}
......
cms/static/sass/_settings.scss
......@@ -47,6 +47,7 @@ body.course.settings {
// UI hints/tips/messages
.tip {
@include transition(color, 0.15s, ease-in-out);
@include font-size(13);
display: block;
margin-top: ($baseline/4);
......@@ -127,6 +128,13 @@ body.course.settings {
&.error {
border-color: $red;
}
&:focus {
+ .tip {
color: $gray;
}
}
}
textarea.long {
......@@ -157,10 +165,10 @@ body.course.settings {
@include box-sizing(border-box);
@include border-radius(3px);
background: $gray-l5;
padding: ($baseline/2);
padding: $baseline;
&:last-child {
padding-bottom: ($baseline/2);
padding-bottom: $baseline;
}
.actions {
......
cms/templates/login.html
......@@ -46,7 +46,7 @@
<div class="bit">
<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>
</aside>
</section>
......
cms/templates/settings.html
......@@ -152,10 +152,10 @@ from contentstore import utils
<hr class="divide" />
<section class="group-settings marketing">
<header>
<header>
<h2 class="title-2">Introducing Your Course</h2>
<span class="tip">Information for prospective students</span>
</header>
</header>
<ol class="list-input">
<li class="field text" id="field-course-overview">
......@@ -219,11 +219,12 @@ from contentstore import utils
<nav class="nav-related">
<ul>
<li class="nav-item"><a href="${reverse('contentstore.views.course_config_graders_page', kwargs={'org' : ctx_loc.org, 'course' : ctx_loc.course, 'name': ctx_loc.name})}">Grading</a></li>
</ul>
<li class="nav-item"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
</ul>
</nav>
% endif
</div>
</div>
</aside>
</section>
</div>
</%block>
</section>
</div>
</%block>
\ No newline at end of file
cms/templates/settings_graders.html
......@@ -140,6 +140,7 @@ from contentstore import utils
<nav class="nav-related">
<ul>
<li class="nav-item"><a href="${reverse('contentstore.views.get_course_settings', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">Details &amp; Schedule</a></li>
<li class="nav-item"><a href="${reverse('manage_users', kwargs=dict(location=ctx_loc))}">Course Team</a></li>
</ul>
</nav>
% endif
......
cms/templates/widgets/footer.html
......@@ -18,7 +18,7 @@
<a href="http://help.edge.edx.org/" rel="external">edX Studio Help</a>
</li>
<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>
% if user.is_authenticated():
......
cms/templates/widgets/header.html
......@@ -84,7 +84,7 @@
<div class="wrapper wrapper-nav-sub">
<div class="nav-sub">
<ul>
<li class="nav-item nav-account-dashboard"><a href="#">My Courses</a></li>
<li class="nav-item nav-account-dashboard"><a href="/">My Courses</a></li>
<li class="nav-item nav-account-help"><a href="http://help.edge.edx.org/" rel="external">Studio Help</a></li>
<li class="nav-item nav-account-signout"><a class="action action-signout" href="${reverse('logout')}">Sign Out</a></li>
</ul>
......@@ -98,7 +98,7 @@
<h2 class="sr">You're not currently signed in</h2>
<ol>
<li class="nav-item nav-not-signedin-hiw">
<a href="#">How Studio Works</a>
<a href="/">How Studio Works</a>
</li>
<li class="nav-item nav-not-signedin-help">
<a href="http://help.edge.edx.org/" rel="external">Studio Help</a>
......
common/static/sass/_mixins.scss
......@@ -15,7 +15,7 @@
// image-replacement hidden text
@mixin text-hide() {
text-indent: -100%;
text-indent: 100%;
white-space: nowrap;
overflow: hidden;
}
......
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