Commit e237cdca by Frances Botsford Committed by David Baumgold

round 2 on html and sass for textbook upload

parent d4b1d4c6
...@@ -133,27 +133,7 @@ ...@@ -133,27 +133,7 @@
} }
} }
// blue small/inline button
.btn-flat-blue {
@extend .btn-flat;
color: $white;
background-color: $blue;
&:hover, &:active {
background: $blue-l4;
color: $blue-s2;
}
&.current, &.active {
border-color: $blue-l3;
background: $blue-l3;
color: $blue-d1;
&:hover, &:active {
}
}
}
// ==================== // ====================
......
...@@ -16,12 +16,13 @@ body.course.textbooks { ...@@ -16,12 +16,13 @@ body.course.textbooks {
margin-top: $baseline; margin-top: $baseline;
.action-add-chapter { .action-add-chapter {
@extend .btn-flat-blue;
@extend .t-action2; @extend .t-action2;
@include grey-button;
@include transition(all .15s); @include transition(all .15s);
display: block; display: block;
width: 100%; width: 100%;
margin-bottom: ($baseline*1.5); margin-bottom: ($baseline*1.5);
border: 1px solid #B3C4DA;
padding: ($baseline/5) $baseline; padding: ($baseline/5) $baseline;
font-weight: 600; font-weight: 600;
} }
...@@ -31,7 +32,7 @@ body.course.textbooks { ...@@ -31,7 +32,7 @@ body.course.textbooks {
@extend .t-action2; @extend .t-action2;
@include transition(all .15s); @include transition(all .15s);
display: inline-block; display: inline-block;
padding: ($baseline/5) $baseline ($baseline/4) $baseline; padding: ($baseline/5) $baseline;
font-weight: 600; font-weight: 600;
text-transform: uppercase; text-transform: uppercase;
} }
...@@ -41,7 +42,7 @@ body.course.textbooks { ...@@ -41,7 +42,7 @@ body.course.textbooks {
@extend .t-action2; @extend .t-action2;
@include transition(all .15s); @include transition(all .15s);
display: inline-block; display: inline-block;
padding: ($baseline/5) $baseline ($baseline/4) $baseline; padding: ($baseline/5) $baseline;
font-weight: 600; font-weight: 600;
text-transform: uppercase; text-transform: uppercase;
} }
...@@ -49,6 +50,19 @@ body.course.textbooks { ...@@ -49,6 +50,19 @@ body.course.textbooks {
} }
.copy {
@include font-size(12);
margin: ($baseline) 0 ($baseline/2) 0;
color: $gray;
strong {
font-weight: 600;
}
}
.list-input { .list-input {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -155,7 +169,7 @@ body.course.textbooks { ...@@ -155,7 +169,7 @@ body.course.textbooks {
.field { .field {
display: block; display: block;
width: 46%; width: 46.5%;
border-bottom: none; border-bottom: none;
margin: 0 $baseline 0 0; margin: 0 $baseline 0 0;
padding: ($baseline/4) 0 0 0; padding: ($baseline/4) 0 0 0;
...@@ -168,14 +182,15 @@ body.course.textbooks { ...@@ -168,14 +182,15 @@ body.course.textbooks {
.action-uploadasset { .action-uploadasset {
@extend .t-action4; @extend .t-action4;
@extend .btn-flat-blue; @include blue-button;
@include transition(all .15s); @include transition(all .15s);
@include font-size(12);
font-weight: 600; font-weight: 600;
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 0; top: 2px;
right: 0; right: 0;
padding: ($baseline/5) ($baseline/2) ($baseline/10) ($baseline/2); padding: 3px ($baseline/2) 1px ($baseline/2);
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="input-wrap field text required field-add-chapter-asset chapter<%= order %>-asset"> <div class="input-wrap field text required field-add-chapter-asset chapter<%= order %>-asset">
<label for="chapter<%= order %>-asset-path"><%= gettext("Chapter Asset") %>:</label> <label for="chapter<%= order %>-asset-path"><%= gettext("Chapter Asset") %>:</label>
<input id="chapter<%= order %>-asset-path" name="chapter<%= order %>-asset-path" placeholder="<%= _.str.sprintf(gettext("path/to/introductionToCookieBaking-CH%d.pdf"), order) %>" value="<%= asset_path %>" type="text"> <input id="chapter<%= order %>-asset-path" name="chapter<%= order %>-asset-path" placeholder="<%= _.str.sprintf(gettext("path/to/introductionToCookieBaking-CH%d.pdf"), order) %>" value="<%= asset_path %>" type="text">
<span class="tip tip-stacked"><%= gettext("provide the path for a file or asset already added to this course") %></span> <span class="tip tip-stacked"><%= gettext("provide the path to a file added to this course or upload a new one") %></span>
<button class="action action-uploadasset"><%= gettext("Upload Asset") %></button> <button class="action action-uploadasset"><%= gettext("Upload Asset") %></button>
</div> </div>
<a class="action action-close"><i class="icon-remove-sign"></i> <span class="sr">delete chapter</span></a> <a class="action action-close"><i class="icon-remove-sign"></i> <span class="sr">delete chapter</span></a>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<ol class="chapters list-input enum"></ol> <ol class="chapters list-input enum"></ol>
</li> </li>
</ol> </ol>
<p><%= gettext("Note: <strong>It's best practice to break your course's textbook into multiple chapters</strong> to reduce loading times for students. Breaking up textbooks into chapters can also help with students more easily finding a concept or topic-based information.") %></p> <p class="copy"><%= gettext("Note: <strong>It's best practice to break your course's textbook into multiple chapters</strong> to reduce loading times for students. Breaking up textbooks into chapters can also help with students more easily finding a concept or topic-based information.") %></p>
</fieldset> </fieldset>
<div class="actions"> <div class="actions">
<button class="action action-add-chapter"><%= gettext("Add a Chapter") %></button> <button class="action action-add-chapter"><%= gettext("Add a Chapter") %></button>
......
...@@ -205,12 +205,3 @@ ...@@ -205,12 +205,3 @@
padding:($baseline/5) $baseline/2; padding:($baseline/5) $baseline/2;
line-height: 1.3; line-height: 1.3;
text-align: center; text-align: center;
&:hover, &:active {
}
&.current, &.active {
}
}
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