From 39b3cd61118cf5fc9b9cb03f24c08163aa940a84 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Thu, 14 May 2015 11:06:29 -0700 Subject: [PATCH] Add instructions to markdown editor --- src/jade/templates/markdown_section.jade | 4 ++++ src/scss/main.scss | 2 +- src/scss/templates/markdown_section.scss | 13 +++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/jade/templates/markdown_section.jade b/src/jade/templates/markdown_section.jade index b06fe439f..777e6f337 100644 --- a/src/jade/templates/markdown_section.jade +++ b/src/jade/templates/markdown_section.jade @@ -11,6 +11,10 @@ .waiting.hideable: img(src='/images/wait.gif') .markdown.hideable.hidden .editor.hideable.hidden + .instructions + p. + Edit using GitHub + Flavored Markdown. Use [[Item Name]] to link to another item. textarea .sizer .creating.hideable.hidden diff --git a/src/scss/main.scss b/src/scss/main.scss index 36bd768a0..45854bd2d 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -40,7 +40,7 @@ $font-family-input: monospace; // Font Sizes ////////////////////////////////////////////////////////////////////////////////////// -$font-size-small: 1.0em; +$font-size-small: 1.25em; $font-size-normal: 1.5em; $font-size-large: 2.0em; $font-size-x-large: 3.0em; diff --git a/src/scss/templates/markdown_section.scss b/src/scss/templates/markdown_section.scss index 9fbdfcd91..e376f6661 100644 --- a/src/scss/templates/markdown_section.scss +++ b/src/scss/templates/markdown_section.scss @@ -67,7 +67,7 @@ All rights reserved. width: 100%; position: relative; - min-height: 10em; + min-height: 11.5em; textarea, .sizer { width: 100%; @@ -77,7 +77,7 @@ All rights reserved. } textarea { - position: absolute; height: 100%; width: 100%; + position: absolute; height: calc(100% - 1.5em); width: 100%; background: $color-gray-faint; resize: none; @@ -89,6 +89,15 @@ All rights reserved. } } + .instructions { + margin-bottom: 0.75em; + + p { + color: $color-gray-medium; + font-size: $font-size-small; + } + } + .sizer { padding-bottom: 1.5em; visibility: hidden;