From 1ce5062800957705f3c6c03aac0e9eb5cc54c90b Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 10 Jul 2014 14:08:32 +0100 Subject: [PATCH] Add in link to go back to projects --- .../app/views/project/editor/left-menu.jade | 134 +++++++++--------- .../stylesheets/app/editor/left-menu.less | 34 ++++- 2 files changed, 92 insertions(+), 76 deletions(-) diff --git a/services/web/app/views/project/editor/left-menu.jade b/services/web/app/views/project/editor/left-menu.jade index f5f3e3e133..2bd16d602b 100644 --- a/services/web/app/views/project/editor/left-menu.jade +++ b/services/web/app/views/project/editor/left-menu.jade @@ -2,9 +2,17 @@ aside#left-menu.full-size( ng-class="{ 'shown': ui.leftMenuShown }" ng-cloak ) + ul.list-unstyled.nav + li + a( + href="/project" + ) + i.fa.fa-list-alt.fa-fw + |   View All Projects + h4 Download - ul.unformatted-list.nav.nav-downloads + ul.list-unstyled.nav.nav-downloads li a( ng-href="/project/{{project_id}}/download/zip" @@ -35,87 +43,73 @@ aside#left-menu.full-size( form.settings(ng-controller="SettingsController") .containter-fluid .form-controls - .row - label.col-md-6(for="compiler") Compiler - .col-md-6 - select.form-control( - name="compiler" - ng-model="project.compiler" - ) - option(value='pdflatex') pdfLaTeX - option(value='latex') LaTeX - option(value='xelatex') XeLaTeX - option(value='lualatex') LuaLaTeX + label(for="compiler") Compiler + select.form-control( + name="compiler" + ng-model="project.compiler" + ) + option(value='pdflatex') pdfLaTeX + option(value='latex') LaTeX + option(value='xelatex') XeLaTeX + option(value='lualatex') LuaLaTeX .form-controls - .row - label.col-md-6(for="spellCheckLanguage") Spell Check - .col-md-6 - select.form-control( - name="spellCheckLanguage" - ng-model="project.spellCheckLanguage" - ) - option(value="") Off - optgroup(label="Language") - for language in languages - option( - value=language.code - )= language.name + label(for="spellCheckLanguage") Spell Check + select.form-control( + name="spellCheckLanguage" + ng-model="project.spellCheckLanguage" + ) + option(value="") Off + optgroup(label="Language") + for language in languages + option( + value=language.code + )= language.name .form-controls - .row - label.col-md-6(for="autoComplete") Auto-Complete - .col-md-6 - select.form-control( - name="autoComplete" - ng-model="settings.autoComplete" - ng-options="o.v as o.n for o in [{ n: 'On', v: true }, { n: 'Off', v: false }]" - ) + label(for="autoComplete") Auto-Complete + select.form-control( + name="autoComplete" + ng-model="settings.autoComplete" + ng-options="o.v as o.n for o in [{ n: 'On', v: true }, { n: 'Off', v: false }]" + ) .form-controls - .row - label.col-md-6(for="theme") Theme - .col-md-6 - select.form-control( - name="theme" - ng-model="settings.theme" - ) - each theme in themes - option(value=theme) #{theme} + label(for="theme") Theme + select.form-control( + name="theme" + ng-model="settings.theme" + ) + each theme in themes + option(value=theme) #{theme} .form-controls - .row - label.col-md-6(for="mode") Keybindings - .col-md-6 - select.form-control( - name="mode" - ng-model="settings.mode" - ) - option(value='default') None - option(value='vim') Vim - option(value='emacs') Emacs + label(for="mode") Keybindings + select.form-control( + name="mode" + ng-model="settings.mode" + ) + option(value='default') None + option(value='vim') Vim + option(value='emacs') Emacs .form-controls - .row - label.col-md-6(for="fontSize") Font Size - .col-md-6 - select.form-control( - name="fontSize" - ng-model="settings.fontSize" - ) - each size in ['10','11','12','13','14','16','20','24'] - option(value=size) #{size}px + label(for="fontSize") Font Size + select.form-control( + name="fontSize" + ng-model="settings.fontSize" + ) + each size in ['10','11','12','13','14','16','20','24'] + option(value=size) #{size}px .form-controls - .row - label.col-md-6(for="pdfViewer") PDF Viewer - .col-md-6 - select.form-control( - name="pdfViewer" - ng-model="settings.pdfViewer" - ) - option(value="pdfjs") Built-In - option(value="native") Native + label(for="pdfViewer") PDF Viewer + select.form-control( + name="pdfViewer" + ng-model="settings.pdfViewer" + ) + option(value="pdfjs") Built-In + option(value="native") Native #left-menu-mask( ng-show="ui.leftMenuShown", diff --git a/services/web/public/stylesheets/app/editor/left-menu.less b/services/web/public/stylesheets/app/editor/left-menu.less index 41959e0cfc..d3f9fa6d81 100644 --- a/services/web/public/stylesheets/app/editor/left-menu.less +++ b/services/web/public/stylesheets/app/editor/left-menu.less @@ -31,6 +31,23 @@ margin-top: 0; } + ul.nav { + a { + &:hover, &:active { + background-color: @link-color; + color: white; + i { + color: white; + } + } + i { + color: @gray; + } + padding: (@line-height-computed / 4); + font-weight: 700; + } + } + ul.nav-downloads { li { display: inline-block; @@ -38,28 +55,27 @@ width: 100px; a { color: @gray-dark; - &:hover, &:active { - background-color: @link-color; - color: white; - } } .pdf-disabled { color: @gray-light; } i { - margin-bottom: (@line-height-computed / 4); + margin: (@line-height-computed / 4) 0; } } } form.settings { label { + float: left; font-weight: normal; color: @gray-dark; margin-bottom: 0; - padding-top: 8px; + padding-top: 7px; } select.form-control { + float: right; + width: 50%; height: 34px; background: none; border: none; @@ -70,6 +86,7 @@ font-weight: 700; } .form-controls { + clear: both; padding: 0 (@line-height-computed / 4); &:hover { background-color: @link-color; @@ -80,6 +97,11 @@ color: white; } } + &:after { + content:""; + display:table; + clear:both; + } } } }