diff --git a/.DS_Store b/.DS_Store index 5a0cb2b53d..a630216fad 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/sass/.DS_Store b/sass/.DS_Store index 293c0b03ea..108b7e7ea0 100644 Binary files a/sass/.DS_Store and b/sass/.DS_Store differ diff --git a/sass/_wiki-create.scss b/sass/_wiki-create.scss index 5ca3ec9f0f..78bc8434da 100644 --- a/sass/_wiki-create.scss +++ b/sass/_wiki-create.scss @@ -1,22 +1,51 @@ form#wiki_revision { + float: left; + width: flex-grid(7, 9); + margin-right: flex-gutter(9); + + label { display: block; margin-bottom: 7px ; } + textarea { @include box-sizing(border-box); margin-bottom: 20px; - min-height: 300px; + min-height: 450px; width: 100%; } input[type="text"] { + display: block; width: 50%; } + #submit_delete { + float: right; + } + input[type="submit"] { - display: block; margin-top: 20px; } } + +#wiki_edit_instructions { + float: left; + width: flex-grid(2, 9); + + .markdown-example { + background-color: $light-gray; + padding-top: 5px; + padding-right: 2px; + padding-bottom: 5px; + padding-left: 5px; + + margin-top: 5px; + margin-bottom: 7px; + margin-left: 5px; + + line-height: 1.0; + } +} diff --git a/sass/_wiki.scss b/sass/_wiki.scss index d05f466048..b26fe2c6ad 100644 --- a/sass/_wiki.scss +++ b/sass/_wiki.scss @@ -77,7 +77,7 @@ div.wiki-wrapper { section.wiki-body { @extend .content; - + header { @extend .topbar; diff --git a/simplewiki_create.html b/simplewiki_create.html index 6e250dc527..3d820310f6 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -16,4 +16,7 @@ Create article + +<%include file="simplewiki_instructions.html"/> + diff --git a/simplewiki_edit.html b/simplewiki_edit.html index fbb4b143a3..fc5f63d970 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -8,13 +8,14 @@ ${ wiki_article.title } <%block name="wiki_body">
-
- -
- +
+ +
${wiki_form} - - - + +
+ +<%include file="simplewiki_instructions.html"/> + diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html new file mode 100644 index 0000000000..9f52f4e370 --- /dev/null +++ b/simplewiki_instructions.html @@ -0,0 +1,22 @@ +
+ This wiki uses Markdown for styling. There are several useful guides online. +
+
MITx Additions: +

circuit:basic

+

$LaTeX Math Expression$

+ To create a new wiki article, create a link to it. Clicking the link gives you the creation page. +

[Article](/wiki/view/Article/Child/)

+ Other useful examples:
+

[Link](http://google.com)

+

Huge Header +
====

+

Smaller Header +
-------

+

*emphasis* or _emphasis_

+

**strong** or __strong__

+

- Unordered List +
  - Sub Item 1 +
  - Sub Item 2

+

1. Ordered +
2. List

+