From c0e6b0fe10dfe8591b8e7667af25a88a598df831 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 1 Jun 2016 07:23:12 -0400 Subject: [PATCH 1/2] these styles belong in layout --- app/styles/_layout.scss | 13 +++++++++++++ app/styles/_temp_misc.scss | 10 ---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index c6c48603b9..edabaaa589 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -5,6 +5,19 @@ .view-current-title { @include view_main_heading; } +// panel styles + +.panel-primary { + position: relative; + border: 0; + background-color: $white; + color: $navy_mid2; + + input, + textarea, + select { background: rgba($blue_light,.2); } +} + // ? unsure what below are for... .detail-section-content { diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index ce22d6cdb9..b7dcfcb3fd 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -60,16 +60,6 @@ label { font-weight: 300; } } -.panel-primary { - border: 0; - background-color: $white; - color: $navy_mid2; - - input, - textarea, - select { background: rgba($blue_light,.2); } -} - .modal-dialog { color: $navy; } .not-editable { From 0e3ce410775f4f3a13a6f2a9e9cdc11e0cd4e3d0 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 1 Jun 2016 07:37:43 -0400 Subject: [PATCH 2/2] add styles for pagination buttons; fix positioning --- app/components/nav-paging.js | 2 +- app/styles/app.scss | 1 + app/styles/components/_pagination.scss | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 app/styles/components/_pagination.scss diff --git a/app/components/nav-paging.js b/app/components/nav-paging.js index a8a03d93bd..8cb13a6c3c 100644 --- a/app/components/nav-paging.js +++ b/app/components/nav-paging.js @@ -1,6 +1,6 @@ import Ember from 'ember'; import PagingActions from 'hospitalrun/mixins/paging-actions'; export default Ember.Component.extend(PagingActions, { - classNames: ['btn-group', 'pull-right'], + classNames: ['paging-buttons'], paginationProps: null }); diff --git a/app/styles/app.scss b/app/styles/app.scss index a32dfb88c0..f6e13df1b4 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -16,6 +16,7 @@ @import 'components/form_styles'; @import 'components/tab_nav'; @import 'components/tab_content'; +@import 'components/pagination'; @import 'components/patient_summary'; @import 'components/patient_history'; @import 'components/imaging'; diff --git a/app/styles/components/_pagination.scss b/app/styles/components/_pagination.scss new file mode 100644 index 0000000000..af2c321f09 --- /dev/null +++ b/app/styles/components/_pagination.scss @@ -0,0 +1,9 @@ +// styles for pagination +// +// visible on patient listing and any other +// view with pagination +.paging-buttons { + position: absolute; + top: 3px; + right: 3px; +}