diff --git a/main.html b/main.html
index ad1d7bd2de..d0e18f0e96 100644
--- a/main.html
+++ b/main.html
@@ -1,7 +1,7 @@
- <%block name="title">MITX 6.002
+ <%block name="title">MITx 6.002
diff --git a/marketing.html b/marketing.html
index d32a24e798..606fb3cb12 100644
--- a/marketing.html
+++ b/marketing.html
@@ -1,7 +1,7 @@
- <%block name="title">MITX 6.002
+ <%block name="title">MITx 6.002
diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss
index c1babea4ec..a1ff71cb0e 100644
--- a/sass/_askbot-original.scss
+++ b/sass/_askbot-original.scss
@@ -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;
diff --git a/sass/_discussion-forms.scss b/sass/_discussion-forms.scss
index af758bde45..4b6098adf9 100644
--- a/sass/_discussion-forms.scss
+++ b/sass/_discussion-forms.scss
@@ -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;
+ }
+}
+
diff --git a/simplewiki_create.html b/simplewiki_create.html
index 65ecbff4aa..a2161a22a7 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">Create Article - MITX 6.002 Wiki
+<%block name="title">Create Article - MITx 6.002 Wiki
<%block name="wiki_page_title">
Create article
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 30e2c6ecc0..7d7a9c6bb8 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki
+<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki
<%block name="wiki_page_title">
${ wiki_article.title }
diff --git a/simplewiki_error.html b/simplewiki_error.html
index f4269f1043..8b7324a998 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -6,7 +6,7 @@
from django.core.urlresolvers import reverse
%>
-<%block name="title">Oops... - MITX 6.002 Wiki
+<%block name="title">Oops... - MITx 6.002 Wiki
<%block name="wiki_page_title">
diff --git a/simplewiki_history.html b/simplewiki_history.html
index bea5a02284..87daba9f21 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki
+<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki
<%!
from django.core.urlresolvers import reverse
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 267a1f921b..c7d43dbeb5 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">Search Results - MITX 6.002 Wiki
+<%block name="title">Search Results - MITx 6.002 Wiki
<%!
from django.core.urlresolvers import reverse
diff --git a/simplewiki_view.html b/simplewiki_view.html
index 05243b0bc1..ef7b02d6b2 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki
+<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki
<%block name="wiki_page_title">
${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}