From ac960ab9df2f57048c72c7a881adefa2c804bcb6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 6 Aug 2012 13:33:33 -0400 Subject: [PATCH] Add images for book and fix styles for wiki --- lms/static/images/textbook/textbook-left.png | Bin 0 -> 783 bytes lms/static/images/textbook/textbook-right.png | Bin 0 -> 822 bytes lms/static/sass/course/_info.scss | 17 +---- lms/static/sass/course/base/_extends.scss | 2 +- lms/static/sass/course/wiki/_sidebar.scss | 68 ++++++++---------- lms/templates/main.html | 2 +- lms/templates/simplewiki/simplewiki_base.html | 58 +++++++-------- 7 files changed, 63 insertions(+), 84 deletions(-) create mode 100644 lms/static/images/textbook/textbook-left.png create mode 100644 lms/static/images/textbook/textbook-right.png diff --git a/lms/static/images/textbook/textbook-left.png b/lms/static/images/textbook/textbook-left.png new file mode 100644 index 0000000000000000000000000000000000000000..52cb58efe7ca23394ce80ddb9eefa8990d49278d GIT binary patch literal 783 zcmeAS@N?(olHy`uVBq!ia0vp^zCb*kgAGUqthx4+fr06or;B4q#jUp&-1|fV1zZDF z(sWqfKdX3e>*4e9p68kt(G6@jn6(cc=D2=C&&VZp^^a5YyS_)6{xV-;-C=H{tu~qS zsnwmYYqCRM3vk_V3cvIDn&GB|`^yu!KW^t!YCd|;s*8s$O72a-n*~>`jab-baez=1 z-6G5IWHa8C5a1=i1u)4g211unO0dnu!@GqszZdx$FW%G?&5R zr%iu#fX-~JeRt4-d5u&;v70sjjr}nj-fnDWi?BM-!(c4M{M(fEH_MIxjA<-01QSj> z><(zi&6Z7DBlpHULF!hw=8dH5N3S_<%IM$ytNP~FU8PfaqP}og$m&*EFn{OTQE2jj z2Z**v-BBuFiek<4eI2nmjK+(&Bd}g46a-aeqFtXY4b-~kJv4k5(TK8I2CPVIy z8r0aLSZ$d0W}wN_US|Qdvu|fL5$1!SEivIhH>HkM6v(? literal 0 HcmV?d00001 diff --git a/lms/static/images/textbook/textbook-right.png b/lms/static/images/textbook/textbook-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8779df5df54704b0a6a0fb88f99af551a0ef5adf GIT binary patch literal 822 zcmeAS@N?(olHy`uVBq!ia0vp^zCb*kgAGUqthx4+fr06-r;B4q#jUq@J^iKxinJvP zrRTY9Ji2qmjimnALs#~>``+oWF5rK6aPAF-J_ptujsMc!PpX3MSlypK>#zRF(+k?p zGpu^G|NESk2NO1|ew};$?K(}V_@7^wt^V_eQLn#j$!qNbDX9Xrs7$p3cVAljar0U* zL(p2*?M5xPncmf#Jm7&M@ppO|JNcNu^8;1n3Ke{JIDNQwp2vF#p!{>)`4QYoOr@c;SVLl5%&D9*UIN77tF$?mU@V^txP?O2n`OV$pf)5zk z>^Q#Q>BDK+P>%Y7nFS#9^p^NT2jhnhpC8O?n%4e1=5Qm>)Mp26p@!;SFM%1(2Qpml zT`({EEcWdzKn?^&t=kK>j}>HJ<&J(+nGCr*-cU<{Ru{ePELiZepqUA#UhbVU>vt{_ zVLlMze^+|nag%OYF7L&A-({6AUtD)JYsHJT`o?!exRzn`Is! z+;=r$j+D?ri}}kM?>;m#px{%?EP z9`9SuRyKF`Q6-7;8?FY+RJT~m9av{L-I*nssfXj(8b!gLm0@rFTnwHq&rIOX@*t{F4^+gl4DQp4*r3Mn~-6jlQ*wu_^q!IgTBxXXe>5*V>qi z$K(Ku3GW-HN?DTwYHej@A`%&u8$LfRy})qW@IViPanOM}o`YuF4mvRF$R@Zo_zJv@ zVVM2iIt0X#WK1*R%8}hrc01v9LuST%hRYYr#4Qed`pa4*eIm@2-}?eEKQMT@`njxg HN@xNAGDl@n literal 0 HcmV?d00001 diff --git a/lms/static/sass/course/_info.scss b/lms/static/sass/course/_info.scss index 5c19ea42d4..b574eab48e 100644 --- a/lms/static/sass/course/_info.scss +++ b/lms/static/sass/course/_info.scss @@ -76,27 +76,14 @@ div.info-wrapper { h1 { @extend .bottom-border; padding: lh(.5) lh(.5); - } - - header { - - // h1 { - // font-weight: 100; - // font-style: italic; - // } - - p { - color: #666; - font-size: 12px; - margin-bottom: 0; - margin-top: 4px; - } + margin-bottom: 0; } ol { background: none; list-style: none; padding-left: 0; + margin: 0; li { @extend .clearfix; diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss index a2280adaac..9f8cb9fa35 100644 --- a/lms/static/sass/course/base/_extends.scss +++ b/lms/static/sass/course/base/_extends.scss @@ -74,7 +74,7 @@ h1.top-header { } .bottom-border { - border-bottom: 1px solid #d3d3d3; + border-bottom: 1px solid $border-color; } @media print { diff --git a/lms/static/sass/course/wiki/_sidebar.scss b/lms/static/sass/course/wiki/_sidebar.scss index 90bc654e08..ccaed19a17 100644 --- a/lms/static/sass/course/wiki/_sidebar.scss +++ b/lms/static/sass/course/wiki/_sidebar.scss @@ -4,78 +4,70 @@ div#wiki_panel { h2 { @extend .bottom-border; - font-size: 18px; margin: 0 ; - padding: lh(.5) lh(); - } - - input[type="button"] { - background: transparent; - border: none; - @include box-shadow(none); - color: #666; - font-size: 14px; - font-weight: bold; - margin: 0px; - padding: 7px lh(); - text-align: left; - @include transition(); - width: 100%; + padding: lh(.5) lh() lh(.5) 0; + color: #000; } ul { + padding-left: 0; + margin: 0; + li { - @include box-shadow(inset 0 1px 0 0 #eee); - border-top: 1px solid #d3d3d3; - - &:hover { - background: #efefef; - @include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225))); - } - - &:first-child { - border: none; - } + @extend .bottom-border; &.search { - padding: 10px lh(); + padding: 10px lh() 10px 0; label { display: none; } } - &.create-article { - h3 { - } - } - a { color: #666; font-size: 14px; - padding: 7px lh(); + padding: 7px lh() 7px 0; + + &:hover { + background: #efefef; + } + + } + } + + form { + input[type="submit"]{ + @extend .light-button; + text-transform: none; + text-shadow: none; } } } div#wiki_create_form { @extend .clearfix; - background: #dadada; - border-bottom: 1px solid #d3d3d3; - padding: 15px; + padding: lh(.5) lh() lh(.5) 0; + + label { + font-family: $sans-serif; + margin-bottom: lh(.5); + } input[type="text"] { @include box-sizing(border-box); display: block; - margin-bottom: 6px; width: 100%; + margin-bottom: lh(.5); } ul { list-style: none; + margin: 0; li { float: left; + border-bottom: 0; &#cancel { float: right; diff --git a/lms/templates/main.html b/lms/templates/main.html index fb502bfe22..891d770637 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -25,9 +25,9 @@ <%include file="navigation.html" />
${self.body()} + <%block name="bodyextra"/>
- <%block name="bodyextra"/> <%include file="footer.html" /> <%static:js group='application'/> diff --git a/lms/templates/simplewiki/simplewiki_base.html b/lms/templates/simplewiki/simplewiki_base.html index 6777af1b82..04a239b6c3 100644 --- a/lms/templates/simplewiki/simplewiki_base.html +++ b/lms/templates/simplewiki/simplewiki_base.html @@ -71,9 +71,9 @@ }); - + <%block name="wiki_head"/> - + <%block name="bodyextra"> @@ -86,7 +86,7 @@
<%block name="wiki_panel">
-

Course Wiki

+

Course Wiki

  • @@ -101,12 +101,12 @@
    <% - baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" }) + baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" }) %>
    -
    +
    • @@ -130,31 +130,31 @@
      - %if wiki_article is not UNDEFINED: -
      - %if wiki_article.locked: -

      This article has been locked

      - %endif -

      Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

      - %endif - - %if wiki_article is not UNDEFINED: - -
      + %if wiki_article is not UNDEFINED: +
      + %if wiki_article.locked: +

      This article has been locked

      %endif +

      Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}

      + %endif + + %if wiki_article is not UNDEFINED: + +
      + %endif <%block name="wiki_page_title"/> <%block name="wiki_body"/>