Skip to content

E
edx-platform
Commit e0fe09f1 by Tom Giannattasio
Options

fixed wiki bugs; started sequence nav bugs

parent 2d297660
Showing with 58 additions and 48 deletions
common/lib/xmodule/xmodule/css/sequence/display.scss
...@@ -2,10 +2,13 @@ nav.sequence-nav { ...@@ -2,10 +2,13 @@ nav.sequence-nav {
// TODO (cpennington): This doesn't work anymore. XModules aren't able to // TODO (cpennington): This doesn't work anymore. XModules aren't able to
// import from external sources. // import from external sources.
@extend .topbar; @extend .topbar;
border-bottom: 1px solid $border-color; border: 1px solid #ccc;
@include border-top-right-radius(4px); height: 44px;
margin: 0 0 lh() (-(lh())); @include linear-gradient(top, #f6f6f6, #e6e6e6);
@include border-radius(25px);
margin: 0 -20px 30px;
position: relative; position: relative;
@include box-shadow(0 1px 0 #fff inset);
ol { ol {
@include box-sizing(border-box); @include box-sizing(border-box);
...@@ -25,42 +28,34 @@ nav.sequence-nav { ...@@ -25,42 +28,34 @@ nav.sequence-nav {
min-width: 20px; min-width: 20px;
a { a {
background-position: center; width: 35px;
height: 35px;
margin: 4px auto;
background-position: center 10px;
background-repeat: no-repeat; background-repeat: no-repeat;
border: 1px solid transparent; border: 1px solid transparent;
border-bottom: none; @include border-radius(35px);
@include border-radius(3px 3px 0 0);
cursor: pointer; cursor: pointer;
display: block; display: block;
height: 10px; padding: 0;
padding: 15px 0 14px;
position: relative; position: relative;
@include transition(); @include transition();
width: 100%;
&:hover { &:hover {
background-color: #fff;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center 10px;
background-color: #F3F3F3;
}
&.visited {
background-color: #F3F3F3;
&:hover {
background-position: center center;
}
} }
&.active { &.active {
border-color: $border-color; border-color: $blue;
@include box-shadow(0 2px 0 #fff);
background-color: #fff; background-color: #fff;
z-index: 9; z-index: 9;
&:hover { &:hover {
background-position: center;
background-color: #fff; background-color: #fff;
background-repeat: no-repeat;
background-position: center 10px;
} }
} }
...@@ -176,24 +171,27 @@ nav.sequence-nav { ...@@ -176,24 +171,27 @@ nav.sequence-nav {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
width: flex-grid(1, 9); width: 81px;
border: 1px solid $border-color; margin-right: 5px;
border: none;
border-bottom: 0; border-bottom: 0;
@include border-radius(3px 3px 0 0); @include border-radius(3px 3px 0 0);
li { li {
float: left; float: left;
margin-bottom: 0; margin-bottom: 0;
width: 50%; height: 35px;
width: 40px;
&.prev, &.next { &.prev, &.next {
@include linear-gradient(top, #ccc, #888);
a { a {
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
display: block; display: block;
height: 10px; height: 35px;
padding: 15px 0 14px; width: 40px;
text-indent: -9999px; text-indent: -9999px;
@include transition(all, .2s, $ease-in-out-quad); @include transition(all, .2s, $ease-in-out-quad);
...@@ -210,12 +208,16 @@ nav.sequence-nav { ...@@ -210,12 +208,16 @@ nav.sequence-nav {
} }
&.prev { &.prev {
border-radius: 35px 0 0 35px;
a { a {
background-image: url('../images/sequence-nav/previous-icon.png'); background-image: url('../images/sequence-nav/previous-icon.png');
} }
} }
&.next { &.next {
border-radius: 0 35px 35px 0;
a { a {
border-left: 1px solid lighten($border-color, 10%); border-left: 1px solid lighten($border-color, 10%);
background-image: url('../images/sequence-nav/next-icon.png'); background-image: url('../images/sequence-nav/next-icon.png');
......
lms/static/sass/README.txt 0 → 100644
Sass Watch:
sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb
lms/static/sass/course/base/_base.scss
body { body {
min-width: 980px; min-width: 980px;
min-height: 100%;
background: url(../images/bg-texture.png) #f7f7f7; background: url(../images/bg-texture.png) #f7f7f7;
} }
......
lms/static/sass/course/base/_extends.scss
...@@ -47,10 +47,10 @@ h1.top-header { ...@@ -47,10 +47,10 @@ h1.top-header {
} }
.sidebar { .sidebar {
// border-right: 1px solid #C8C8C8;
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
font-family: $sans-serif; font-family: $sans-serif;
font-size: 14px;
position: relative; position: relative;
vertical-align: top; vertical-align: top;
width: flex-grid(3); width: flex-grid(3);
...@@ -58,7 +58,7 @@ h1.top-header { ...@@ -58,7 +58,7 @@ h1.top-header {
h1, h2 { h1, h2 {
font-size: em(20); font-size: em(20);
font-weight: 100; font-weight: bold;
letter-spacing: 0; letter-spacing: 0;
text-transform: none; text-transform: none;
font-family: $sans-serif; font-family: $sans-serif;
...@@ -66,6 +66,11 @@ h1.top-header { ...@@ -66,6 +66,11 @@ h1.top-header {
font-style: normal; font-style: normal;
} }
h1 {
font-size: 18px;
padding: 32px 26px 20px 26px;
}
a { a {
border: none; border: none;
font-style: normal; font-style: normal;
......
lms/static/sass/course/courseware/_courseware.scss
...@@ -12,8 +12,7 @@ div.course-wrapper { ...@@ -12,8 +12,7 @@ div.course-wrapper {
section.course-content { section.course-content {
@extend .content; @extend .content;
padding-right: 0; padding: 40px;
padding-left: lh();
h1 { h1 {
margin: 0 0 lh(); margin: 0 0 lh();
......
lms/static/sass/course/discussion/_discussion.scss
...@@ -3,15 +3,16 @@ body.askbot { ...@@ -3,15 +3,16 @@ body.askbot {
section.container { section.container {
div.discussion-wrapper { div.discussion-wrapper {
@extend .table-wrapper; @extend .table-wrapper;
display: table;
div.discussion-content { div.discussion-content {
@include box-sizing(border-box); @include box-sizing(border-box);
display: table-cell; display: table-cell;
min-width: 650px; min-width: 650px;
padding-right: lh(); padding: 40px;
vertical-align: top;
width: flex-grid(9) + flex-gutter(); width: flex-grid(9) + flex-gutter();
a.tabula-rasa, .tabula-rasa{ a.tabula-rasa, .tabula-rasa{
@extend .light-button; @extend .light-button;
@include border-radius(5px); @include border-radius(5px);
......
lms/static/sass/course/discussion/_sidebar.scss
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
div.discussion-wrapper aside { div.discussion-wrapper aside {
@extend .sidebar; @extend .sidebar;
border-left: 1px solid $border-color; border-left: 1px solid #ccc;
border-right: 0; border-right: 0;
width: flex-grid(3); width: flex-grid(3);
border-radius: 0 3px 3px 0;
&:after { &:after {
left: -1px; left: -1px;
...@@ -16,9 +17,7 @@ div.discussion-wrapper aside { ...@@ -16,9 +17,7 @@ div.discussion-wrapper aside {
} }
h1 { h1 {
@extend .bottom-border; margin-bottom: 0;
padding: lh(.5) lh();
margin-bottom: em(16, 20);
} }
h2 { h2 {
...@@ -54,7 +53,7 @@ div.discussion-wrapper aside { ...@@ -54,7 +53,7 @@ div.discussion-wrapper aside {
div.box { div.box {
display: block; display: block;
padding: lh(.5) lh(); padding: 18px 26px;
border-top: 1px solid lighten($border-color, 10%); border-top: 1px solid lighten($border-color, 10%);
&:first-child { &:first-child {
...@@ -67,7 +66,7 @@ div.discussion-wrapper aside { ...@@ -67,7 +66,7 @@ div.discussion-wrapper aside {
li { li {
border-bottom: 0; border-bottom: 0;
background: #eee; background: #ddd;
padding: 6px 10px 6px 5px; padding: 6px 10px 6px 5px;
a { a {
...@@ -298,6 +297,7 @@ div.discussion-wrapper aside { ...@@ -298,6 +297,7 @@ div.discussion-wrapper aside {
div.view-profile { div.view-profile {
border-top: 0; border-top: 0;
padding-top: 0;
a { a {
@extend .gray-button; @extend .gray-button;
......
lms/static/sass/course/discussion/_tags.scss
...@@ -10,7 +10,7 @@ ul.tags { ...@@ -10,7 +10,7 @@ ul.tags {
} }
li { li {
background: #eee; background: #ddd;
color: #555; color: #555;
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
...@@ -19,7 +19,7 @@ ul.tags { ...@@ -19,7 +19,7 @@ ul.tags {
padding: 6px 10px 6px 5px; padding: 6px 10px 6px 5px;
&:before { &:before {
border-color:transparent #eee transparent transparent; border-color:transparent #ddd transparent transparent;
border-style:solid; border-style:solid;
border-width:12px 10px 12px 0; border-width:12px 10px 12px 0;
content:""; content:"";
......
lms/templates/wiki/article.html
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
{% endblock %} {% endblock %}
</article> </article>
<div class="article-functions"> <div class="article-functions">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
{% include "wiki/includes/article_menu.html" %} {% include "wiki/includes/article_menu.html" %}
</ul> </ul>
......
lms/templates/wiki/settings.html
...@@ -35,16 +35,16 @@ ...@@ -35,16 +35,16 @@
<div class="article-functions"> <div class="article-functions">
<div class="timestamp">
<span class="label">{% trans "Last modified:" %}</span><br />
<span class="date">{{ article.current_revision.modified }}</span>
</div>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
{% with "settings" as selected %} {% with "settings" as selected %}
{% include "wiki/includes/article_menu.html" %} {% include "wiki/includes/article_menu.html" %}
{% endwith %} {% endwith %}
</ul> </ul>
<div class="timestamp">
<span class="label">{% trans "Last modified:" %}</span><br />
<span class="date">{{ article.current_revision.modified }}</span>
</div>
</div> </div>
</div> </div>
......
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