Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with default

Browse Source 
--HG--
branch : templates_ernie_leanmodal_closebox
This commit is contained in:
Ernie Park
2012-02-08 15:51:32 -05:00
parent a2f1928404 e612572bad
commit 00e79f04d7
10 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main.html
View File

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<%block name="title"><title>MITX 6.002</title></%block>
<%block name="title"><title>MITx 6.002</title></%block>
<link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />

2
marketing.html
View File

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<%block name="title"><title>MITX 6.002</title></%block>
<%block name="title"><title>MITx 6.002</title></%block>
<!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />

75
sass/_askbot-original.scss
View File

@@ -1014,27 +1014,27 @@ ul {
font-weight: bold;
font-size: 24px; }
#fmask {
margin-bottom: 30px;
width: 100%; }
// #fmask {
// margin-bottom: 30px;
// width: 100%; }
#askFormBar {
display: inline-block;
padding: 4px 7px 5px 0px;
margin-top: 0px;
p {
margin: 0 0 5px 0;
font-size: 14px;
color: #525252;
line-height: 1.4; }
.questionTitleInput {
font-size: 24px;
line-height: 24px;
height: 36px;
margin: 0px;
padding: 0px 0 0 5px;
border: #cce6ec 3px solid;
width: 725px; } }
// #askFormBar {
// display: inline-block;
// padding: 4px 7px 5px 0px;
// margin-top: 0px;
// p {
// margin: 0 0 5px 0;
// font-size: 14px;
// color: #525252;
// line-height: 1.4; }
// .questionTitleInput {
// font-size: 24px;
// line-height: 24px;
// height: 36px;
// margin: 0px;
// padding: 0px 0 0 5px;
// border: #cce6ec 3px solid;
// width: 725px; } }
.ask-page div#question-list, .edit-question-page div#question-list {
float: none;
@@ -1075,12 +1075,12 @@ ul {
color: #525252;
font-size: 13px; }
.ask-page #id_tags, .edit-question-page #id_tags {
border: #cce6ec 3px solid;
height: 25px;
padding-left: 5px;
width: 395px;
font-size: 14px; }
// .ask-page #id_tags, .edit-question-page #id_tags {
// border: #cce6ec 3px solid;
// height: 25px;
// padding-left: 5px;
// width: 395px;
// font-size: 14px; }
.title-desc {
color: #707070;
@@ -1126,8 +1126,8 @@ ul {
// margin-bottom: 10px;
// width: 710px; }
#id_title {
width: 100%; }
// #id_title {
// width: 100%; }
// .wmd-preview {
// margin: 3px 0 5px 0;
@@ -2192,10 +2192,11 @@ ins {
span {
&.text-counter {
margin-right: 20px; }
&.form-error {
color: #990000;
font-weight: normal;
margin-left: 5px; } }
// &.form-error {
// color: #990000;
// font-weight: normal;
// margin-left: 5px; }
}
p.form-item {
margin: 0px; }
@@ -2247,11 +2248,11 @@ label.retag-error {
margin-top: 10px;
padding: 10px; }
span.form-error {
color: #990000;
font-size: 90%;
font-weight: normal;
margin-left: 5px; }
// span.form-error {
// color: #990000;
// font-size: 90%;
// font-weight: normal;
// margin-left: 5px; }
.favorites-empty {
width: 32px;

32
sass/_discussion-forms.scss
View File

@@ -12,8 +12,19 @@ form.answer-form {
width: 99%;
}
span.form-error {
display: block;
div.form-item {
margin: 25px 0;
label {
display: block;
margin-bottom: -5px;
}
}
span.form-error, label.form-error {
color: #990000;
display: inline;
font-size: 90%;
font-weight: bold;
padding: 10px 0;
}
@@ -50,7 +61,24 @@ form.answer-form {
}
}
}
input.after-editor {
margin-bottom: 20px;
margin-right: 10px;
}
form.question-form {
@extend .answer-form;
border: none;
padding: 0;
margin-top: -15px;
input[type="text"] {
width: flex-grid(6);
}
input[type="checkbox"] {
margin-top: 10px;
}
}

2
simplewiki_create.html
View File

@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
<%block name="title"><title>Create Article - MITX 6.002 Wiki</title></%block>
<%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title">
Create article

2
simplewiki_edit.html
View File

@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title">
${ wiki_article.title }

2
simplewiki_error.html
View File

@@ -6,7 +6,7 @@
from django.core.urlresolvers import reverse
%>
<%block name="title"><title>Oops... - MITX 6.002 Wiki</title></%block>
<%block name="title"><title>Oops... - MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title">

2
simplewiki_history.html
View File

@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
<%!
from django.core.urlresolvers import reverse

2
simplewiki_searchresults.html
View File

@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
<%block name="title"><title>Search Results - MITX 6.002 Wiki</title></%block>
<%block name="title"><title>Search Results - MITx 6.002 Wiki</title></%block>
<%!
from django.core.urlresolvers import reverse

2
simplewiki_view.html
View File

@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki</title></%block>
<%block name="title"><title>${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
<%block name="wiki_page_title">
${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}