Skip to content

E
edx-platform
Commit c2507ddc by Brian Talbot
Options

Studio: revises class naming conventions applied to the <body> element and used… 

Studio: revises class naming conventions applied to the <body> element and used for view specific styling
parent ac23149f
Showing with 38 additions and 39 deletions
cms/static/sass/views/_account.scss
// studio - views - sign up/in // studio - views - sign up/in
// ==================== // ====================
body.signup, body.signin { .view-signup, .view-signin {
.wrapper-content { .wrapper-content {
margin: ($baseline*1.5) 0 0 0; margin: ($baseline*1.5) 0 0 0;
......
cms/static/sass/views/_assets.scss
// studio - views - assets // studio - views - assets
// ==================== // ====================
body.course.uploads { .view-uploads {
.content-primary, .content-supplementary { .content-primary, .content-supplementary {
@include box-sizing(border-box); @include box-sizing(border-box);
......
cms/static/sass/views/_checklists.scss
// Studio - Course Settings // Studio - Course Settings
// ==================== // ====================
body.course.checklists {
.view-checklists {
.content-primary, .content-supplementary { .content-primary, .content-supplementary {
@include box-sizing(border-box); @include box-sizing(border-box);
......
cms/static/sass/views/_dashboard.scss
// studio - views - user dashboard // studio - views - user dashboard
// ==================== // ====================
body.dashboard { .view-dashboard {
// temp // temp
.content { .content {
......
cms/static/sass/views/_export.scss
// studio - views - course export // studio - views - course export
// ==================== // ====================
body.course.export { .view-export {
.export-overview { .export-overview {
@extend %ui-window; @extend %ui-window;
......
cms/static/sass/views/_import.scss
// studio - views - course import // studio - views - course import
// ==================== // ====================
body.course.import { .view-import {
.import-overview { .import-overview {
@extend %ui-window; @extend %ui-window;
......
cms/static/sass/views/_index.scss
// studio - views - how it works // studio - views - how it works
// ==================== // ====================
body.index { .view-howitworks {
&.not-signedin { &.not-signedin {
......
cms/static/sass/views/_outline.scss
// studio - views - course outline // studio - views - course outline
// ==================== // ====================
body.course.outline { .view-outline {
input.courseware-unit-search-input { input.courseware-unit-search-input {
float: left; float: left;
......
cms/static/sass/views/_settings.scss
// studio - views - course settings // studio - views - course settings
// ==================== // ====================
body.course.settings { .view-settings {
.content-primary, .content-supplementary { .content-primary, .content-supplementary {
@include box-sizing(border-box); @include box-sizing(border-box);
......
cms/static/sass/views/_static-pages.scss
// studio - views - course static pages // studio - views - course static pages
// ==================== // ====================
body.course.static-pages { .view-static-pages {
.new-static-page-button { .new-static-page-button {
@include grey-button; @include grey-button;
......
cms/static/sass/views/_subsection.scss
// studio - views - course subsection // studio - views - course subsection
// ==================== // ====================
body.course.subsection { .view-subsection {
.main-wrapper { .main-wrapper {
margin-top: ($baseline*2); margin-top: ($baseline*2);
......
cms/static/sass/views/_textbooks.scss
// studio - views - textbooks // studio - views - textbooks
// ==================== // ====================
body.course.textbooks { .view-textbooks {
.content-primary, .content-supplementary { .content-primary, .content-supplementary {
@include box-sizing(border-box); @include box-sizing(border-box);
......
cms/static/sass/views/_unit.scss
// studio - views - unit // studio - views - unit
// ==================== // ====================
body.course.unit { .view-unit {
.main-wrapper { .main-wrapper {
margin-top: ($baseline*2); margin-top: ($baseline*2);
......
cms/static/sass/views/_updates.scss
// studio - views - course updates // studio - views - course updates
// ==================== // ====================
body.course.updates { .view-updates {
.course-info-wrapper { .course-info-wrapper {
display: table; display: table;
......
cms/static/sass/views/_users.scss
// studio - views - course users // studio - views - course users
// ==================== // ====================
body.course.users { .view-team {
// LAYOUT: page // LAYOUT: page
.content-primary, .content-supplementary { .content-primary, .content-supplementary {
......
cms/templates/asset_index.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%block name="title">${_("Files &amp; Uploads")}</%block> <%block name="title">${_("Files &amp; Uploads")}</%block>
<%block name="bodyclass">is-signedin course uploads</%block> <%block name="bodyclass">is-signedin course view-uploads</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
......
cms/templates/checklists.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Course Checklists</%block> <%block name="title">Course Checklists</%block>
<%block name="bodyclass">is-signedin course uxdesign checklists</%block> <%block name="bodyclass">is-signedin course view-checklists</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
......
cms/templates/course_info.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- TODO decode course # from context_course into title --> <!-- TODO decode course # from context_course into title -->
<%block name="title">${_("Course Updates")}</%block> <%block name="title">${_("Course Updates")}</%block>
<%block name="bodyclass">is-signedin course course-info updates</%block> <%block name="bodyclass">is-signedin course view-updates</%block>
<%block name="header_extras"> <%block name="header_extras">
% for template_name in ["course_info_update", "course_info_handouts"]: % for template_name in ["course_info_update", "course_info_handouts"]:
......
cms/templates/edit-tabs.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">Static Pages</%block> <%block name="title">Static Pages</%block>
<%block name="bodyclass">is-signedin course pages static-pages</%block> <%block name="bodyclass">is-signedin course view-static-pages</%block>
<%block name="jsextra"> <%block name="jsextra">
<script type='text/javascript'> <script type='text/javascript'>
......
cms/templates/edit_subsection.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<%block name="title">${_("CMS Subsection")}</%block> <%block name="title">${_("CMS Subsection")}</%block>
<%block name="bodyclass">is-signedin course subsection</%block> <%block name="bodyclass">is-signedin course view-subsection</%block>
<%namespace name="units" file="widgets/units.html" /> <%namespace name="units" file="widgets/units.html" />
......
cms/templates/export.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">${_("Course Export")}</%block> <%block name="title">${_("Course Export")}</%block>
<%block name="bodyclass">is-signedin course tools export</%block> <%block name="bodyclass">is-signedin course tools view-export</%block>
<%block name="jsextra"> <%block name="jsextra">
% if in_err: % if in_err:
......
cms/templates/howitworks.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">${_("Welcome")}</%block> <%block name="title">${_("Welcome")}</%block>
<%block name="bodyclass">not-signedin index howitworks</%block> <%block name="bodyclass">not-signedin index view-howitworks</%block>
<%block name="content"> <%block name="content">
......
cms/templates/import.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">${_("Course Import")}</%block> <%block name="title">${_("Course Import")}</%block>
<%block name="bodyclass">is-signedin course tools import</%block> <%block name="bodyclass">is-signedin course tools view-import</%block>
<%block name="content"> <%block name="content">
<div class="wrapper-mast wrapper"> <div class="wrapper-mast wrapper">
...@@ -82,7 +82,7 @@ $('#fileupload').fileupload({ ...@@ -82,7 +82,7 @@ $('#fileupload').fileupload({
alert('${_("Your import has failed.")}\n\n' + errMsg); alert('${_("Your import has failed.")}\n\n' + errMsg);
submitBtn.show(); submitBtn.show();
bar.hide(); bar.hide();
} }
}); });
}); });
} else { } else {
......
cms/templates/index.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">${_("My Courses")}</%block> <%block name="title">${_("My Courses")}</%block>
<%block name="bodyclass">is-signedin index dashboard</%block> <%block name="bodyclass">is-signedin index view-dashboard</%block>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.js"></script>
<script src="http://malsup.github.com/jquery.form.js"></script> <script src="http://malsup.github.com/jquery.form.js"></script>
......
cms/templates/login.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">${_("Sign In")}</%block> <%block name="title">${_("Sign In")}</%block>
<%block name="bodyclass">not-signedin signin</%block> <%block name="bodyclass">not-signedin view-signin</%block>
<%block name="content"> <%block name="content">
......
cms/templates/manage_users.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%! import json %> <%! import json %>
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">${_("Course Team Settings")}</%block> <%block name="title">${_("Course Team Settings")}</%block>
<%block name="bodyclass">is-signedin course users team</%block> <%block name="bodyclass">is-signedin course users view-team</%block>
<%block name="content"> <%block name="content">
......
cms/templates/overview.html
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<%block name="title">${_("Course Outline")}</%block> <%block name="title">${_("Course Outline")}</%block>
<%block name="bodyclass">is-signedin course outline</%block> <%block name="bodyclass">is-signedin course view-outline</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%namespace name="units" file="widgets/units.html" /> <%namespace name="units" file="widgets/units.html" />
......
cms/templates/registration/activation_complete.html
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
<%namespace name='static' file='../static_content.html'/> <%namespace name='static' file='../static_content.html'/>
%if not user_logged_in: %if not user_logged_in:
<%block name="bodyclass"> <%block name="bodyclass">not-signedin view-activation</%block>
not-signedin
</%block>
%endif %endif
<%block name="content"> <%block name="content">
......
cms/templates/settings.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">${_("Schedule &amp; Details Settings")}</%block> <%block name="title">${_("Schedule &amp; Details Settings")}</%block>
<%block name="bodyclass">is-signedin course schedule settings feature-upload</%block> <%block name="bodyclass">is-signedin course schedule view-settings feature-upload</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%! <%!
......
cms/templates/settings_advanced.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%! from contentstore import utils %> <%! from contentstore import utils %>
<%block name="title">${_("Advanced Settings")}</%block> <%block name="title">${_("Advanced Settings")}</%block>
<%block name="bodyclass">is-signedin course advanced settings</%block> <%block name="bodyclass">is-signedin course advanced view-settings</%block>
<%block name="jsextra"> <%block name="jsextra">
% for template_name in ["advanced_entry"]: % for template_name in ["advanced_entry"]:
......
cms/templates/settings_discussions_faculty.html
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- NOTE not used currently but retained b/c it's yet-to-be-wired functionality --> <!-- NOTE not used currently but retained b/c it's yet-to-be-wired functionality -->
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">${_("Schedule and details")}</%block> <%block name="title">${_("Schedule and details")}</%block>
<%block name="bodyclass">is-signedin course settings</%block> <%block name="bodyclass">is-signedin course view-settings</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
......
cms/templates/settings_graders.html
<%inherit file="base.html" /> <%inherit file="base.html" />
<%block name="title">${_("Grading Settings")}</%block> <%block name="title">${_("Grading Settings")}</%block>
<%block name="bodyclass">is-signedin course grading settings</%block> <%block name="bodyclass">is-signedin course grading view-settings</%block>
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%! <%!
......
cms/templates/signup.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">${_("Sign Up")}</%block> <%block name="title">${_("Sign Up")}</%block>
<%block name="bodyclass">not-signedin signup</%block> <%block name="bodyclass">not-signedin view-signup</%block>
<%block name="content"> <%block name="content">
......
cms/templates/static-pages.html
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<%inherit file="base.html" /> <%inherit file="base.html" />
<%! from django.core.urlresolvers import reverse %> <%! from django.core.urlresolvers import reverse %>
<%block name="title">${_("Static Pages")}</%block> <%block name="title">${_("Static Pages")}</%block>
<%block name="bodyclass">static-pages</%block> <%block name="bodyclass">view-static-pages</%block>
<%block name="content"> <%block name="content">
<div class="main-wrapper"> <div class="main-wrapper">
<div class="inner-wrapper"> <div class="inner-wrapper">
<h1>Static Pages</h1> <h1>Static Pages</h1>
<div class="page-actions"> <div class="page-actions">
</div> </div>
<article class="static-page-overview"> <article class="static-page-overview">
<a href="#" class="new-static-page-button wip-box"><span class="plus-icon"></span> ${_("New Static Page")}</a> <a href="#" class="new-static-page-button wip-box"><span class="plus-icon"></span> ${_("New Static Page")}</a>
......
cms/templates/textbooks.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%! from django.utils.translation import ugettext as _ %> <%! from django.utils.translation import ugettext as _ %>
<%block name="title">${_("Textbooks")}</%block> <%block name="title">${_("Textbooks")}</%block>
<%block name="bodyclass">is-signedin course textbooks feature-upload</%block> <%block name="bodyclass">is-signedin course view-textbooks feature-upload</%block>
<%block name="header_extras"> <%block name="header_extras">
% for template_name in ["edit-textbook", "show-textbook", "edit-chapter", "no-textbooks", "upload-dialog"]: % for template_name in ["edit-textbook", "show-textbook", "edit-chapter", "no-textbooks", "upload-dialog"]:
......
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