Skip to content

E
edx-platform
Commit f2aa6236 by Kyle Fiedler
Options

Continued on week view styles

parent a687a1c2
Showing with 348 additions and 247 deletions
cms/static/js/main.js
...@@ -31,29 +31,28 @@ $(document).ready(function(){ ...@@ -31,29 +31,28 @@ $(document).ready(function(){
setHeight = function(){ setHeight = function(){
var windowHeight = $(this).height(); var windowHeight = $(this).height();
var calHeight = windowHeight - 29; var contentHeight = windowHeight - 29;
var sidebarHeight = windowHeight - 73;
$('.sidebar').css('height', sidebarHeight); $('section.main-content > section').css('min-height', contentHeight);
$('body.content .cal').css('height', calHeight); $('body.content .cal').css('height', contentHeight);
$('.edit-week').click( function() { $('.edit-week').click( function() {
$('body').addClass('content'); $('body').addClass('content');
$('body.content .cal').css('height', calHeight); $('body.content .cal').css('height', contentHeight);
$('section.week-new').show(); $('section.week-new').show();
return false; return false;
}); });
$('.cal ol li header h1 a').click( function() { $('.cal ol li header h1 a').click( function() {
$('body').addClass('content'); $('body').addClass('content');
$('body.content .cal').css('height', calHeight); $('body.content .cal').css('height', contentHeight);
$('section.week-edit').show(); $('section.week-edit').show();
return false; return false;
}); });
$('a.sequence-edit').click(function(){ $('a.sequence-edit').click(function(){
$('body').addClass('content'); $('body').addClass('content');
$('body.content .cal').css('height', calHeight); $('body.content .cal').css('height', contentHeight);
$('section.sequence-edit').show(); $('section.sequence-edit').show();
return false; return false;
}); });
......
cms/static/sass/_base.scss
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
$fg-column: 70px; $fg-column: 70px;
$fg-gutter: 26px; $fg-gutter: 26px;
$fg-max-columns: 12; $fg-max-columns: 12;
$body-font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
html { html {
height: 100%; height: 100%;
...@@ -10,7 +11,7 @@ html { ...@@ -10,7 +11,7 @@ html {
body { body {
@include clearfix(); @include clearfix();
height: 100%; height: 100%;
font: 14px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; font: 14px $body-font-family;
> section { > section {
display: table; display: table;
...@@ -57,6 +58,10 @@ a { ...@@ -57,6 +58,10 @@ a {
color: #888; color: #888;
} }
input {
font-family: $body-font-family;
}
input[type="submit"], .button { input[type="submit"], .button {
border: 1px solid #ccc; border: 1px solid #ccc;
background: #efefef; background: #efefef;
......
cms/static/sass/_calendar.scss
...@@ -2,7 +2,6 @@ section.cal { ...@@ -2,7 +2,6 @@ section.cal {
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 25px; padding: 25px;
@include clearfix; @include clearfix;
overflow: scroll;
> header { > header {
@include clearfix; @include clearfix;
...@@ -106,12 +105,22 @@ section.cal { ...@@ -106,12 +105,22 @@ section.cal {
display: none; display: none;
@include position(absolute, 30px 0 0 0); @include position(absolute, 30px 0 0 0);
width: 90%; width: 90%;
background: rgba(#000, .8); background: rgba(#000, .9);
padding: 10px; padding: 10px;
@include box-sizing(border-box); @include box-sizing(border-box);
@include border-radius(3px); @include border-radius(3px);
z-index: 99; z-index: 99;
&:before {
content: " ";
display: block;
background: rgba(#000, .8);
width: 10px;
height: 10px;
@include position(absolute, -5px 0 0 50%);
@include transform(rotate(45deg));
}
ul { ul {
li { li {
border-bottom: 0; border-bottom: 0;
...@@ -157,67 +166,67 @@ section.cal { ...@@ -157,67 +166,67 @@ section.cal {
section.new-section { section.new-section {
margin-top: 10px; margin-top: 10px;
@include inline-block();
position: relative;
> a { > a {
@extend .button; @extend .button;
@include inline-block(); display: block;
} }
section { section {
display: none; display: none;
@include position(absolute, 32px 0 0 0);
background: rgba(#000, .8);
min-width: 300px;
padding: 10px;
@include box-sizing(border-box);
@include border-radius(3px);
z-index: 99;
header { &:before {
background: #fff; content: " ";
text-align: left; display: block;
background: rgba(#000, .8);
width: 10px;
height: 10px;
@include position(absolute, -5px 0 0 20%);
@include transform(rotate(45deg));
} }
form { form {
background: #fff;
width: 50%;
padding: 6px;
border: 1px solid #000;
margin: 0 auto;
@include box-shadow(0 0 2px #333);
position: relative;
&:before {
background: #fff;
border-left: 1px solid #000;
border-top: 1px solid #000;
content: " ";
display: block;
height: 10px;
left: 50%;
position: absolute;
top: -6px;
@include transform(rotate(45deg));
width: 10px;
z-index: 0;
}
select { ul {
margin-bottom: 6px; list-style: none;
width: 100%;
option { li {
padding: 10px 0 !important; border-bottom: 0;
} background: none;
} margin-bottom: 6px;
input[type="submit"] { input {
display: block; width: 100%;
margin-bottom: 6px; @include box-sizing(border-box);
width: 100%; border-color: #000;
} padding: 6px;
}
a { select {
width: 100%;
@include box-sizing(border-box);
&:first-child { option {
float: left; font-size: 14px;
} }
}
&:last-child { a {
float: right; float: right;
&:first-child {
float: left;
}
}
} }
} }
} }
...@@ -232,19 +241,24 @@ section.cal { ...@@ -232,19 +241,24 @@ section.cal {
} }
body.content body.content
section.cal { section.cal {
width: flex-grid(3) + flex-gutter(); width: flex-grid(3) + flex-gutter();
float: left; float: left;
overflow: scroll;
@include box-sizing(border-box);
> header ul {
display: none;
}
ol {
li {
@include box-sizing(border-box); @include box-sizing(border-box);
width: 100%;
> header ul { &.create-module {
display: none; display: none;
} }
ol {
li {
@include box-sizing(border-box);
width: 100%;
}
}
} }
}
}
cms/static/sass/_week.scss
...@@ -3,76 +3,118 @@ section.week-new, ...@@ -3,76 +3,118 @@ section.week-new,
section.sequence-edit { section.sequence-edit {
> header { > header {
border-bottom: 1px solid #ccc; border-bottom: 2px solid #333;
@include clearfix(); @include clearfix();
padding: 6px;
h1 { h1 {
font-size: 18px; font-size: 18px;
float: left; margin: 8px 6px;
margin-top: 8px 6px; text-transform: uppercase;
letter-spacing: 1px;
} }
a { section.goals {
float: right; background: #eee;
@extend .button; padding: 6px;
display: block; border-top: 1px solid #ccc;
header {
h2 {
font-size: 14px;
@include inline-block();
}
p {
@include inline-block();
}
}
ul {
list-style: none;
margin-top: 6px;
color: #999;
}
} }
} }
section { > section.content {
header { @include box-sizing(border-box);
background: #666; padding: 20px;
color: #fff;
padding: 6px; section.filters {
border-bottom: 1px solid #333; @include clearfix;
-webkit-font-smoothing: antialiased; margin-bottom: 10px;
background: #efefef;
border: 1px solid #ddd;
ul {
@include clearfix();
list-style: none;
padding: 6px;
li {
@include inline-block();
h2 { &.advanced {
font-size: 14px; float: right;
}
}
} }
} }
&.sidebar { > div {
width: flex-grid(3, 9) + flex-gutter(9); display: table;
float: left; border: 1px solid;
background: #ccc; width: 100%;
border-right: 1px solid #333;
@include box-sizing(border-box);
section { section {
height: 50%; header {
background: #eee;
padding: 10px;
border-bottom: 1px solid #ccc;
h2 {
text-transform: uppercase;
letter-spacing: 1px;
font-size: 12px;
}
}
> ul { &.modules {
list-style: none; @include box-sizing(border-box);
display: table-cell;
width: flex-grid(6, 9);
border-right: 1px solid #333;
> li { ol {
padding: 6px; list-style: none;
border-bottom: 1px solid #666; border-bottom: 1px solid #333;
background: #eee;
&.new-module { li {
position: relative; border-bottom: 1px solid #333;
ul.new-dropdown { &:last-child{
border-bottom: 0;
}
a {
color: #000;
}
ol {
list-style: none; list-style: none;
li { li {
display: none; padding: 6px 0 6px 6px;
&:first-child { h3 {
display: block; text-transform: uppercase;
letter-spacing: 1px;
font-size: 12px;
} }
}
&:hover { ol {
li { border-left: 1px solid;
display: block;
padding: 6px 0;
&:first-child {
padding-top: 0;
}
} }
} }
} }
...@@ -80,75 +122,71 @@ section.sequence-edit { ...@@ -80,75 +122,71 @@ section.sequence-edit {
} }
} }
p { &.scratch-pad {
padding: 6px; @include box-sizing(border-box);
border-bottom: 1px solid #666; display: table-cell;
} width: flex-grid(3, 9) + flex-gutter(9);
}
}
&.weeks-content { ol {
width: flex-grid(6, 9); list-style: none;
float: left; border-bottom: 1px solid #999;
@include box-sizing(border-box);
header {
@include clearfix;
h2 { li {
float: left; border-bottom: 1px solid #999;
} background: #f9f9f9;
form { &:last-child {
float: right; border-bottom: 0;
margin: -2px 0; }
input { ul {
border: 1px solid #000; list-style: none;
background: #ddd;
padding: 2px 4px;
@include border-radius(2px);
}
}
}
li {
padding: 6px;
section { a {
&.filters { color: #000;
border-bottom: 1px solid #999; }
}
}
ul { &.new-module {
@include clearfix(); position: relative;
list-style: none;
padding: 6px;
li { ul.new-dropdown {
@include inline-block(); list-style: none;
&.advanced { li {
float: right; display: none;
}
}
}
}
&.modules { &:first-child {
ul { display: block;
list-style: none; }
}
li { &:hover {
padding: 6px; li {
font-weight: bold; display: block;
font-size: 16px; padding: 6px 0;
border-bottom: 1px solid #333;
a { &:first-child {
color: #000; padding-top: 0;
}
}
}
}
} }
} }
} }
p {
padding: 6px;
border-bottom: 1px solid #666;
}
} }
} }
} }
} }
} }
cms/templates/widgets/navigation.html
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<h1><a href="#">Week 1</a></h1> <h1><a href="#">Week 1</a></h1>
<ul> <ul>
<li class="goal editable"><strong>Goal title:</strong> This is a goal that will be in the header of the week</li> <li class="goal editable"><strong>Goal title:</strong> This is a goal that will be in the header of the week</li>
<li class="goal editable"><strong>Goal title two:</strong> This is another fgoal for this week so that students have two things to learn</li> <li class="goal editable"><strong>Goal title two:</strong> This is another goal for this week so that students have two things to learn</li>
</ul> </ul>
</header> </header>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
<form> <form>
<ul> <ul>
<li> <li>
<input type="text" name="" id="" placeholder="Moldule title" /> <input type="text" name="" id="" placeholder="Section title" />
</li> </li>
<li> <li>
<select> <select>
...@@ -157,8 +157,11 @@ ...@@ -157,8 +157,11 @@
</li> </li>
<li> <li>
<input type="submit" value="Save and edit week" class="edit-week" /> <input type="submit" value="Save and edit week" class="edit-week" />
<a href="#" class="close">Save without edit</a>
<a href="#" class="close">cancel</a> <div>
<a href="#" class="close">Save without edit</a>
<a href="#" class="close">cancel</a>
</div>
</li> </li>
</ul> </ul>
</form> </form>
......
cms/templates/widgets/week-edit.html
<section class="week-edit"> <section class="week-edit">
<header> <header>
<h1 class="editable">Week 3</h1> <h1 class="editable">Week 3</h1>
<p><a href="#">+ new goal</a></p>
<section class="goals"> <section class="goals">
<h2>Weeks goals:</h2> <header>
<h2>Weeks goals:</h2>
<p><a href="#">+ new goal</a></p>
</header>
<ul> <ul>
<li> <li>
<h3>Goal title</h2> <p><strong>Goal title:</strong> This is the goal body and is wehre the goal will be further explained</p>
<p>This is the goal body</p>
</li> </li>
</ul> </ul>
</section> </section>
</header> </header>
<section class="content">
<section class="filters">
<ul>
<li>
<label for="">Sort by</label>
<select>
<option value="">Recently Modified</option>
</select>
</li>
<li>
<label for="">Display</label>
<select>
<option value="">All content</option>
</select>
</li>
<li>
<select>
<option value="">Internal Only</option>
</select>
</li>
<section class="weeks-content"> <li class="advanced">
<header> <a href="#">Advanced filters</a>
<h2>Weeks Content</h2> </li>
<form>
<input type="search" name="" id="" value="" />
</form>
</header>
<section class="filters">
<ul>
<li>
<label for="">Sort by</label>
<select>
<option value="">Recently Modified</option>
</select>
</li>
<li>
<label for="">Display</label>
<select>
<option value="">All content</option>
</select>
</li>
<li>
<select>
<option value="">Internal Only</option>
</select>
</li>
<li class="advanced">
<a href="#">Advanced filters</a>
</li>
</ul>
</section>
<li>
<input type="search" name="" id="" value="" />
</li>
</ul>
</section>
<div>
<section class="modules"> <section class="modules">
<ul> <ol>
<li> <li>
<h2><a href="#">Lecture Sequence</a></h2> <header>
<h2><a href="#">Lecture Sequence</a></h2>
</header>
<ul> <ol>
<li><a href="#" class="problem-edit">Problem title 11</a></li> <li><a href="#" class="problem-edit">Problem title 11</a></li>
<li><a href="#" class="problem-edit">Problem title 13</a></li> <li><a href="#" class="problem-edit">Problem title 13</a></li>
<li><a href="#" class="problem-edit">Problem title 14</a></li> <li><a href="#" class="problem-edit">Problem title 14</a></li>
<li><a href="#" class="video-edit">Video 3</a></li> <li><a href="#" class="video-edit">Video 3</a></li>
</ul> </ol>
</li> </li>
<li> <li>
<header>
<h2><a href="#">Lecture Sequence</a></h2> <h2><a href="#">Lecture Sequence</a></h2>
</header>
<ul> <ol>
<li><a href="#" class="problem-edit">Problem title 11</a></li> <li>
<header>
<h3>
<a href="#" class="problem-edit">Problem group</a>
</h3>
</header>
<ol>
<li>
<a href="#" class="problem-edit">Problem title 11</a>
</li>
<li>
<a href="#" class="problem-edit">Problem title 11</a>
</li>
<li>
<a href="#" class="problem-edit">Problem title 11</a>
</li>
</ol>
</li>
<li><a href="#" class="problem-edit">Problem title 13</a></li> <li><a href="#" class="problem-edit">Problem title 13</a></li>
<li><a href="#" class="problem-edit">Problem title 14</a></li> <li><a href="#" class="problem-edit">Problem title 14</a></li>
<li><a href="#" class="video-edit">Video 3</a></li> <li><a href="#" class="video-edit">Video 3</a></li>
</ul> </ol>
</li> </li>
<li> <li>
<header>
<h2><a href="#">Homework 1a</a></h2> <h2><a href="#">Homework 1a</a></h2>
</header>
<ul> <ol>
<li><a href="#" class="problem-edit">Problem title 11</a></li> <li><a href="#" class="problem-edit">Problem title 11</a></li>
<li><a href="#" class="problem-edit">Problem title 13</a></li> <li><a href="#" class="problem-edit">Problem title 13</a></li>
<li><a href="#" class="problem-edit">Problem title 14</a></li> <li><a href="#" class="problem-edit">Problem title 14</a></li>
<li><a href="#" class="video-edit">Video 3</a></li> <li><a href="#" class="video-edit">Video 3</a></li>
</ul> </ol>
</li> </li>
<li class="new-module"> <li class="new-module">
<%include file="new-module.html"/> <%include file="new-module.html"/>
</li> </li>
</ul> </ol>
</section> </section>
</section>
<section class="scratch-pad"> <section class="scratch-pad">
<header> <ol>
<h2>Scratchpad</h2> <li>
</header> <header>
<h2>Section Scratch</h2>
</header>
<ul>
<li>Problem title 11</li>
<li>Problem title 13</li>
<li>Problem title 14</li>
<li>Video 3</li>
</ul>
</li>
<li>
<header>
<h2>Course Scratch</h2>
</header>
<ul>
<li>Problem title 11</li>
<li>Problem title 13</li>
<li>Problem title 14</li>
<li>Video 3</li>
</ul>
</li>
<ul> <li class="new-module">
<li>Problem title 11</li> <%include file="new-module.html"/>
<li>Problem title 13</li> </li>
<li>Problem title 14</li> </ol>
<li>Video 3</li> </section>
<%include file="new-module.html"/> </div>
</ul>
</section> </section>
</section> </section>
cms/templates/widgets/week-new.html
<section class="week-new"> <section class="week-new">
<header> <header>
<h1>Week 6</h1> <h1>Week 6</h1>
<p><a href="#">+ new goal</a></p>
<section class="goals"> <section class="goals">
<h2>Weeks goals:</h2> <header>
<h2>Weeks goals:</h2>
<p><a href="#">+</a></p>
</header>
<ul> <ul>
<li> <li>
<h3>Create new goal</h2> <h3>Create new goal</h2>
...@@ -40,32 +43,32 @@ ...@@ -40,32 +43,32 @@
</li> </li>
<li> <li>
<form> <form>
<input type="search" name="" id="" value="" /> <input type="search" name="" id="" value="" />
</form> </form>
</li> </li>
</ul> </ul>
</section> </section>
<section> <section class="content">
<section class="scratch-pad">
<header>
<h2>Scratch pad</h2>
</header>
<ul> <section class="weeks-content">
<li class="new-module"> <header>
<%include file="new-module.html"/> <h2>Weeks Content</h2>
</li> </header>
</ul> </section>
</section>
<section class="weeks-content"> <section class="scratch-pad">
<header> <header>
<h2>Weeks Content</h2> <h2>Scratch pad</h2>
</header> </header>
</section> <ul>
<li class="new-module">
<%include file="new-module.html"/>
</li>
</ul>
</section>
</section> </section>
<section class="new-bar"> <section class="new-bar">
...@@ -83,4 +86,5 @@ ...@@ -83,4 +86,5 @@
<a href="#">New Lab</a> <a href="#">New Lab</a>
</li> </li>
</ul> </ul>
</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