Skip to content

E
edx-platform
Commit 3ad81949 by Kyle Fiedler
Options

Added styles to be more consistant across pages

parent d2d3b203
Showing with 227 additions and 236 deletions
cms/static/sass/_module-header.scss deleted 100644 → 0
section.video-new,
section.video-edit,
section.problem-new,
section.problem-edit,
section.html-edit {
background: #fff;
border: 1px solid #333;
border-right: 0;
> header {
background: #eee;
@include clearfix;
padding: 6px;
border-bottom: 1px solid #333;
-webkit-font-smoothing: antialiased;
h2 {
float: left;
font-size: 14px;
}
a {
color: #fff;
&.save-update {
float: right;
}
&.cancel {
float: left;
}
}
}
> section {
padding: 20px;
> header {
h1 {
font-size: 24px;
margin: 12px 0;
}
section {
&.status-settings {
ul {
list-style: none;
@include border-radius(2px);
border: 1px solid #999;
@include inline-block();
li {
@include inline-block();
border-right: 1px solid #999;
padding: 6px;
&:last-child {
border-right: 0;
}
&.current {
background: #eee;
}
}
}
a.settings {
@include inline-block();
margin: 0 20px;
border: 1px solid #999;
padding: 6px;
}
select {
float: right;
}
}
&.meta {
background: #eee;
padding: 10px;
margin: 20px 0;
@include clearfix();
div {
float: left;
margin-right: 20px;
h2 {
font-size: 14px;
@include inline-block();
}
p {
@include inline-block();
}
}
}
}
}
section.notes {
margin-top: 20px;
padding: 6px;
background: #eee;
border: 1px solid #ccc;
textarea {
@include box-sizing(border-box);
display: block;
width: 100%;
}
h2 {
font-size: 14px;
margin-bottom: 6px;
}
input[type="submit"]{
margin-top: 10px;
}
}
}
}
cms/static/sass/_problem.scss
...@@ -4,37 +4,118 @@ section#unit-wrapper { ...@@ -4,37 +4,118 @@ section#unit-wrapper {
@include clearfix(); @include clearfix();
padding: 6px 20px; padding: 6px 20px;
section {
float: left;
h1 { h1 {
font-size: 18px; font-size: 16px;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 1px; letter-spacing: 1px;
float: left; @include inline-block();
} }
p { p {
@include inline-block();
margin-left: 10px;
color: #999;
font-size: 12px;
font-style: italic;
}
}
div {
float: right; float: right;
color: #666;
} }
} }
> section { > section {
padding: 20px; padding: 20px;
a.save-update {
@extend .button; section.meta {
section {
&.status-settings {
float: left;
margin-bottom: 10px;
ul {
list-style: none;
@include border-radius(2px);
border: 1px solid #999;
@include inline-block(); @include inline-block();
margin-top: 20px;
li {
@include inline-block();
border-right: 1px solid #999;
padding: 6px;
&:last-child {
border-right: 0;
}
&.current {
background: #eee;
}
} }
} }
}
section.problem-new, a.settings {
section.problem-edit, @include inline-block();
section.html-edit { margin: 0 20px;
border: 1px solid #999;
padding: 6px;
}
select {
float: right;
}
}
&.author {
float: right;
dl {
dt {
font-weight: bold;
}
dd, dt {
@include inline-block();
}
}
}
&.tags {
background: #eee;
padding: 10px;
margin: 0 0 20px;
@include clearfix();
clear: both;
div {
float: left;
margin-right: 20px;
h2 {
font-size: 14px;
@include inline-block();
}
p {
@include inline-block();
}
}
}
}
}
//general styles for main content
textarea { textarea {
@include box-sizing(border-box); @include box-sizing(border-box);
display: block; display: block;
width: 100%; width: 100%;
} }
div.preview { div.preview {
background: #eee; background: #eee;
@include box-sizing(border-box); @include box-sizing(border-box);
...@@ -67,5 +148,56 @@ section.html-edit { ...@@ -67,5 +148,56 @@ section.html-edit {
margin-bottom: 1em; margin-bottom: 1em;
} }
} }
}
//notes
section.notes {
margin-top: 20px;
padding: 20px 0 0;
border-top: 1px solid #ccc;
h2 {
font-size: 14px;
margin-bottom: 6px;
}
form {
margin-bottom: 20px;
textarea {
@include box-sizing(border-box);
display: block;
width: 100%;
}
input[type="submit"]{
margin-top: 10px;
}
}
ul {
list-style: none;
li {
margin-bottom: 20px;
p {
margin-bottom: 10px;
&.author {
font-style: italic;
color: #999;
}
}
}
}
}
div.actions {
a.save-update {
@extend .button;
@include inline-block();
margin-top: 20px;
}
}
}
}
cms/static/sass/_week.scss
...@@ -6,47 +6,6 @@ section.sequence-edit { ...@@ -6,47 +6,6 @@ section.sequence-edit {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
@include clearfix(); @include clearfix();
div {
@include clearfix();
padding: 6px 20px;
h1 {
font-size: 18px;
text-transform: uppercase;
letter-spacing: 1px;
float: left;
}
p {
float: right;
}
&.week {
background: #eee;
font-size: 12px;
border-bottom: 1px solid #ccc;
h2 {
font-size: 12px;
@include inline-block();
margin-right: 20px;
}
ul {
list-style: none;
@include inline-block();
li {
@include inline-block();
margin-right: 10px;
p {
float: none;
}
}
}
}
}
section.goals { section.goals {
background: #eee; background: #eee;
...@@ -68,10 +27,6 @@ section.sequence-edit { ...@@ -68,10 +27,6 @@ section.sequence-edit {
} }
} }
> section.content {
@include box-sizing(border-box);
padding: 20px;
section.filters { section.filters {
@include clearfix; @include clearfix;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -252,5 +207,4 @@ section.sequence-edit { ...@@ -252,5 +207,4 @@ section.sequence-edit {
} }
} }
} }
}
} }
cms/static/sass/base-style.scss
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
@import 'base'; @import 'base';
@import 'calendar'; @import 'calendar';
@import 'week', 'video', 'problem', 'module-header'; @import 'week', 'video', 'problem';
cms/templates/unit.html
<section id="unit-wrapper" class="${type}"> <section id="unit-wrapper" class="${type}">
<header> <header>
<h1 class="editable">${name}</h1>
<p>Unit type: ${type}</p>
<!-- <div class="actions"> -->
<!-- <a href="#" class="cancel">Cancel</a> -->
<!-- <a href="#" class="save-update">Save &amp; Update</a> -->
<!-- </div> -->
</header>
<section> <section>
${contents} <h1 class="editable">${name}</h1>
<p>${type}</p>
</section> </section>
<section>
<div class="actions"> <div class="actions">
<a href="" class="save-update">Save &amp; Update</a> <a href="" class="save-update">Save &amp; Update</a>
<a href="#" class="cancel">Cancel</a> <a href="#" class="cancel">Cancel</a>
</div> </div>
</header>
<section>
${contents}
</section> </section>
</section> </section>
cms/templates/widgets/html-edit.html
<section class="html-edit"> <section class="html-edit">
<section class="meta">
<section class="status-settings">
<ul>
<li><a href="#" class="current">Scrap</a></li>
<li><a href="#">Draft</a></li>
<li><a href="#">Proofed</a></li>
<li><a href="#">Published</a></li>
</ul>
<a href="#" class="settings">Settings</a>
</section>
<section class="author">
<dl>
<dt>Last modified:</dt>
<dd>mm/dd/yy</dd>
<dt>By</dt>
<dd>Anant Agarwal</dd>
</dl>
</section>
<section class="tags">
<div>
<h2>Tags:</h2>
<p class="editable">Click to edit</p>
</div>
<div>
<h2>Goal</h2>
<p class="editable">Click to edit</p>
</div>
</section>
</section>
<textarea name="" class="edit-box" rows="8" cols="40">${module.definition['data']['text']}</textarea> <textarea name="" class="edit-box" rows="8" cols="40">${module.definition['data']['text']}</textarea>
<div class="preview">${module.definition['data']['text']}</div> <div class="preview">${module.definition['data']['text']}</div>
<div class="actions">
<a href="" class="save-update">Save &amp; Update</a>
<a href="#" class="cancel">Cancel</a>
</div>
<section class="notes">
<h2>Add notes</h2>
<form>
<textarea name="" id= rows="8" cols="40"></textarea>
<input type="submit" name="" id="" value="post" />
</form>
<ul>
<li>
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
<p class="author">Anant Agarwal</p>
</li>
<li>
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
<p class="author">Anant Agarwal</p>
</li>
</ul>
</section>
</section> </section>
cms/templates/widgets/problem-edit.html
<section class="problem-edit"> <section class="problem-edit">
<header> <section class="meta">
<a href="#" class="cancel">Cancel</a>
<a href="#" class="save-update">Save &amp; Update</a>
</header>
<section>
<header>
<h1 class="editable">${module.name}</h1>
<section class="author">
<div>
<h2>Last modified:</h2>
<p>mm/dd/yy</p>
</div>
<div>
<h2>By</h2>
<p>Anant Agarwal</p>
</div>
</section>
<section class="status-settings"> <section class="status-settings">
<ul> <ul>
<li><a href="#" class="current">Scrap</a></li> <li><a href="#" class="current">Scrap</a></li>
...@@ -27,12 +8,18 @@ ...@@ -27,12 +8,18 @@
<li><a href="#">Published</a></li> <li><a href="#">Published</a></li>
</ul> </ul>
<a href="#" class="settings">Settings</a> <a href="#" class="settings">Settings</a>
</section>
<select name="" id=""> <section class="author">
<option>Global</option> <dl>
</select> <dt>Last modified:</dt>
<dd>mm/dd/yy</dd>
<dt>By</dt>
<dd>Anant Agarwal</dd>
</dl>
</section> </section>
<section class="meta">
<section class="tags">
<div> <div>
<h2>Tags:</h2> <h2>Tags:</h2>
<p class="editable">Click to edit</p> <p class="editable">Click to edit</p>
...@@ -43,7 +30,7 @@ ...@@ -43,7 +30,7 @@
<p class="editable">Click to edit</p> <p class="editable">Click to edit</p>
</div> </div>
</section> </section>
</header> </section>
<section> <section>
<textarea name="" id= rows="8" cols="40">Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</textarea> <textarea name="" id= rows="8" cols="40">Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</textarea>
...@@ -54,8 +41,10 @@ ...@@ -54,8 +41,10 @@
<section class="notes"> <section class="notes">
<h2>Add notes</h2> <h2>Add notes</h2>
<form>
<textarea name="" id= rows="8" cols="40"></textarea> <textarea name="" id= rows="8" cols="40"></textarea>
<input type="submit" name="" id="" value="post" /> <input type="submit" name="" id="" value="post" />
</form>
<ul> <ul>
<li> <li>
...@@ -66,8 +55,7 @@ ...@@ -66,8 +55,7 @@
<p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p> <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
<p class="author">Anant Agarwal</p> <p class="author">Anant Agarwal</p>
</li> </li>
</ul> </section> </ul>
<a href="" class="save-update">Save &amp; Update</a>
</section> </section>
</section> </section>
cms/templates/widgets/sequence-edit.html
<section class="sequence-edit"> <section class="sequence-edit">
<header>
<div>
<h1 class="editable">${module.name}</h1>
<p><strong>Module Type:</strong>${module.type}</p>
</div>
</header>
<section class="content">
<section class="filters"> <section class="filters">
<ul> <ul>
<li> <li>
...@@ -52,14 +44,14 @@ ...@@ -52,14 +44,14 @@
</ol> </ol>
</li> </li>
<!-- <li class="new-module"> -->
<!-- <%include file="new-module.html"/> -->
<!-- </li> -->
</ol> </ol>
</section> </section>
<section class="scratch-pad"> <section class="scratch-pad">
<ol> <ol>
<li class="new-module">
<%include file="new-module.html"/>
</li>
<li> <li>
<header> <header>
<h2>Section Scratch</h2> <h2>Section Scratch</h2>
...@@ -107,13 +99,8 @@ ...@@ -107,13 +99,8 @@
</li> </li>
</ul> </ul>
</li> </li>
<!-- <li class="new-module"> -->
<!-- <%include file="new-module.html"/> -->
<!-- </li> -->
</ol> </ol>
</section> </section>
</div> </div>
</section>
</section> </section>
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