From cddff247a402a089170aa99054b7f22e9318fcf8 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 1 Jul 2014 17:58:42 +0200 Subject: [PATCH] Some minor style improvements --- ...ection_arrange_tables_controller.js.coffee | 2 +- .../modal_section_arrange_tables.emblem | 22 +++++-------------- .../supplier/foundation1/_qsections.css.sass | 4 ++++ 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee index 48a64434..e1c56d35 100644 --- a/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modal_section_arrange_tables_controller.js.coffee @@ -1,5 +1,5 @@ Qsupplier.App.ModalSectionArrangeTablesController = Ember.ObjectController.extend - arrange_type: 'distributed' + arrange_type: 'distributed' # can be distributed, by_row or by_column by_row_count: 0 by_column_count: 0 isDistributed: (->@get('arrange_type') is 'distributed').property('arrange_type') diff --git a/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem b/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem index 7db29599..0631bc53 100644 --- a/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem +++ b/app/assets/javascripts/supplier/app/templates/modal_section_arrange_tables.emblem @@ -21,23 +21,13 @@ modal-dialog action="close" if isDistributed span.explanation if isByRow - .form-row - .form-label - label for="arrange-tables-by-row-count" - = t 'section.arrange_tables.modal.by_row_count' - .form-field - Qsupplier.App.NumberField valueBinding="by_row_count" - /input.input-mini#arrange-tables-by-row-count type="text" value=0 - =t 'models.plural.table' + = t 'section.arrange_tables.modal.by_row_count' + Qsupplier.App.NumberField valueBinding="by_row_count" + =t 'models.plural.table' if isByColumn - .form-row - .form-label - label for="arrange-tables-by-column-count" - = t 'section.arrange_tables.modal.by_column_count' - .form-field - Qsupplier.App.NumberField valueBinding="by_column_count" - /input.input-mini#arrange-tables-by-row-count type="text" value=0 - =t 'models.plural.table' + = t 'section.arrange_tables.modal.by_column_count' + Qsupplier.App.NumberField valueBinding="by_column_count" + =t 'models.plural.table' .modal-footer hr button.confirm-cancel{action "close"}=t 'section.arrange_tables.modal.close_button' diff --git a/app/assets/stylesheets/supplier/foundation1/_qsections.css.sass b/app/assets/stylesheets/supplier/foundation1/_qsections.css.sass index febfaea6..3523e35d 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qsections.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qsections.css.sass @@ -24,6 +24,10 @@ .section-actions-menu-header padding-top: 4px padding-bottom: 4px +.arrange-content + input + width: 62px + display: inline-block .section-manage-tables .dropdown-container margin-right: 10px