From dca072beafad04013bfb6342bbfa91cd4c161b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Gonz=C3=A1lez?= Date: Mon, 23 Jan 2017 12:55:05 +0100 Subject: [PATCH] Hide legislation text when the full-screen editor is not active --- .../javascripts/markdown_editor.js.coffee | 2 +- app/assets/stylesheets/admin.scss | 33 +++++++++++++++---- .../legislation/draft_versions/_form.html.erb | 13 ++++---- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/markdown_editor.js.coffee b/app/assets/javascripts/markdown_editor.js.coffee index 121f74ce4..d1bd8dba8 100644 --- a/app/assets/javascripts/markdown_editor.js.coffee +++ b/app/assets/javascripts/markdown_editor.js.coffee @@ -22,9 +22,9 @@ App.MarkdownEditor = $(this).find('.fullscreen-toggle').on 'click', -> $('.markdown-editor').toggleClass('fullscreen') + $('.fullscreen-container').toggleClass('medium-8', 'medium-12') if $('.markdown-editor').hasClass('fullscreen') $('.markdown-editor textarea').height($(window).height() - 100) else $('.markdown-editor textarea').height("10em") - diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 8ab9f8e9b..c6521f692 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -411,6 +411,11 @@ table.investment-projects-summary { .markdown-editor { background-color: white; + + .mardown-area, + #markdown-preview { + display: none; + } } .markdown-editor #markdown-preview { @@ -437,7 +442,9 @@ table.investment-projects-summary { // 06. Legislation // -------------- - +.edit_legislation_draft_version .row { + margin-bottom: 2rem; +} .legislation-admin { .menu .active > a { background: none; @@ -595,6 +602,8 @@ table.investment-projects-summary { } .fullscreen-container { + text-align: center; + background: #ccdbe6; .markdown-editor-header, .markdown-editor-buttons { @@ -602,12 +611,7 @@ table.investment-projects-summary { } a { - - @include breakpoint(medium) { - float: right; - } - - line-height: 3rem; + line-height: 8rem; span { text-decoration: none; @@ -656,13 +660,28 @@ table.investment-projects-summary { .fullscreen { + .mardown-area, + #markdown-preview { + display: block; + } + .column { padding: 0; } .fullscreen-container { + text-align: left; background: $admin-color; padding: 0.5rem 1rem; + margin-bottom: 0; + + a { + line-height: 3rem; + + @include breakpoint(medium) { + float: right; + } + } .markdown-editor-header { vertical-align: top; diff --git a/app/views/admin/legislation/draft_versions/_form.html.erb b/app/views/admin/legislation/draft_versions/_form.html.erb index a29a93ea4..b0dde0e2b 100644 --- a/app/views/admin/legislation/draft_versions/_form.html.erb +++ b/app/views/admin/legislation/draft_versions/_form.html.erb @@ -63,20 +63,19 @@ <%= f.label :body %> <%= t('admin.legislation.draft_versions.form.use_markdown') %> -
-
-
Consul | Editando Versión 3 del proceso Licencias urbanísticas, declaraciones
+
+
Consul | Editando Versión 3 del proceso Licencias urbanísticas, declaraciones
-
- <%= f.submit(class: "button", value: t("admin.legislation.draft_versions.#{admin_submit_action(@draft_version)}.submit_button")) %> -
+
+ <%= f.submit(class: "button", value: t("admin.legislation.draft_versions.#{admin_submit_action(@draft_version)}.submit_button")) %> +
<%= link_to "#", class: 'fullscreen-toggle' do %> <%= t("admin.legislation.draft_versions.form.fullscreen_toggle")%> <% end %>
-
+
<%= f.text_area :body, label: false, placeholder: t('admin.legislation.draft_versions.form.body_placeholder') %>