Commit ac960ab9 by Kyle Fiedler

Add images for book and fix styles for wiki

parent a090d623
...@@ -76,27 +76,14 @@ div.info-wrapper { ...@@ -76,27 +76,14 @@ div.info-wrapper {
h1 { h1 {
@extend .bottom-border; @extend .bottom-border;
padding: lh(.5) lh(.5); padding: lh(.5) lh(.5);
} margin-bottom: 0;
header {
// h1 {
// font-weight: 100;
// font-style: italic;
// }
p {
color: #666;
font-size: 12px;
margin-bottom: 0;
margin-top: 4px;
}
} }
ol { ol {
background: none; background: none;
list-style: none; list-style: none;
padding-left: 0; padding-left: 0;
margin: 0;
li { li {
@extend .clearfix; @extend .clearfix;
......
...@@ -74,7 +74,7 @@ h1.top-header { ...@@ -74,7 +74,7 @@ h1.top-header {
} }
.bottom-border { .bottom-border {
border-bottom: 1px solid #d3d3d3; border-bottom: 1px solid $border-color;
} }
@media print { @media print {
......
...@@ -4,78 +4,70 @@ div#wiki_panel { ...@@ -4,78 +4,70 @@ div#wiki_panel {
h2 { h2 {
@extend .bottom-border; @extend .bottom-border;
font-size: 18px;
margin: 0 ; margin: 0 ;
padding: lh(.5) lh(); padding: lh(.5) lh() lh(.5) 0;
} color: #000;
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%;
} }
ul { ul {
li { padding-left: 0;
@include box-shadow(inset 0 1px 0 0 #eee); margin: 0;
border-top: 1px solid #d3d3d3;
&:hover {
background: #efefef;
@include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(225,225,225)));
}
&:first-child { li {
border: none; @extend .bottom-border;
}
&.search { &.search {
padding: 10px lh(); padding: 10px lh() 10px 0;
label { label {
display: none; display: none;
} }
} }
&.create-article {
h3 {
}
}
a { a {
color: #666; color: #666;
font-size: 14px; 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 { div#wiki_create_form {
@extend .clearfix; @extend .clearfix;
background: #dadada; padding: lh(.5) lh() lh(.5) 0;
border-bottom: 1px solid #d3d3d3;
padding: 15px; label {
font-family: $sans-serif;
margin-bottom: lh(.5);
}
input[type="text"] { input[type="text"] {
@include box-sizing(border-box); @include box-sizing(border-box);
display: block; display: block;
margin-bottom: 6px;
width: 100%; width: 100%;
margin-bottom: lh(.5);
} }
ul { ul {
list-style: none; list-style: none;
margin: 0;
li { li {
float: left; float: left;
border-bottom: 0;
&#cancel { &#cancel {
float: right; float: right;
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<%include file="navigation.html" /> <%include file="navigation.html" />
<section class="content-wrapper"> <section class="content-wrapper">
${self.body()} ${self.body()}
<%block name="bodyextra"/>
</section> </section>
<%block name="bodyextra"/>
<%include file="footer.html" /> <%include file="footer.html" />
<%static:js group='application'/> <%static:js group='application'/>
......
...@@ -71,9 +71,9 @@ ...@@ -71,9 +71,9 @@
}); });
</script> </script>
<%block name="wiki_head"/> <%block name="wiki_head"/>
</%block> </%block>
<%block name="bodyextra"> <%block name="bodyextra">
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<div class="wiki-wrapper"> <div class="wiki-wrapper">
<%block name="wiki_panel"> <%block name="wiki_panel">
<div aria-label="Wiki Navigation" id="wiki_panel"> <div aria-label="Wiki Navigation" id="wiki_panel">
<h2>Course Wiki</h2> <h2>Course Wiki</h2>
<ul class="action"> <ul class="action">
<li> <li>
<h3> <h3>
...@@ -101,12 +101,12 @@ ...@@ -101,12 +101,12 @@
<div id="wiki_create_form"> <div id="wiki_create_form">
<% <%
baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" }) baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" })
%> %>
<form method="GET" onsubmit="this.action='${baseURL}' + this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '');"> <form method="GET" onsubmit="this.action='${baseURL}' + this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '');">
<div> <div>
<label for="id_wiki_article_name">Title of article</label> <label for="id_wiki_article_name">Title of article</label>
<input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/> <input type="text" name="wiki_article_name" id="id_wiki_article_name" />
</div> </div>
<ul> <ul>
<li> <li>
...@@ -130,31 +130,31 @@ ...@@ -130,31 +130,31 @@
</%block> </%block>
<section class="wiki-body"> <section class="wiki-body">
%if wiki_article is not UNDEFINED: %if wiki_article is not UNDEFINED:
<header> <header>
%if wiki_article.locked: %if wiki_article.locked:
<p><strong>This article has been locked</strong></p> <p><strong>This article has been locked</strong></p>
%endif
<p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
%endif
%if wiki_article is not UNDEFINED:
<ul>
<li>
<a href="${ wiki_reverse('wiki_view', wiki_article, course)}" class="view">View</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_edit', wiki_article, course)}" class="edit">Edit</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_history', wiki_article, course)}" class="history">History</a>
</li>
</ul>
</header>
%endif %endif
<p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
%endif
%if wiki_article is not UNDEFINED:
<ul>
<li>
<a href="${ wiki_reverse('wiki_view', wiki_article, course)}" class="view">View</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_edit', wiki_article, course)}" class="edit">Edit</a>
</li>
<li>
<a href="${ wiki_reverse('wiki_history', wiki_article, course)}" class="history">History</a>
</li>
</ul>
</header>
%endif
<%block name="wiki_page_title"/> <%block name="wiki_page_title"/>
<%block name="wiki_body"/> <%block name="wiki_body"/>
......
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