Merge pull request #484 from HospitalRun/pagination-button-style-fix

Pagination button tweaks
HospitalRun · Jun 1, 2016 · a326b22 · a326b22
2 parents 5e59a1a + 0e3ce41
commit a326b22
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git 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/_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
@@ -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 {

diff --git 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
@@ -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;
+}