Merge pull request #6321 from AileenCGN/test

Minor usability improvements for editor screen #6318
This commit is contained in:
Kevin Ansfield 2016-01-12 09:49:08 +00:00
commit 29652eb6a4
2 changed files with 7 additions and 5 deletions

View File

@ -378,11 +378,12 @@
/* Markdown Help Icon + Modal /* Markdown Help Icon + Modal
/* ---------------------------------------------------------- */ /* ---------------------------------------------------------- */
.markdown-help { .markdown-help-icon {
font-size: 16px; font-size: 16px;
} }
.markdown-help:hover { .markdown-help-icon:hover,
.markdown-help-label:hover {
cursor: help; cursor: help;
} }

View File

@ -23,12 +23,12 @@
<section class="view-container view-editor"> <section class="view-container view-editor">
<section class="entry-markdown js-entry-markdown {{if ghEditor.markdownActive 'active'}}"> <section class="entry-markdown js-entry-markdown {{if ghEditor.markdownActive 'active'}}">
<header class="floatingheader"> <header class="floatingheader">
<span class="desktop-tabs">Markdown</span> <span class="desktop-tabs"><a class="markdown-help-label" href="" title="Markdown Help" {{action "openModal" "markdown"}}>Markdown</a></span>
<span class="mobile-tabs"> <span class="mobile-tabs">
<a href="#" {{action 'selectTab' 'markdown' target=ghEditor}} class="{{if ghEditor.markdownActive 'active'}}">Markdown</a> <a href="#" {{action 'selectTab' 'markdown' target=ghEditor}} class="{{if ghEditor.markdownActive 'active'}}">Markdown</a>
<a href="#" {{action 'selectTab' 'preview' target=ghEditor}} class="{{if ghEditor.previewActive 'active'}}">Preview</a> <a href="#" {{action 'selectTab' 'preview' target=ghEditor}} class="{{if ghEditor.previewActive 'active'}}">Preview</a>
</span> </span>
<a class="markdown-help" href="" title="Markdown Help" {{action "openModal" "markdown"}}><i class="icon-markdown"></i></a> <a class="markdown-help-icon" href="" title="Markdown Help" {{action "openModal" "markdown"}}><i class="icon-markdown"></i></a>
</header> </header>
<section id="entry-markdown-content" class="entry-markdown-content"> <section id="entry-markdown-content" class="entry-markdown-content">
{{gh-ed-editor classNames="markdown-editor js-markdown-editor" tabindex="1" spellcheck="true" value=model.scratch setEditor="setEditor" updateScrollInfo="updateEditorScrollInfo" openModal="openModal" onFocusIn="autoSaveNew" height=height focus=shouldFocusEditor}} {{gh-ed-editor classNames="markdown-editor js-markdown-editor" tabindex="1" spellcheck="true" value=model.scratch setEditor="setEditor" updateScrollInfo="updateEditorScrollInfo" openModal="openModal" onFocusIn="autoSaveNew" height=height focus=shouldFocusEditor}}
@ -37,7 +37,8 @@
<section class="entry-preview js-entry-preview {{if ghEditor.previewActive 'active'}}"> <section class="entry-preview js-entry-preview {{if ghEditor.previewActive 'active'}}">
<header class="floatingheader"> <header class="floatingheader">
<span class="desktop-tabs">Preview</span> <span class="desktop-tabs"><a target="_blank" href="{{model.previewUrl}}">
Preview</a></span>
<span class="mobile-tabs"> <span class="mobile-tabs">
<a href="#" {{action 'selectTab' 'markdown' target=ghEditor}} class="{{if ghEditor.markdownActive 'active'}}">Markdown</a> <a href="#" {{action 'selectTab' 'markdown' target=ghEditor}} class="{{if ghEditor.markdownActive 'active'}}">Markdown</a>
<a href="#" {{action 'selectTab' 'preview' target=ghEditor}} class="{{if ghEditor.previewActive 'active'}}">Preview</a> <a href="#" {{action 'selectTab' 'preview' target=ghEditor}} class="{{if ghEditor.previewActive 'active'}}">Preview</a>