diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss index 362883b4c7..83f9a8a25d 100644 --- a/cms/static/sass/views/_textbooks.scss +++ b/cms/static/sass/views/_textbooks.scss @@ -334,7 +334,7 @@ body.course.textbooks { .action-close { @include transition(color 0.25s ease-in-out); - @include font-size(18); + @include font-size(22); display: inline-block; float: right; margin-top: ($baseline*2); @@ -465,23 +465,44 @@ body.course.textbooks { } - .success { - color: $green; + .message-status { + @include border-top-radius(2px); + @include box-sizing(border-box); + @include font-size(14); + display: none; + border-bottom: 2px solid $yellow; + margin: 0 0 20px 0; + padding: 10px 20px; + font-weight: 500; + background: $paleYellow; - [class^="icon-"] { - @include font-size(20); + .text { display: inline-block; - margin-right: ($baseline/4); - vertical-align: text-bottom; } + &.error { + border-color: shade($red, 50%); + background: tint($red, 20%); + color: $white; + } + &.confirm { + border-color: shade($green, 50%); + background: tint($green, 20%); + color: $white; + } + + &.is-shown { + display: block; + } } } .actions { padding: ($baseline*0.75) $baseline ($baseline/2) $baseline; + + .action-item { @extend .t-action4; @include font-size(12); @@ -492,7 +513,7 @@ body.course.textbooks { margin-right: 0; } } - +/* .action-upload { @extend .btn-primary-blue; color: $white; @@ -518,6 +539,22 @@ body.course.textbooks { } } +*/ + + .action-primary { + @include blue-button(); + @include font-size(12); // needed due to bad button mixins for now + border-color: $blue-d1; + color: $white; + } + + a { + color: $blue; + + &:hover { + color: $blue-s2; + } + } } diff --git a/cms/templates/js/edit-chapter.underscore b/cms/templates/js/edit-chapter.underscore index 8a6367b3c4..0f9a91e3e0 100644 --- a/cms/templates/js/edit-chapter.underscore +++ b/cms/templates/js/edit-chapter.underscore @@ -2,13 +2,13 @@ <% if (error && error.attributes && error.attributes.name) { print('error'); } %>"> " value="<%= name %>" type="text"> - <%= gettext("the title/name of the chapter that will be used in navigating") %> + <%= gettext("provide the title/name of the chapter that will be used in navigating") %>
" value="<%= asset_path %>" type="text"> - <%= gettext("provide the path to a file added to this course or upload a new one") %> + <%= gettext("upload a PDF file or provide the path to a Studio asset file") %>
<%= gettext("delete chapter") %> diff --git a/cms/templates/js/edit-textbook.underscore b/cms/templates/js/edit-textbook.underscore index 60565d191d..53ef8a1753 100644 --- a/cms/templates/js/edit-textbook.underscore +++ b/cms/templates/js/edit-textbook.underscore @@ -11,7 +11,7 @@
" value="<%= name %>"> - <%= gettext("the title/name of the text book as you would like your students to see it.") %> + <%= gettext("provide the title/name of the text book as you would like your students to see it") %>
diff --git a/cms/templates/js/upload-dialog.underscore b/cms/templates/js/upload-dialog.underscore index 41d95f080c..bf1bede89c 100644 --- a/cms/templates/js/upload-dialog.underscore +++ b/cms/templates/js/upload-dialog.underscore @@ -17,7 +17,6 @@

<%= message %>

-
<% if(uploading) { %> @@ -31,8 +30,11 @@ <% } %> <% if(finished) { %> -

<%= gettext("Success!") %>

+
+

<%= gettext("Success!") %>

+
<% } %> +
@@ -40,10 +42,10 @@

<%= gettext('Form Actions') %>