diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js index 6a7abbf04105..3c64e98c5475 100644 --- a/cms/static/js/spec/views/group_configuration_spec.js +++ b/cms/static/js/spec/views/group_configuration_spec.js @@ -35,8 +35,8 @@ define([ usageUnit: '.group-configuration-usage-unit', usageUnitAnchor: '.group-configuration-usage-unit a', usageUnitMessage: '.group-configuration-validation-message', - usageUnitWarningIcon: '.group-configuration-usage-unit i.icon-warning-sign', - usageUnitErrorIcon: '.group-configuration-usage-unit i.icon-exclamation-sign', + usageUnitWarningIcon: '.group-configuration-usage-unit i.fa-warning', + usageUnitErrorIcon: '.group-configuration-usage-unit i.fa-exclamation-triangle', warningMessage: '.group-configuration-validation-text', warningIcon: '.wrapper-group-configuration-validation > i', note: '.wrapper-delete-button' diff --git a/cms/static/js/spec/views/pages/container_subviews_spec.js b/cms/static/js/spec/views/pages/container_subviews_spec.js index 50653efcc726..2809c779a412 100644 --- a/cms/static/js/spec/views/pages/container_subviews_spec.js +++ b/cms/static/js/spec/views/pages/container_subviews_spec.js @@ -438,9 +438,9 @@ define(["jquery", "underscore", "underscore.string", "js/common_helpers/ajax_hel verifyExplicitStaffOnly = function(isStaffOnly) { if (isStaffOnly) { - expect(containerPage.$('.action-staff-lock i')).toHaveClass('icon-check'); + expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-check-square-o'); } else { - expect(containerPage.$('.action-staff-lock i')).toHaveClass('icon-check-empty'); + expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-square-o'); } }; diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 481fb8607734..f3569787b478 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -79,7 +79,7 @@

${_("Using File URLs")}

- ${_('close')} + ${_('close')}

${_("Upload New File")}

@@ -105,14 +105,14 @@

${_("Upload New File")}

- +

${_('Your file has been deleted.')}

- + ${_('close alert')}
diff --git a/cms/templates/component.html b/cms/templates/component.html index c5128ba279e3..d7be9deca220 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -20,7 +20,7 @@
  • - + ${_("Delete this component")}
    • diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html index 10f151bbda6f..f0711d04f3e0 100644 --- a/cms/templates/course_outline.html +++ b/cms/templates/course_outline.html @@ -42,7 +42,7 @@

    ${_("This course was created as a re-run. Some manual
    • - + ${_("Dismiss")}
      • diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 4129af198521..1f37202b312a 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -105,7 +105,7 @@

      ${_(tab.name)}

      % else: % endif -
      +
      % endif @@ -163,7 +163,7 @@

      ${_("Pages in Your Course")}

      - + ${_("close modal")}

    diff --git a/cms/templates/export.html b/cms/templates/export.html index c7714ecca103..fa77cb0c8d9d 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -51,7 +51,7 @@

    ${_("Export My Course Content")}

    @@ -171,7 +171,7 @@

    ${_("More than Just Lectures")}

    - + ${_("close modal")}
    @@ -184,7 +184,7 @@

    ${_("Publishing on Date")}

    - + ${_("close modal")} diff --git a/cms/templates/html_error.html b/cms/templates/html_error.html index 65bf870029bd..c0c47a8e1dc7 100644 --- a/cms/templates/html_error.html +++ b/cms/templates/html_error.html @@ -7,7 +7,7 @@

    - + ${_("We're having trouble rendering your component")}

    diff --git a/cms/templates/import.html b/cms/templates/import.html index 63ab52ceb73f..57043734db81 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -36,7 +36,7 @@

    ${_("Select a .tar.gz File to Replace Your Course Content")}

    - + ${_("Choose a File to Import")} @@ -57,8 +57,8 @@

    ${_("Course Import Status")}

    1. - - + +
      @@ -72,8 +72,8 @@

      ${_("Uploading")}

    2. - - + +
      @@ -85,8 +85,8 @@

      ${_("Unpacking")}

    3. - - + +
      @@ -97,8 +97,8 @@

      ${_("Verifying")}

    4. - - + +
      @@ -108,7 +108,7 @@

      ${_("Updating Course")}

    5. - +
      diff --git a/cms/templates/index.html b/cms/templates/index.html index 7a155f9ceca4..2db58151d92b 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -183,7 +183,7 @@

      ${course_info['display_name']}

      This re-run processing status:
      - + Configuration Error
      @@ -195,7 +195,7 @@

      ${course_info['display_name']}

      diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html index 4ad50666d57c..e881da6fd058 100644 --- a/cms/templates/studio_xblock_wrapper.html +++ b/cms/templates/studio_xblock_wrapper.html @@ -71,7 +71,7 @@ % endif
    6. - + ${_("Delete")}
      7. diff --git a/cms/templates/ux/reference/container.html b/cms/templates/ux/reference/container.html index 880a53d6fae1..8436248bc0eb 100644 --- a/cms/templates/ux/reference/container.html +++ b/cms/templates/ux/reference/container.html @@ -124,7 +124,7 @@

      Page Actions

    7. - + Delete this component
      8. @@ -239,7 +239,7 @@

      Speed

    8. - + Delete this component
      9. @@ -293,7 +293,7 @@

      Speed

    9. - + Delete this component
      10. @@ -324,7 +324,7 @@

      Speed

    10. - + Delete this component
      11. @@ -414,7 +414,7 @@

    11. - + Delete this component
      12. diff --git a/cms/templates/ux/reference/outline.html b/cms/templates/ux/reference/outline.html index e2475910b228..a299a4022712 100644 --- a/cms/templates/ux/reference/outline.html +++ b/cms/templates/ux/reference/outline.html @@ -478,7 +478,7 @@

      Your Course's Outline

      Release Status: - + Released on: March 25, 2014 diff --git a/cms/templates/ux/reference/outline_section_header-collapsed.html b/cms/templates/ux/reference/outline_section_header-collapsed.html index 83956f5b029d..9b1c1a9ed267 100644 --- a/cms/templates/ux/reference/outline_section_header-collapsed.html +++ b/cms/templates/ux/reference/outline_section_header-collapsed.html @@ -10,7 +10,7 @@

    12. - + Publish all content
      13. @@ -22,7 +22,7 @@

      - + Delete diff --git a/cms/templates/ux/reference/outline_section_header-expanded.html b/cms/templates/ux/reference/outline_section_header-expanded.html index 83956f5b029d..9b1c1a9ed267 100644 --- a/cms/templates/ux/reference/outline_section_header-expanded.html +++ b/cms/templates/ux/reference/outline_section_header-expanded.html @@ -10,7 +10,7 @@

    13. - + Publish all content
      14. @@ -22,7 +22,7 @@

      - + Delete diff --git a/cms/templates/ux/reference/outline_status_grading.html b/cms/templates/ux/reference/outline_status_grading.html index 57794030e9bb..e8d0bdb1f6b4 100644 --- a/cms/templates/ux/reference/outline_status_grading.html +++ b/cms/templates/ux/reference/outline_status_grading.html @@ -1,7 +1,7 @@

      Graded as: - + Homework Due: December 31, 2014

      diff --git a/cms/templates/ux/reference/outline_status_message-error.html b/cms/templates/ux/reference/outline_status_message-error.html index 365799f429b8..b73c010d88b9 100644 --- a/cms/templates/ux/reference/outline_status_message-error.html +++ b/cms/templates/ux/reference/outline_status_message-error.html @@ -1,4 +1,4 @@
      - +

      Critical error

      diff --git a/cms/templates/ux/reference/outline_status_message-unpublished_changes.html b/cms/templates/ux/reference/outline_status_message-unpublished_changes.html index ac6a752bc0f0..0eb04a31c273 100644 --- a/cms/templates/ux/reference/outline_status_message-unpublished_changes.html +++ b/cms/templates/ux/reference/outline_status_message-unpublished_changes.html @@ -1,4 +1,4 @@
      - +

      Unpublished change(s) to live content

      diff --git a/cms/templates/ux/reference/outline_status_message-unpublished_units.html b/cms/templates/ux/reference/outline_status_message-unpublished_units.html index cab479da3e3b..8d4b9854dec0 100644 --- a/cms/templates/ux/reference/outline_status_message-unpublished_units.html +++ b/cms/templates/ux/reference/outline_status_message-unpublished_units.html @@ -1,4 +1,4 @@
      - +

      Unpublished unit(s) will not be released

      diff --git a/cms/templates/ux/reference/outline_status_release-draft.html b/cms/templates/ux/reference/outline_status_release-draft.html index 02304355abae..d6458f3842b0 100644 --- a/cms/templates/ux/reference/outline_status_release-draft.html +++ b/cms/templates/ux/reference/outline_status_release-draft.html @@ -2,7 +2,7 @@

      Release Status: - + This item is Unscheduled diff --git a/cms/templates/ux/reference/outline_status_release-released.html b/cms/templates/ux/reference/outline_status_release-released.html index d6eb3dc91bf1..bf6a2352d9b0 100644 --- a/cms/templates/ux/reference/outline_status_release-released.html +++ b/cms/templates/ux/reference/outline_status_release-released.html @@ -2,7 +2,7 @@

      Release Status: - + Released on: March 25, 2014 diff --git a/cms/templates/ux/reference/outline_status_release-released_with_parent.html b/cms/templates/ux/reference/outline_status_release-released_with_parent.html index c06f01819192..66744a7789ee 100644 --- a/cms/templates/ux/reference/outline_status_release-released_with_parent.html +++ b/cms/templates/ux/reference/outline_status_release-released_with_parent.html @@ -2,7 +2,7 @@

      Release Status: - + Released with Section

      diff --git a/cms/templates/ux/reference/outline_status_release-scheduled.html b/cms/templates/ux/reference/outline_status_release-scheduled.html index e6b62df57be8..7387695e05ad 100644 --- a/cms/templates/ux/reference/outline_status_release-scheduled.html +++ b/cms/templates/ux/reference/outline_status_release-scheduled.html @@ -2,7 +2,7 @@

      Release Status: - + Scheduled: October 31, 2014

      diff --git a/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html b/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html index e5ae050b3d8c..c08234c4a4ef 100644 --- a/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html +++ b/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html @@ -2,7 +2,7 @@

      Release Status: - + Scheduled: with Section

      diff --git a/cms/templates/ux/reference/outline_subsection_header-collapsed.html b/cms/templates/ux/reference/outline_subsection_header-collapsed.html index c51e69520d2c..a1837b0e68eb 100644 --- a/cms/templates/ux/reference/outline_subsection_header-collapsed.html +++ b/cms/templates/ux/reference/outline_subsection_header-collapsed.html @@ -17,7 +17,7 @@

    14. - + Publish
      15. @@ -29,7 +29,7 @@

      - + Delete diff --git a/cms/templates/ux/reference/outline_subsection_header-expanded.html b/cms/templates/ux/reference/outline_subsection_header-expanded.html index c51e69520d2c..a1837b0e68eb 100644 --- a/cms/templates/ux/reference/outline_subsection_header-expanded.html +++ b/cms/templates/ux/reference/outline_subsection_header-expanded.html @@ -17,7 +17,7 @@

    15. - + Publish
      16. @@ -29,7 +29,7 @@

      - + Delete diff --git a/cms/templates/ux/reference/outline_unit_header.html b/cms/templates/ux/reference/outline_unit_header.html index 7487c56a4695..f711fba89679 100644 --- a/cms/templates/ux/reference/outline_unit_header.html +++ b/cms/templates/ux/reference/outline_unit_header.html @@ -7,7 +7,7 @@

      • - + Publish
        • @@ -19,7 +19,7 @@

      • - + Delete
        • diff --git a/cms/templates/widgets/sock.html b/cms/templates/widgets/sock.html index a28cce15257a..00c4f8b6ce02 100644 --- a/cms/templates/widgets/sock.html +++ b/cms/templates/widgets/sock.html @@ -4,7 +4,7 @@
        diff --git a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee index d1a3de530a2d..c32058e0172d 100644 --- a/common/static/coffee/spec/discussion/discussion_spec_helper.coffee +++ b/common/static/coffee/spec/discussion/discussion_spec_helper.coffee @@ -227,7 +227,7 @@ browser and pasting the output. When that file changes, this one should be rege icon_class = "icon-comments"; sr_text = "discussion"; } else if (endorsed) { - icon_class = "icon-ok"; + icon_class = "icon-check"; sr_text = "answered question"; } else { icon_class = "icon-question"; @@ -434,7 +434,7 @@ browser and pasting the output. When that file changes, this one should be rege Endorse Unendorse - + @@ -448,7 +448,7 @@ browser and pasting the output. When that file changes, this one should be rege Mark as Answer Unmark as Answer - + diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee index eeeb37c88f3e..28e6530b20fc 100644 --- a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee +++ b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee @@ -415,7 +415,7 @@ describe "DiscussionThreadListView", -> it "for answered question", -> renderSingleThreadWithProps({thread_type: "question", endorsed: true}) - expect($(".forum-nav-thread-wrapper-0 .icon")).toHaveClass("icon-ok") + expect($(".forum-nav-thread-wrapper-0 .icon")).toHaveClass("icon-check") expect($(".forum-nav-thread-wrapper-0 .sr")).toHaveText("answered question") it "for unanswered question", -> diff --git a/common/static/css/vendor/font-awesome.css b/common/static/css/vendor/font-awesome.css index aee05c3cc94b..481ee62bb3e4 100644 --- a/common/static/css/vendor/font-awesome.css +++ b/common/static/css/vendor/font-awesome.css @@ -1,34 +1,16 @@ /*! - * Font Awesome 3.2.1 - * the iconic font designed for Bootstrap - * ------------------------------------------------------------------------------ - * The full suite of pictographic icons, examples, and documentation can be - * found at http://fontawesome.io. Stay up to date on Twitter at - * http://twitter.com/fontawesome. - * - * License - * ------------------------------------------------------------------------------ - * - The Font Awesome font is licensed under SIL OFL 1.1 - - * http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - - * http://opensource.org/licenses/mit-license.html - * - Font Awesome documentation licensed under CC BY 3.0 - - * http://creativecommons.org/licenses/by/3.0/ - * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - * "Font Awesome by Dave Gandy - http://fontawesome.io" - * - * Author - Dave Gandy - * ------------------------------------------------------------------------------ - * Email: dave@fontawesome.io - * Twitter: http://twitter.com/davegandy - * Work: Lead Product Designer @ Kyruus - http://kyruus.com + * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */ /* FONT PATH * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../../fonts/vendor/fontawesome-webfont.eot?v=3.2.1'); - src: url('../../fonts/vendor/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../../fonts/vendor/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../../fonts/vendor/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../../fonts/vendor/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg'); + src: url('../../fonts/vendor/fontawesome-webfont.eot?v=4.2.0'); + src: url('../../fonts/vendor/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), + url('../../fonts/vendor/fontawesome-webfont.woff?v=4.2.0') format('woff'), + url('../../fonts/vendor/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), + url('../../fonts/vendor/fontawesome-webfont.svg#fontawesomeregular?v=4.2.0') format('svg'); font-weight: normal; font-style: normal; } @@ -46,100 +28,58 @@ [class^="icon-"]:before, [class*=" icon-"]:before { text-decoration: inherit; - display: inline-block; speak: none; -} -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} -/* makes sure icons active on rollover in links */ -a [class^="icon-"], -a [class*=" icon-"] { - display: inline; -} -/* increased font size for icon-large */ -[class^="icon-"].icon-fixed-width, -[class*=" icon-"].icon-fixed-width { display: inline-block; - width: 1.1428571428571428em; - text-align: right; - padding-right: 0.2857142857142857em; -} -[class^="icon-"].icon-fixed-width.icon-large, -[class*=" icon-"].icon-fixed-width.icon-large { - width: 1.4285714285714286em; -} -.icons-ul { - margin-left: 2.142857142857143em; - list-style-type: none; -} -.icons-ul > li { - position: relative; -} -.icons-ul .icon-li { - position: absolute; - left: -2.142857142857143em; - width: 2.142857142857143em; - text-align: center; - line-height: inherit; -} -[class^="icon-"].hide, -[class*=" icon-"].hide { - display: none; -} -.icon-muted { - color: #eeeeee; -} -.icon-light { - color: #ffffff; -} -.icon-dark { - color: #333333; + /*font: normal normal normal 14px/1 FontAwesome;*/ + /*font-size: inherit;*/ + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -.icon-border { - border: solid 1px #eeeeee; - padding: .2em .25em .15em; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +/* makes the font 33% larger relative to the icon container */ +.icon-lg { + font-size: 1.33333333em; + line-height: 0.75em; + vertical-align: -15%; } .icon-2x { font-size: 2em; } -.icon-2x.icon-border { - border-width: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} .icon-3x { font-size: 3em; } -.icon-3x.icon-border { - border-width: 3px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} .icon-4x { font-size: 4em; } -.icon-4x.icon-border { - border-width: 4px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} .icon-5x { font-size: 5em; } -.icon-5x.icon-border { - border-width: 5px; - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - border-radius: 7px; +.icon-fw { + width: 1.28571429em; + text-align: center; +} +.icon-ul { + padding-left: 0; + margin-left: 2.14285714em; + list-style-type: none; +} +.icon-ul > li { + position: relative; +} +.icon-li { + position: absolute; + left: -2.14285714em; + width: 2.14285714em; + top: 0.14285714em; + text-align: center; +} +.icon-li.icon-lg { + left: -1.85714286em; +} +.icon-border { + padding: .2em .25em .15em; + border: solid 0.08em #eeeeee; + border-radius: .1em; } .pull-right { float: right; @@ -147,233 +87,96 @@ a [class*=" icon-"] { .pull-left { float: left; } -[class^="icon-"].pull-left, -[class*=" icon-"].pull-left { +.icon.pull-left { margin-right: .3em; } -[class^="icon-"].pull-right, -[class*=" icon-"].pull-right { +.icon.pull-right { margin-left: .3em; } -/* BOOTSTRAP SPECIFIC CLASSES - * -------------------------- */ -/* Bootstrap 2.0 sprites.less reset */ -[class^="icon-"], -[class*=" icon-"] { - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} -/* more sprites.less reset */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; -} -/* keeps Bootstrap styles with and without icons the same */ -.btn [class^="icon-"].icon-large, -.nav [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large, -.nav [class*=" icon-"].icon-large { - line-height: .9em; -} -.btn [class^="icon-"].icon-spin, -.nav [class^="icon-"].icon-spin, -.btn [class*=" icon-"].icon-spin, -.nav [class*=" icon-"].icon-spin { - display: inline-block; -} -.nav-tabs [class^="icon-"], -.nav-pills [class^="icon-"], -.nav-tabs [class*=" icon-"], -.nav-pills [class*=" icon-"], -.nav-tabs [class^="icon-"].icon-large, -.nav-pills [class^="icon-"].icon-large, -.nav-tabs [class*=" icon-"].icon-large, -.nav-pills [class*=" icon-"].icon-large { - line-height: .9em; -} -.btn [class^="icon-"].pull-left.icon-2x, -.btn [class*=" icon-"].pull-left.icon-2x, -.btn [class^="icon-"].pull-right.icon-2x, -.btn [class*=" icon-"].pull-right.icon-2x { - margin-top: .18em; -} -.btn [class^="icon-"].icon-spin.icon-large, -.btn [class*=" icon-"].icon-spin.icon-large { - line-height: .8em; -} -.btn.btn-small [class^="icon-"].pull-left.icon-2x, -.btn.btn-small [class*=" icon-"].pull-left.icon-2x, -.btn.btn-small [class^="icon-"].pull-right.icon-2x, -.btn.btn-small [class*=" icon-"].pull-right.icon-2x { - margin-top: .25em; -} -.btn.btn-large [class^="icon-"], -.btn.btn-large [class*=" icon-"] { - margin-top: 0; -} -.btn.btn-large [class^="icon-"].pull-left.icon-2x, -.btn.btn-large [class*=" icon-"].pull-left.icon-2x, -.btn.btn-large [class^="icon-"].pull-right.icon-2x, -.btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-top: .05em; -} -.btn.btn-large [class^="icon-"].pull-left.icon-2x, -.btn.btn-large [class*=" icon-"].pull-left.icon-2x { - margin-right: .2em; -} -.btn.btn-large [class^="icon-"].pull-right.icon-2x, -.btn.btn-large [class*=" icon-"].pull-right.icon-2x { - margin-left: .2em; -} -/* Fixes alignment in nav lists */ -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - line-height: inherit; -} -/* EXTRAS - * -------------------------- */ -/* Stacked and layered icon */ -.icon-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: -35%; -} -.icon-stack [class^="icon-"], -.icon-stack [class*=" icon-"] { - display: block; - text-align: center; - position: absolute; - width: 100%; - height: 100%; - font-size: 1em; - line-height: inherit; - *line-height: 2em; -} -.icon-stack .icon-stack-base { - font-size: 2em; - *line-height: 1em; -} -/* Animated rotating icon */ .icon-spin { - display: inline-block; - -moz-animation: spin 2s infinite linear; - -o-animation: spin 2s infinite linear; - -webkit-animation: spin 2s infinite linear; - animation: spin 2s infinite linear; -} -/* Prevent stack and spinners from being taken inline when inside a link */ -a .icon-stack, -a .icon-spin { - display: inline-block; - text-decoration: none; -} -@-moz-keyframes spin { - 0% { - -moz-transform: rotate(0deg); - } - 100% { - -moz-transform: rotate(359deg); - } + -webkit-animation: icon-spin 2s infinite linear; + animation: icon-spin 2s infinite linear; } -@-webkit-keyframes spin { +@-webkit-keyframes icon-spin { 0% { -webkit-transform: rotate(0deg); + transform: rotate(0deg); } 100% { -webkit-transform: rotate(359deg); + transform: rotate(359deg); } } -@-o-keyframes spin { - 0% { - -o-transform: rotate(0deg); - } - 100% { - -o-transform: rotate(359deg); - } -} -@-ms-keyframes spin { - 0% { - -ms-transform: rotate(0deg); - } - 100% { - -ms-transform: rotate(359deg); - } -} -@keyframes spin { +@keyframes icon-spin { 0% { + -webkit-transform: rotate(0deg); transform: rotate(0deg); } 100% { + -webkit-transform: rotate(359deg); transform: rotate(359deg); } } -/* Icon rotations and mirroring */ -.icon-rotate-90:before { +.icon-rotate-90 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); -webkit-transform: rotate(90deg); - -moz-transform: rotate(90deg); -ms-transform: rotate(90deg); - -o-transform: rotate(90deg); transform: rotate(90deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); } -.icon-rotate-180:before { +.icon-rotate-180 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); -ms-transform: rotate(180deg); - -o-transform: rotate(180deg); transform: rotate(180deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); } -.icon-rotate-270:before { +.icon-rotate-270 { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); -webkit-transform: rotate(270deg); - -moz-transform: rotate(270deg); -ms-transform: rotate(270deg); - -o-transform: rotate(270deg); transform: rotate(270deg); - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); } -.icon-flip-horizontal:before { +.icon-flip-horizontal { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); -webkit-transform: scale(-1, 1); - -moz-transform: scale(-1, 1); -ms-transform: scale(-1, 1); - -o-transform: scale(-1, 1); transform: scale(-1, 1); } -.icon-flip-vertical:before { +.icon-flip-vertical { + filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); -webkit-transform: scale(1, -1); - -moz-transform: scale(1, -1); -ms-transform: scale(1, -1); - -o-transform: scale(1, -1); transform: scale(1, -1); } -/* ensure rotation occurs inside anchor tags */ -a .icon-rotate-90:before, -a .icon-rotate-180:before, -a .icon-rotate-270:before, -a .icon-flip-horizontal:before, -a .icon-flip-vertical:before { +:root .icon-rotate-90, +:root .icon-rotate-180, +:root .icon-rotate-270, +:root .icon-flip-horizontal, +:root .icon-flip-vertical { + filter: none; +} +.icon-stack { + position: relative; display: inline-block; + width: 2em; + height: 2em; + line-height: 2em; + vertical-align: middle; +} +.icon-stack-1x, +.icon-stack-2x { + position: absolute; + left: 0; + width: 100%; + text-align: center; +} +.icon-stack-1x { + line-height: inherit; +} +.icon-stack-2x { + font-size: 2em; +} +.icon-inverse { + color: #ffffff; } /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen readers do not read off random characters that represent icons */ @@ -386,7 +189,7 @@ a .icon-flip-vertical:before { .icon-search:before { content: "\f002"; } -.icon-envelope-alt:before { +.icon-envelope-o:before { content: "\f003"; } .icon-heart:before { @@ -395,7 +198,7 @@ a .icon-flip-vertical:before { .icon-star:before { content: "\f005"; } -.icon-star-empty:before { +.icon-star-o:before { content: "\f006"; } .icon-user:before { @@ -413,20 +216,21 @@ a .icon-flip-vertical:before { .icon-th-list:before { content: "\f00b"; } -.icon-ok:before { +.icon-check:before { content: "\f00c"; } -.icon-remove:before { +.icon-remove:before, +.icon-close:before, +.icon-times:before { content: "\f00d"; } -.icon-zoom-in:before { +.icon-search-plus:before { content: "\f00e"; } -.icon-zoom-out:before { +.icon-search-minus:before { content: "\f010"; } -.icon-power-off:before, -.icon-off:before { +.icon-power-off:before { content: "\f011"; } .icon-signal:before { @@ -436,34 +240,34 @@ a .icon-flip-vertical:before { .icon-cog:before { content: "\f013"; } -.icon-trash:before { +.icon-trash-o:before { content: "\f014"; } .icon-home:before { content: "\f015"; } -.icon-file-alt:before { +.icon-file-o:before { content: "\f016"; } -.icon-time:before { +.icon-clock-o:before { content: "\f017"; } .icon-road:before { content: "\f018"; } -.icon-download-alt:before { +.icon-download:before { content: "\f019"; } -.icon-download:before { +.icon-arrow-circle-o-down:before { content: "\f01a"; } -.icon-upload:before { +.icon-arrow-circle-o-up:before { content: "\f01b"; } .icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { +.icon-play-circle-o:before { content: "\f01d"; } .icon-rotate-right:before, @@ -548,16 +352,19 @@ a .icon-flip-vertical:before { .icon-list:before { content: "\f03a"; } -.icon-indent-left:before { +.icon-dedent:before, +.icon-outdent:before { content: "\f03b"; } -.icon-indent-right:before { +.icon-indent:before { content: "\f03c"; } -.icon-facetime-video:before { +.icon-video-camera:before { content: "\f03d"; } -.icon-picture:before { +.icon-photo:before, +.icon-image:before, +.icon-picture-o:before { content: "\f03e"; } .icon-pencil:before { @@ -572,16 +379,17 @@ a .icon-flip-vertical:before { .icon-tint:before { content: "\f043"; } -.icon-edit:before { +.icon-edit:before, +.icon-pencil-square-o:before { content: "\f044"; } -.icon-share:before { +.icon-share-square-o:before { content: "\f045"; } -.icon-check:before { +.icon-check-square-o:before { content: "\f046"; } -.icon-move:before { +.icon-arrows:before { content: "\f047"; } .icon-step-backward:before { @@ -620,34 +428,34 @@ a .icon-flip-vertical:before { .icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { +.icon-plus-circle:before { content: "\f055"; } -.icon-minus-sign:before { +.icon-minus-circle:before { content: "\f056"; } -.icon-remove-sign:before { +.icon-times-circle:before { content: "\f057"; } -.icon-ok-sign:before { +.icon-check-circle:before { content: "\f058"; } -.icon-question-sign:before { +.icon-question-circle:before { content: "\f059"; } -.icon-info-sign:before { +.icon-info-circle:before { content: "\f05a"; } -.icon-screenshot:before { +.icon-crosshairs:before { content: "\f05b"; } -.icon-remove-circle:before { +.icon-times-circle-o:before { content: "\f05c"; } -.icon-ok-circle:before { +.icon-check-circle-o:before { content: "\f05d"; } -.icon-ban-circle:before { +.icon-ban:before { content: "\f05e"; } .icon-arrow-left:before { @@ -663,13 +471,13 @@ a .icon-flip-vertical:before { content: "\f063"; } .icon-mail-forward:before, -.icon-share-alt:before { +.icon-share:before { content: "\f064"; } -.icon-resize-full:before { +.icon-expand:before { content: "\f065"; } -.icon-resize-small:before { +.icon-compress:before { content: "\f066"; } .icon-plus:before { @@ -681,7 +489,7 @@ a .icon-flip-vertical:before { .icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { +.icon-exclamation-circle:before { content: "\f06a"; } .icon-gift:before { @@ -693,13 +501,14 @@ a .icon-flip-vertical:before { .icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { +.icon-eye:before { content: "\f06e"; } -.icon-eye-close:before { +.icon-eye-slash:before { content: "\f070"; } -.icon-warning-sign:before { +.icon-warning:before, +.icon-exclamation-triangle:before { content: "\f071"; } .icon-plane:before { @@ -729,25 +538,26 @@ a .icon-flip-vertical:before { .icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { +.icon-folder:before { content: "\f07b"; } .icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { +.icon-arrows-v:before { content: "\f07d"; } -.icon-resize-horizontal:before { +.icon-arrows-h:before { content: "\f07e"; } +.icon-bar-chart-o:before, .icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { +.icon-twitter-square:before { content: "\f081"; } -.icon-facebook-sign:before { +.icon-facebook-square:before { content: "\f082"; } .icon-camera-retro:before { @@ -763,56 +573,55 @@ a .icon-flip-vertical:before { .icon-comments:before { content: "\f086"; } -.icon-thumbs-up-alt:before { +.icon-thumbs-o-up:before { content: "\f087"; } -.icon-thumbs-down-alt:before { +.icon-thumbs-o-down:before { content: "\f088"; } .icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { +.icon-heart-o:before { content: "\f08a"; } -.icon-signout:before { +.icon-sign-out:before { content: "\f08b"; } -.icon-linkedin-sign:before { +.icon-linkedin-square:before { content: "\f08c"; } -.icon-pushpin:before { +.icon-thumb-tack:before { content: "\f08d"; } .icon-external-link:before { content: "\f08e"; } -.icon-signin:before { +.icon-sign-in:before { content: "\f090"; } .icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { +.icon-github-square:before { content: "\f092"; } -.icon-upload-alt:before { +.icon-upload:before { content: "\f093"; } -.icon-lemon:before { +.icon-lemon-o:before { content: "\f094"; } .icon-phone:before { content: "\f095"; } -.icon-unchecked:before, -.icon-check-empty:before { +.icon-square-o:before { content: "\f096"; } -.icon-bookmark-empty:before { +.icon-bookmark-o:before { content: "\f097"; } -.icon-phone-sign:before { +.icon-phone-square:before { content: "\f098"; } .icon-twitter:before { @@ -833,40 +642,40 @@ a .icon-flip-vertical:before { .icon-rss:before { content: "\f09e"; } -.icon-hdd:before { +.icon-hdd-o:before { content: "\f0a0"; } .icon-bullhorn:before { content: "\f0a1"; } .icon-bell:before { - content: "\f0a2"; + content: "\f0f3"; } .icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { +.icon-hand-o-right:before { content: "\f0a4"; } -.icon-hand-left:before { +.icon-hand-o-left:before { content: "\f0a5"; } -.icon-hand-up:before { +.icon-hand-o-up:before { content: "\f0a6"; } -.icon-hand-down:before { +.icon-hand-o-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { +.icon-arrow-circle-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { +.icon-arrow-circle-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { +.icon-arrow-circle-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { +.icon-arrow-circle-down:before { content: "\f0ab"; } .icon-globe:before { @@ -884,38 +693,44 @@ a .icon-flip-vertical:before { .icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { +.icon-arrows-alt:before { content: "\f0b2"; } -.icon-group:before { +.icon-group:before, +.icon-users:before { content: "\f0c0"; } +.icon-chain:before, .icon-link:before { content: "\f0c1"; } .icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { +.icon-flask:before { content: "\f0c3"; } -.icon-cut:before { +.icon-cut:before, +.icon-scissors:before { content: "\f0c4"; } -.icon-copy:before { +.icon-copy:before, +.icon-files-o:before { content: "\f0c5"; } -.icon-paperclip:before, -.icon-paper-clip:before { +.icon-paperclip:before { content: "\f0c6"; } -.icon-save:before { +.icon-save:before, +.icon-floppy-o:before { content: "\f0c7"; } -.icon-sign-blank:before { +.icon-square:before { content: "\f0c8"; } -.icon-reorder:before { +.icon-navicon:before, +.icon-reorder:before, +.icon-bars:before { content: "\f0c9"; } .icon-list-ul:before { @@ -942,10 +757,10 @@ a .icon-flip-vertical:before { .icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { +.icon-pinterest-square:before { content: "\f0d3"; } -.icon-google-plus-sign:before { +.icon-google-plus-square:before { content: "\f0d4"; } .icon-google-plus:before { @@ -969,13 +784,16 @@ a .icon-flip-vertical:before { .icon-columns:before { content: "\f0db"; } +.icon-unsorted:before, .icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { +.icon-sort-down:before, +.icon-sort-desc:before { content: "\f0dd"; } -.icon-sort-up:before { +.icon-sort-up:before, +.icon-sort-asc:before { content: "\f0de"; } .icon-envelope:before { @@ -988,18 +806,21 @@ a .icon-flip-vertical:before { .icon-undo:before { content: "\f0e2"; } -.icon-legal:before { +.icon-legal:before, +.icon-gavel:before { content: "\f0e3"; } -.icon-dashboard:before { +.icon-dashboard:before, +.icon-tachometer:before { content: "\f0e4"; } -.icon-comment-alt:before { +.icon-comment-o:before { content: "\f0e5"; } -.icon-comments-alt:before { +.icon-comments-o:before { content: "\f0e6"; } +.icon-flash:before, .icon-bolt:before { content: "\f0e7"; } @@ -1009,10 +830,11 @@ a .icon-flip-vertical:before { .icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { +.icon-paste:before, +.icon-clipboard:before { content: "\f0ea"; } -.icon-lightbulb:before { +.icon-lightbulb-o:before { content: "\f0eb"; } .icon-exchange:before { @@ -1033,22 +855,22 @@ a .icon-flip-vertical:before { .icon-suitcase:before { content: "\f0f2"; } -.icon-bell-alt:before { - content: "\f0f3"; +.icon-bell-o:before { + content: "\f0a2"; } .icon-coffee:before { content: "\f0f4"; } -.icon-food:before { +.icon-cutlery:before { content: "\f0f5"; } -.icon-file-text-alt:before { +.icon-file-text-o:before { content: "\f0f6"; } -.icon-building:before { +.icon-building-o:before { content: "\f0f7"; } -.icon-hospital:before { +.icon-hospital-o:before { content: "\f0f8"; } .icon-ambulance:before { @@ -1063,22 +885,22 @@ a .icon-flip-vertical:before { .icon-beer:before { content: "\f0fc"; } -.icon-h-sign:before { +.icon-h-square:before { content: "\f0fd"; } -.icon-plus-sign-alt:before { +.icon-plus-square:before { content: "\f0fe"; } -.icon-double-angle-left:before { +.icon-angle-double-left:before { content: "\f100"; } -.icon-double-angle-right:before { +.icon-angle-double-right:before { content: "\f101"; } -.icon-double-angle-up:before { +.icon-angle-double-up:before { content: "\f102"; } -.icon-double-angle-down:before { +.icon-angle-double-down:before { content: "\f103"; } .icon-angle-left:before { @@ -1102,10 +924,11 @@ a .icon-flip-vertical:before { .icon-tablet:before { content: "\f10a"; } -.icon-mobile-phone:before { +.icon-mobile-phone:before, +.icon-mobile:before { content: "\f10b"; } -.icon-circle-blank:before { +.icon-circle-o:before { content: "\f10c"; } .icon-quote-left:before { @@ -1127,34 +950,28 @@ a .icon-flip-vertical:before { .icon-github-alt:before { content: "\f113"; } -.icon-folder-close-alt:before { +.icon-folder-o:before { content: "\f114"; } -.icon-folder-open-alt:before { +.icon-folder-open-o:before { content: "\f115"; } -.icon-expand-alt:before { - content: "\f116"; -} -.icon-collapse-alt:before { - content: "\f117"; -} -.icon-smile:before { +.icon-smile-o:before { content: "\f118"; } -.icon-frown:before { +.icon-frown-o:before { content: "\f119"; } -.icon-meh:before { +.icon-meh-o:before { content: "\f11a"; } .icon-gamepad:before { content: "\f11b"; } -.icon-keyboard:before { +.icon-keyboard-o:before { content: "\f11c"; } -.icon-flag-alt:before { +.icon-flag-o:before { content: "\f11d"; } .icon-flag-checkered:before { @@ -1166,14 +983,13 @@ a .icon-flip-vertical:before { .icon-code:before { content: "\f121"; } +.icon-mail-reply-all:before, .icon-reply-all:before { content: "\f122"; } -.icon-mail-reply-all:before { - content: "\f122"; -} +.icon-star-half-empty:before, .icon-star-half-full:before, -.icon-star-half-empty:before { +.icon-star-half-o:before { content: "\f123"; } .icon-location-arrow:before { @@ -1185,7 +1001,8 @@ a .icon-flip-vertical:before { .icon-code-fork:before { content: "\f126"; } -.icon-unlink:before { +.icon-unlink:before, +.icon-chain-broken:before { content: "\f127"; } .icon-question:before { @@ -1212,13 +1029,13 @@ a .icon-flip-vertical:before { .icon-microphone:before { content: "\f130"; } -.icon-microphone-off:before { +.icon-microphone-slash:before { content: "\f131"; } .icon-shield:before { content: "\f132"; } -.icon-calendar-empty:before { +.icon-calendar-o:before { content: "\f133"; } .icon-fire-extinguisher:before { @@ -1230,16 +1047,16 @@ a .icon-flip-vertical:before { .icon-maxcdn:before { content: "\f136"; } -.icon-chevron-sign-left:before { +.icon-chevron-circle-left:before { content: "\f137"; } -.icon-chevron-sign-right:before { +.icon-chevron-circle-right:before { content: "\f138"; } -.icon-chevron-sign-up:before { +.icon-chevron-circle-up:before { content: "\f139"; } -.icon-chevron-sign-down:before { +.icon-chevron-circle-down:before { content: "\f13a"; } .icon-html5:before { @@ -1257,25 +1074,25 @@ a .icon-flip-vertical:before { .icon-bullseye:before { content: "\f140"; } -.icon-ellipsis-horizontal:before { +.icon-ellipsis-h:before { content: "\f141"; } -.icon-ellipsis-vertical:before { +.icon-ellipsis-v:before { content: "\f142"; } -.icon-rss-sign:before { +.icon-rss-square:before { content: "\f143"; } -.icon-play-sign:before { +.icon-play-circle:before { content: "\f144"; } .icon-ticket:before { content: "\f145"; } -.icon-minus-sign-alt:before { +.icon-minus-square:before { content: "\f146"; } -.icon-check-minus:before { +.icon-minus-square-o:before { content: "\f147"; } .icon-level-up:before { @@ -1284,28 +1101,31 @@ a .icon-flip-vertical:before { .icon-level-down:before { content: "\f149"; } -.icon-check-sign:before { +.icon-check-square:before { content: "\f14a"; } -.icon-edit-sign:before { +.icon-pencil-square:before { content: "\f14b"; } -.icon-external-link-sign:before { +.icon-external-link-square:before { content: "\f14c"; } -.icon-share-sign:before { +.icon-share-square:before { content: "\f14d"; } .icon-compass:before { content: "\f14e"; } -.icon-collapse:before { +.icon-toggle-down:before, +.icon-caret-square-o-down:before { content: "\f150"; } -.icon-collapse-top:before { +.icon-toggle-up:before, +.icon-caret-square-o-up:before { content: "\f151"; } -.icon-expand:before { +.icon-toggle-right:before, +.icon-caret-square-o-right:before { content: "\f152"; } .icon-euro:before, @@ -1323,12 +1143,15 @@ a .icon-flip-vertical:before { .icon-inr:before { content: "\f156"; } +.icon-cny:before, +.icon-rmb:before, .icon-yen:before, .icon-jpy:before { content: "\f157"; } -.icon-renminbi:before, -.icon-cny:before { +.icon-ruble:before, +.icon-rouble:before, +.icon-rub:before { content: "\f158"; } .icon-won:before, @@ -1345,22 +1168,22 @@ a .icon-flip-vertical:before { .icon-file-text:before { content: "\f15c"; } -.icon-sort-by-alphabet:before { +.icon-sort-alpha-asc:before { content: "\f15d"; } -.icon-sort-by-alphabet-alt:before { +.icon-sort-alpha-desc:before { content: "\f15e"; } -.icon-sort-by-attributes:before { +.icon-sort-amount-asc:before { content: "\f160"; } -.icon-sort-by-attributes-alt:before { +.icon-sort-amount-desc:before { content: "\f161"; } -.icon-sort-by-order:before { +.icon-sort-numeric-asc:before { content: "\f162"; } -.icon-sort-by-order-alt:before { +.icon-sort-numeric-desc:before { content: "\f163"; } .icon-thumbs-up:before { @@ -1369,7 +1192,7 @@ a .icon-flip-vertical:before { .icon-thumbs-down:before { content: "\f165"; } -.icon-youtube-sign:before { +.icon-youtube-square:before { content: "\f166"; } .icon-youtube:before { @@ -1378,7 +1201,7 @@ a .icon-flip-vertical:before { .icon-xing:before { content: "\f168"; } -.icon-xing-sign:before { +.icon-xing-square:before { content: "\f169"; } .icon-youtube-play:before { @@ -1387,7 +1210,7 @@ a .icon-flip-vertical:before { .icon-dropbox:before { content: "\f16b"; } -.icon-stackexchange:before { +.icon-stack-overflow:before { content: "\f16c"; } .icon-instagram:before { @@ -1402,13 +1225,13 @@ a .icon-flip-vertical:before { .icon-bitbucket:before { content: "\f171"; } -.icon-bitbucket-sign:before { +.icon-bitbucket-square:before { content: "\f172"; } .icon-tumblr:before { content: "\f173"; } -.icon-tumblr-sign:before { +.icon-tumblr-square:before { content: "\f174"; } .icon-long-arrow-down:before { @@ -1456,10 +1279,10 @@ a .icon-flip-vertical:before { .icon-gittip:before { content: "\f184"; } -.icon-sun:before { +.icon-sun-o:before { content: "\f185"; } -.icon-moon:before { +.icon-moon-o:before { content: "\f186"; } .icon-archive:before { @@ -1477,3 +1300,390 @@ a .icon-flip-vertical:before { .icon-renren:before { content: "\f18b"; } +.icon-pagelines:before { + content: "\f18c"; +} +.icon-stack-exchange:before { + content: "\f18d"; +} +.icon-arrow-circle-o-right:before { + content: "\f18e"; +} +.icon-arrow-circle-o-left:before { + content: "\f190"; +} +.icon-toggle-left:before, +.icon-caret-square-o-left:before { + content: "\f191"; +} +.icon-dot-circle-o:before { + content: "\f192"; +} +.icon-wheelchair:before { + content: "\f193"; +} +.icon-vimeo-square:before { + content: "\f194"; +} +.icon-turkish-lira:before, +.icon-try:before { + content: "\f195"; +} +.icon-plus-square-o:before { + content: "\f196"; +} +.icon-space-shuttle:before { + content: "\f197"; +} +.icon-slack:before { + content: "\f198"; +} +.icon-envelope-square:before { + content: "\f199"; +} +.icon-wordpress:before { + content: "\f19a"; +} +.icon-openid:before { + content: "\f19b"; +} +.icon-institution:before, +.icon-bank:before, +.icon-university:before { + content: "\f19c"; +} +.icon-mortar-board:before, +.icon-graduation-cap:before { + content: "\f19d"; +} +.icon-yahoo:before { + content: "\f19e"; +} +.icon-google:before { + content: "\f1a0"; +} +.icon-reddit:before { + content: "\f1a1"; +} +.icon-reddit-square:before { + content: "\f1a2"; +} +.icon-stumbleupon-circle:before { + content: "\f1a3"; +} +.icon-stumbleupon:before { + content: "\f1a4"; +} +.icon-delicious:before { + content: "\f1a5"; +} +.icon-digg:before { + content: "\f1a6"; +} +.icon-pied-piper:before { + content: "\f1a7"; +} +.icon-pied-piper-alt:before { + content: "\f1a8"; +} +.icon-drupal:before { + content: "\f1a9"; +} +.icon-joomla:before { + content: "\f1aa"; +} +.icon-language:before { + content: "\f1ab"; +} +.icon-fax:before { + content: "\f1ac"; +} +.icon-building:before { + content: "\f1ad"; +} +.icon-child:before { + content: "\f1ae"; +} +.icon-paw:before { + content: "\f1b0"; +} +.icon-spoon:before { + content: "\f1b1"; +} +.icon-cube:before { + content: "\f1b2"; +} +.icon-cubes:before { + content: "\f1b3"; +} +.icon-behance:before { + content: "\f1b4"; +} +.icon-behance-square:before { + content: "\f1b5"; +} +.icon-steam:before { + content: "\f1b6"; +} +.icon-steam-square:before { + content: "\f1b7"; +} +.icon-recycle:before { + content: "\f1b8"; +} +.icon-automobile:before, +.icon-car:before { + content: "\f1b9"; +} +.icon-cab:before, +.icon-taxi:before { + content: "\f1ba"; +} +.icon-tree:before { + content: "\f1bb"; +} +.icon-spotify:before { + content: "\f1bc"; +} +.icon-deviantart:before { + content: "\f1bd"; +} +.icon-soundcloud:before { + content: "\f1be"; +} +.icon-database:before { + content: "\f1c0"; +} +.icon-file-pdf-o:before { + content: "\f1c1"; +} +.icon-file-word-o:before { + content: "\f1c2"; +} +.icon-file-excel-o:before { + content: "\f1c3"; +} +.icon-file-powerpoint-o:before { + content: "\f1c4"; +} +.icon-file-photo-o:before, +.icon-file-picture-o:before, +.icon-file-image-o:before { + content: "\f1c5"; +} +.icon-file-zip-o:before, +.icon-file-archive-o:before { + content: "\f1c6"; +} +.icon-file-sound-o:before, +.icon-file-audio-o:before { + content: "\f1c7"; +} +.icon-file-movie-o:before, +.icon-file-video-o:before { + content: "\f1c8"; +} +.icon-file-code-o:before { + content: "\f1c9"; +} +.icon-vine:before { + content: "\f1ca"; +} +.icon-codepen:before { + content: "\f1cb"; +} +.icon-jsfiddle:before { + content: "\f1cc"; +} +.icon-life-bouy:before, +.icon-life-buoy:before, +.icon-life-saver:before, +.icon-support:before, +.icon-life-ring:before { + content: "\f1cd"; +} +.icon-circle-o-notch:before { + content: "\f1ce"; +} +.icon-ra:before, +.icon-rebel:before { + content: "\f1d0"; +} +.icon-ge:before, +.icon-empire:before { + content: "\f1d1"; +} +.icon-git-square:before { + content: "\f1d2"; +} +.icon-git:before { + content: "\f1d3"; +} +.icon-hacker-news:before { + content: "\f1d4"; +} +.icon-tencent-weibo:before { + content: "\f1d5"; +} +.icon-qq:before { + content: "\f1d6"; +} +.icon-wechat:before, +.icon-weixin:before { + content: "\f1d7"; +} +.icon-send:before, +.icon-paper-plane:before { + content: "\f1d8"; +} +.icon-send-o:before, +.icon-paper-plane-o:before { + content: "\f1d9"; +} +.icon-history:before { + content: "\f1da"; +} +.icon-circle-thin:before { + content: "\f1db"; +} +.icon-header:before { + content: "\f1dc"; +} +.icon-paragraph:before { + content: "\f1dd"; +} +.icon-sliders:before { + content: "\f1de"; +} +.icon-share-alt:before { + content: "\f1e0"; +} +.icon-share-alt-square:before { + content: "\f1e1"; +} +.icon-bomb:before { + content: "\f1e2"; +} +.icon-soccer-ball-o:before, +.icon-futbol-o:before { + content: "\f1e3"; +} +.icon-tty:before { + content: "\f1e4"; +} +.icon-binoculars:before { + content: "\f1e5"; +} +.icon-plug:before { + content: "\f1e6"; +} +.icon-slideshare:before { + content: "\f1e7"; +} +.icon-twitch:before { + content: "\f1e8"; +} +.icon-yelp:before { + content: "\f1e9"; +} +.icon-newspaper-o:before { + content: "\f1ea"; +} +.icon-wifi:before { + content: "\f1eb"; +} +.icon-calculator:before { + content: "\f1ec"; +} +.icon-paypal:before { + content: "\f1ed"; +} +.icon-google-wallet:before { + content: "\f1ee"; +} +.icon-cc-visa:before { + content: "\f1f0"; +} +.icon-cc-mastercard:before { + content: "\f1f1"; +} +.icon-cc-discover:before { + content: "\f1f2"; +} +.icon-cc-amex:before { + content: "\f1f3"; +} +.icon-cc-paypal:before { + content: "\f1f4"; +} +.icon-cc-stripe:before { + content: "\f1f5"; +} +.icon-bell-slash:before { + content: "\f1f6"; +} +.icon-bell-slash-o:before { + content: "\f1f7"; +} +.icon-trash:before { + content: "\f1f8"; +} +.icon-copyright:before { + content: "\f1f9"; +} +.icon-at:before { + content: "\f1fa"; +} +.icon-eyedropper:before { + content: "\f1fb"; +} +.icon-paint-brush:before { + content: "\f1fc"; +} +.icon-birthday-cake:before { + content: "\f1fd"; +} +.icon-area-chart:before { + content: "\f1fe"; +} +.icon-pie-chart:before { + content: "\f200"; +} +.icon-line-chart:before { + content: "\f201"; +} +.icon-lastfm:before { + content: "\f202"; +} +.icon-lastfm-square:before { + content: "\f203"; +} +.icon-toggle-off:before { + content: "\f204"; +} +.icon-toggle-on:before { + content: "\f205"; +} +.icon-bicycle:before { + content: "\f206"; +} +.icon-bus:before { + content: "\f207"; +} +.icon-ioxhost:before { + content: "\f208"; +} +.icon-angellist:before { + content: "\f209"; +} +.icon-cc:before { + content: "\f20a"; +} +.icon-shekel:before, +.icon-sheqel:before, +.icon-ils:before { + content: "\f20b"; +} +.icon-meanpath:before { + content: "\f20c"; +} diff --git a/common/static/fonts/vendor/FontAwesome.otf b/common/static/fonts/vendor/FontAwesome.otf index 70125459f7d5..81c9ad949b47 100644 Binary files a/common/static/fonts/vendor/FontAwesome.otf and b/common/static/fonts/vendor/FontAwesome.otf differ diff --git a/common/static/fonts/vendor/fontawesome-webfont.eot b/common/static/fonts/vendor/fontawesome-webfont.eot old mode 100755 new mode 100644 index 0662cb96bfb7..84677bc0c5f3 Binary files a/common/static/fonts/vendor/fontawesome-webfont.eot and b/common/static/fonts/vendor/fontawesome-webfont.eot differ diff --git a/common/static/fonts/vendor/fontawesome-webfont.svg b/common/static/fonts/vendor/fontawesome-webfont.svg old mode 100755 new mode 100644 index 2edb4ec34cbc..d907b25ae60e --- a/common/static/fonts/vendor/fontawesome-webfont.svg +++ b/common/static/fonts/vendor/fontawesome-webfont.svg @@ -14,10 +14,11 @@ + - + - + @@ -30,7 +31,7 @@ - + @@ -52,7 +53,7 @@ - + @@ -77,11 +78,11 @@ - - - - - + + + + + @@ -109,8 +110,8 @@ - - + + @@ -143,17 +144,17 @@ - - + + - + - + @@ -176,14 +177,14 @@ - + - + @@ -218,8 +219,8 @@ - - + + @@ -247,10 +248,10 @@ - + - + @@ -280,8 +281,8 @@ - - + + @@ -310,7 +311,7 @@ - + @@ -342,11 +343,11 @@ - + - - + + @@ -367,8 +368,8 @@ - - + + @@ -379,7 +380,7 @@ - + @@ -390,10 +391,130 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/static/fonts/vendor/fontawesome-webfont.ttf b/common/static/fonts/vendor/fontawesome-webfont.ttf old mode 100755 new mode 100644 index d3659246915c..96a3639cdde5 Binary files a/common/static/fonts/vendor/fontawesome-webfont.ttf and b/common/static/fonts/vendor/fontawesome-webfont.ttf differ diff --git a/common/static/fonts/vendor/fontawesome-webfont.woff b/common/static/fonts/vendor/fontawesome-webfont.woff old mode 100755 new mode 100644 index b9bd17e158d8..628b6a52a87e Binary files a/common/static/fonts/vendor/fontawesome-webfont.woff and b/common/static/fonts/vendor/fontawesome-webfont.woff differ diff --git a/lms/static/coffee/src/instructor_dashboard/membership.coffee b/lms/static/coffee/src/instructor_dashboard/membership.coffee index 132ae7e1d049..40e649a4294d 100644 --- a/lms/static/coffee/src/instructor_dashboard/membership.coffee +++ b/lms/static/coffee/src/instructor_dashboard/membership.coffee @@ -117,7 +117,7 @@ class AuthListWidget extends MemberListWidget # create revoke button and insert it into the row label_trans = gettext("Revoke access") - $revoke_btn = $ _.template('
        <%= label %>
        ', {label: label_trans}), + $revoke_btn = $ _.template('
        <%= label %>
        ', {label: label_trans}), class: 'revoke' $revoke_btn.click => @modify_member_access member.email, 'revoke', (error) => diff --git a/lms/static/sass/base/_mixins.scss b/lms/static/sass/base/_mixins.scss index 0cbca4715283..22c36dcfce24 100644 --- a/lms/static/sass/base/_mixins.scss +++ b/lms/static/sass/base/_mixins.scss @@ -164,3 +164,20 @@ white-space: nowrap; text-overflow: ellipsis; } + +// border control +%no-border-top { + border-top: none; +} + +%no-border-bottom { + border-bottom: none; +} + +%no-border-left { + border-left: none; +} + +%no-border-right { + border-right: none; +} \ No newline at end of file diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/course.scss.mako index eb35050fe9b0..a1362fb53991 100644 --- a/lms/static/sass/course.scss.mako +++ b/lms/static/sass/course.scss.mako @@ -75,3 +75,6 @@ // discussion @import "course/discussion/form-wmd-toolbar"; + +// views +@import "views/student-notes"; \ No newline at end of file diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index 549993a119b7..3dc268f4ee50 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -289,7 +289,7 @@ section.wiki { } .icon-changes, - .icon-time { + .icon-clock-o { background-position: -25px -49px; } @@ -337,7 +337,7 @@ section.wiki { } .icon-changes, - .icon-time { + .icon-clock-o { background-position: 0 -49px; } diff --git a/lms/static/sass/discussion/elements/_navigation.scss b/lms/static/sass/discussion/elements/_navigation.scss index 48b18d8a0f66..1aa8d3c1cccd 100644 --- a/lms/static/sass/discussion/elements/_navigation.scss +++ b/lms/static/sass/discussion/elements/_navigation.scss @@ -213,7 +213,7 @@ color: $gray-l2; } - .icon-ok { + .icon-check { color: $forum-color-marked-answer; } diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss new file mode 100644 index 000000000000..cc7090b6639c --- /dev/null +++ b/lms/static/sass/views/_student-notes.scss @@ -0,0 +1,249 @@ +.wrapper-student-notes { + + .info-wrapper { + @include clearfix(); + padding-bottom: $baseline; + + .updates { + @include clearfix(); + width: 100%; + + .title-search-container { + border-bottom: 1px solid $gray-l4; + margin-bottom: $baseline; + + .wrapper-title { + display: inline-block; + width: flex-grid(7,12); + + .page-title { + font-weight: $font-light; + + .page-subtitle { + @include line-height(18); + @extend %t-title6; + display: block; + } + } + } + + .wrapper-notes-search { + display: inline-block; + width: flex-grid(5,12); + text-align: right; + + .search-notes-input { + width: 55%; + padding: 5px; + } + } + } + } + + .note { + @include clearfix(); + margin: 0; + padding: ($baseline*1.5) 0; + border-top: 1px solid $gray-l4; + border-bottom: none; + + .wrapper-note-excerpts { + display: inline-block; + width: flex-grid(9, 12); + + .note-excerpt { + display: inline-block; + vertical-align: top; + background: $m-blue-l4; + + .note-excerpt-p, + .note-excerpt-ul, + .note-excerpt-ol { + @extend %t-copy-base; + position: relative; + padding: $baseline ($baseline*4) $baseline ($baseline*4); + } + } + + .note-excerpt > .note-excerpt-p:before, + .note-excerpt > .note-excerpt-ul:before, + .note-excerpt > .note-excerpt-ol:before, + .note-excerpt > .note-excerpt-p:after, + .note-excerpt > .note-excerpt-ul:after, + .note-excerpt > .note-excerpt-ol:after { + @extend %t-title3; + display: block; + position: absolute; + height: 40px; + width: 40px; + font-family: "FontAwesome"; + // color: $gray-l4; + color: $white; + } + + .note-excerpt > .note-excerpt-p:before, + .note-excerpt > .note-excerpt-ul:before, + .note-excerpt > .note-excerpt-ol:before { + content: "\f10d"; + top: $baseline; + left: $baseline; + } + + .note-excerpt > .note-excerpt-p:after, + .note-excerpt > .note-excerpt-ul:after, + .note-excerpt > .note-excerpt-ol:after { + content: "\f10e"; + bottom: $baseline; + right: $baseline; + } + + .note-comments { + position: relative; + margin: 0; + padding: 0; + list-style: none; + // background: $m-blue-l4; + + .note-comment { + padding: ($baseline/2) $baseline; + border-bottom: 2px solid $white; + + .note-comment-p, + .note-comment-ul, + .note-comment-ol { + @extend %t-weight4; + padding: 0; + margin: 0; + background: transparent; + } + + .note-comment-ul, + .note-comment-ol { + padding: auto; + margin: auto; + } + } + } + + .note-comments:before { + @extend %t-title4; + display: block; + position: absolute; + top: -14px; + left: 20px; + height: 24px; + width: 24px; + font-family: "FontAwesome"; + line-height: 20px; + content: "\f0d8"; + // color: $m-blue-l4; + color: $white; + } + } + + .reference { + @extend %t-copy-sub1; + display: inline-block; + width: flex-grid(3, 12); + vertical-align: top; + + .wrapper-reference-content { + padding: 0 $baseline; + color: $gray-l2; + + .reference-title { + @extend %t-copy-sub1; + margin-top: $baseline; + text-transform: uppercase; + font-weight: $font-regular; + letter-spacing: 1px; + color: $gray-l2; + } + + .reference-title:first-child { + margin-top: 0; + } + + .reference-meta { + font-weight: $font-regular; + color: $m-gray-d2; + } + + a.reference-meta { + color: $link-color; + + &:hover, + &:focus { + color: $link-hover; + } + } + } + } + } + + .note-group { + padding-top: ($baseline*1.5); + border-top: 1px solid $gray-l4; + + .group-lecture { + border-bottom: 2px solid $gray-l4; + padding-bottom: $baseline; + text-transform: uppercase; + letter-spacing: 1px; + + .course-subtitle { + @extend %t-copy-sub1; + display: block; + font-weight: $font-light; + color: inherit; + } + } + } + + .note:first-child { + @extend %no-border-top; + } + } +} + +.wrapper-tabs { + + .tab-list { + @include clearfix(); + + .tabs-label { + @extend %t-copy-base; + @include line-height(14); + display: inline; + margin-bottom: 0; + padding: ($baseline/2) $baseline; + padding-left: 0; + font-weight: $font-bold; + } + + .tabs { + @include clearfix(); + display: inline; + margin: 0; + padding: 0; + list-style: none; + + .tab { + display: inline; + + .tab-label { + display: inline-block; + padding: ($baseline/2) $baseline; + } + + &.is-active { + + .tab-label { + color: $gray-d3; + border-bottom: ($baseline/5) solid $gray-d3; + } + } + } + } + } +} \ No newline at end of file diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 0859f2247b7b..3c73fdec9785 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -308,7 +308,7 @@

      • ${_("Estimated Effort")}

        ${get_course_about_section(course, "effort")}
        • % endif - ##

      • ${_('Course Length')}

        ${_('{number} weeks').format(number=15)}
        • + ##

      • ${_('Course Length')}

        ${_('{number} weeks').format(number=15)}
        • % if get_course_about_section(course, "prerequisites"):

      • ${_("Prerequisites")}

        ${get_course_about_section(course, "prerequisites")}
        • diff --git a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html index ae56569a2623..a7f99ae9da17 100644 --- a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html +++ b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html @@ -80,7 +80,7 @@

        ${_("Your re-verification failed")}

        % endfor
        - +

    diff --git a/lms/templates/dashboard/_dashboard_reverification_sidebar.html b/lms/templates/dashboard/_dashboard_reverification_sidebar.html index 85867e305d3d..0c3bfe203dfd 100644 --- a/lms/templates/dashboard/_dashboard_reverification_sidebar.html +++ b/lms/templates/dashboard/_dashboard_reverification_sidebar.html @@ -23,13 +23,13 @@ % if reverifications["denied"]: % for item in reverifications["denied"]: -
  • ${_('Denied:')} ${item.course_name}
    • +
  • ${_('Denied:')} ${item.course_name}
    • % endfor %endif % if reverifications["approved"]: % for item in reverifications["approved"]: -
  • ${_('Approved:')} ${item.course_name}
    • +
  • ${_('Approved:')} ${item.course_name}
    • % endfor %endif diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index 1e36c0fc9b9a..3149fee22750 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -215,7 +215,7 @@

    ${_("Editing comment")}

    icon_class = "icon-comments"; sr_text = "{discussion}"; }} else if (endorsed) {{ - icon_class = "icon-ok"; + icon_class = "icon-check-square-o"; sr_text = "{answered_question}"; }} else {{ icon_class = "icon-question"; diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html index e938ad4a335b..2cb25dddd1c8 100644 --- a/lms/templates/shoppingcart/shopping_cart.html +++ b/lms/templates/shoppingcart/shopping_cart.html @@ -59,7 +59,7 @@

    ${ course.display_name }${course.start_datetime_tex
    - +
    @@ -78,7 +78,7 @@

    ${ course.display_name }${course.start_datetime_tex % else:
    - ${_('code has been applied')} + ${_('code has been applied')}
    %endif diff --git a/lms/templates/shoppingcart/verified_cert_receipt.html b/lms/templates/shoppingcart/verified_cert_receipt.html index 2924d515c2a3..c10f08128ffc 100644 --- a/lms/templates/shoppingcart/verified_cert_receipt.html +++ b/lms/templates/shoppingcart/verified_cert_receipt.html @@ -65,7 +65,7 @@

    ${_("Your Progress")}

  • - + ${_("Current Step: ")}${_("Confirmation")}
    • diff --git a/lms/templates/ux/reference/student-notes-course.html b/lms/templates/ux/reference/student-notes-course.html new file mode 100644 index 000000000000..72c78a338029 --- /dev/null +++ b/lms/templates/ux/reference/student-notes-course.html @@ -0,0 +1,169 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> + +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> + +<%block name="pagetitle">Student Notes +<%block name="nav_skip">#instructor-dashboard-content + +<%block name="headextra"> + <%static:css group='style-course-vendor'/> + <%static:css group='style-vendor-tinymce-content'/> + <%static:css group='style-vendor-tinymce-skin'/> + <%static:css group='style-course'/> + + +
    + + +
    +
    +
    +
    +
    +

    Notes Highlights and personal notes you have made within this course

    +
    + +
    + +
    +
    + +
    +
    +

    View Notes By:

    + +
    + +
    +

    Course Structure

    + +
    +

    + Lecture 1 - Doing the Right Thing + The Queen Vs Dudley and Stephens (1884) +

    + +
    +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    +
    + +
    + +
    +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    +
    + +
    +
    + +
    +

    + Section Name That Contains Notes Is Placed Here + Subsection Name That's A Child of the Section Can Be Placed Here And Go On For Quite A While +

    + +
    +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    +
    + +
    + +
    +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/lms/templates/ux/reference/student-notes-recent.html b/lms/templates/ux/reference/student-notes-recent.html new file mode 100644 index 000000000000..981b02b0c905 --- /dev/null +++ b/lms/templates/ux/reference/student-notes-recent.html @@ -0,0 +1,106 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> + +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> + +<%block name="pagetitle">Student Notes +<%block name="nav_skip">#instructor-dashboard-content + +<%block name="headextra"> + <%static:css group='style-course-vendor'/> + <%static:css group='style-vendor-tinymce-content'/> + <%static:css group='style-vendor-tinymce-skin'/> + <%static:css group='style-course'/> + + +
    + + +
    +
    +
    +
    +
    +

    Notes Highlights and personal notes you have made within this course

    +
    + +
    + +
    +
    + +
    +
    +

    View Notes By:

    + +
    + +
    +

    Recent Activity

    + +
    +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    +
    + +
    + + + +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/lms/templates/ux/reference/student-notes.html b/lms/templates/ux/reference/student-notes.html new file mode 100644 index 000000000000..ced293f0ab55 --- /dev/null +++ b/lms/templates/ux/reference/student-notes.html @@ -0,0 +1,65 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> + +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> + +<%block name="pagetitle">Student Notes +<%block name="nav_skip">#instructor-dashboard-content + +<%block name="headextra"> + <%static:css group='style-course-vendor'/> + <%static:css group='style-vendor-tinymce-content'/> + <%static:css group='style-vendor-tinymce-skin'/> + <%static:css group='style-course'/> + + +
    + + +
    +
    +
    +
    +
    +

    Notes Highlights and personal notes you have made within this course

    +
    +
    + +
    +
    +

    You haven not made any notes in this course yet.

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    + +

    Other Students In This Course Are Using Notes To:

    +
      +
    • Add study notes to course content for exams and homework.
      • +
    • Highlight important concepts for later coursework or future courses
      • +
    • Donec id elit non mi porta gravida et eget metus.
      • +
    • Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
      • +
    + +
    +

    Start creating notes

    +

    Get started by making a note in something you just read, like Week 1: Introduction to Justice.

    +
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/lms/templates/verify_student/_modal_editname.html b/lms/templates/verify_student/_modal_editname.html index 93d39694712a..48a6e279e865 100644 --- a/lms/templates/verify_student/_modal_editname.html +++ b/lms/templates/verify_student/_modal_editname.html @@ -28,7 +28,7 @@

    ${_("Edit Your Name")}

    - + ${_("close")} diff --git a/lms/templates/verify_student/face_upload.html b/lms/templates/verify_student/face_upload.html index d2944589073c..3fbed3baf233 100644 --- a/lms/templates/verify_student/face_upload.html +++ b/lms/templates/verify_student/face_upload.html @@ -92,7 +92,7 @@

    Take Your Photo

    Take photo
  • - Looks good + Looks good
    • @@ -156,7 +156,7 @@

    Take Your Photo

    Take photo
  • - Looks good + Looks good
    • @@ -316,7 +316,7 @@

    ${_("Edit Your Full Name")}

    - + close diff --git a/lms/templates/verify_student/midcourse_photo_reverification.html b/lms/templates/verify_student/midcourse_photo_reverification.html index 177c7ca8ce78..4e2173e6e192 100644 --- a/lms/templates/verify_student/midcourse_photo_reverification.html +++ b/lms/templates/verify_student/midcourse_photo_reverification.html @@ -17,7 +17,7 @@