renalware-core 2.0.51 → 2.0.52

data/app/assets/stylesheets/renalware/partials/_highlight.scss

@@ -1,3 +1,3 @@
 .is-selected td {
-  background-color: #FFFBE5 !important;
+  background-color: #fffbe5 !important;
 }

data/app/assets/stylesheets/renalware/partials/_iframe.scss

@@ -1,5 +1,5 @@
 iframe.fullsize {
   border: 0;
-  width: 100%;
   height: 1px;
+  width: 100%;
 }

data/app/assets/stylesheets/renalware/partials/_layout.scss

@@ -4,35 +4,36 @@ html {
   }
 }
 
-/* New flexbox layout */
-html, body {
+// New flexbox layout
+html,
+body {
   height: 100%;
 }
 
 html {
   body {
-    overflow: hidden;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
 
     > header {
-      flex: 0 0 auto;
       background-color: #dcdcdc;
+      flex: 0 0 auto;
     }
 
-    /* main is a wrapper about non-header content */
+    // main is a wrapper about non-header content
     > main {
       display: flex;
       height: 100%;
       min-height: 0;
 
       > nav {
-        width: $patient-side-nav-width;
         min-width: $patient-side-nav-width;
+        width: $patient-side-nav-width;
       }
 
       > .main-content {
-        position: relative; /* need this to position inner content */
+        position: relative; // need this to position inner content
         width: 100%;
       }
 
@@ -41,8 +42,8 @@ html {
         flex: 1 1 auto;
         height: 100%;
         min-height: 100%;
-        padding-bottom: 2rem;
         overflow-y: auto;
+        padding-bottom: 2rem;
 
         @media print {
           overflow-y: visible;
@@ -59,10 +60,10 @@ html {
     }
   }
 
-  /* When patient menu hidden/shown */
+  // When patient menu hidden/shown
   body.collapse-patient-menu nav.patient-side-nav {
-    margin-left: -15rem;
     left: 0;
+    margin-left: -15rem;
   }
 
   .full-screenable {
@@ -70,7 +71,7 @@ html {
   }
 }
 
-/* End new flexbox layout */
+// End new flexbox layout
 
 footer {
   background-color: $footer-bg-colour;
@@ -102,22 +103,22 @@ footer {
 
 section.display {
   h4 {
-    margin: .1rem 1rem 0 0;
-    float: left;
     clear: left;
-    font-size: 1.3rem;
     color: $dark-grey;
+    float: left;
+    font-size: 1.3rem;
+    margin: .1rem 1rem 0 0;
   }
 
   .section-actions {
-    float: left;
     clear: right;
+    float: left;
 
     a {
       @extend .button;
-      padding: .3rem 1rem;
       font-size: .9rem;
       margin: 0;
+      padding: .3rem 1rem;
     }
   }
 
@@ -143,8 +144,8 @@ section.display {
 
   .non-patient-page-header {
     margin: 0;
-    padding:0;
     margin-bottom: .5rem;
+    padding: 0;
 
     &.with-tabs {
       border-bottom: 1px solid $tab-border-color;
@@ -156,21 +157,22 @@ section.display {
     }
   }
 
-  ul, dl {
-    float: none;
+  ul,
+  dl {
     display: block;
+    float: none;
     margin-bottom: 0;
   }
 
   .sub-nav {
-    top: 1px;
     position: relative;
+    top: 1px;
   }
 
   .page-heading {
-    padding: 1.4rem 0 .7rem;
-    margin: 0;
-    float: left;
     clear: both;
+    float: left;
+    margin: 0;
+    padding: 1.4rem 0 .7rem;
   }
 }

data/app/assets/stylesheets/renalware/partials/_lists.scss

@@ -1,7 +1,7 @@
 
 .dl-horizontal {
-  margin-top: 0;
   margin-bottom: 0;
+  margin-top: 0;
 
   p {
     padding-left: 0;
@@ -17,18 +17,18 @@
   }
 
   dt {
+    clear: left;
     float: left;
-    width: $dl-horizontal-dt-width;
+    margin-bottom: 0;
     overflow: hidden;
-    clear: left;
     text-overflow: ellipsis;
     white-space: nowrap;
-    margin-bottom: 0;
+    width: $dl-horizontal-dt-width;
   }
 
   dd {
-    margin-left: $dl-horizontal-dt-width + 1rem;
     margin-bottom: 0;
+    margin-left: $dl-horizontal-dt-width + 1rem;
 
     &:before {
       content: " ";
@@ -36,9 +36,9 @@
     }
 
     &:after {
+      clear: both;
       content: " ";
       display: table;
-      clear: both;
     }
   }
 
@@ -46,6 +46,7 @@
     dt {
       width: $dl-horizontal-dt-width + 5.5rem;
     }
+
     dd {
       margin-left: $dl-horizontal-dt-width + 6.5rem;
     }
@@ -86,8 +87,8 @@
 
 ul.indented {
   li {
-    text-indent: -1.5em;
     list-style-position: outside;
     padding-left: 1.5em;
+    text-indent: -1.5em;
   }
 }

data/app/assets/stylesheets/renalware/partials/_mdm.scss

@@ -14,10 +14,10 @@
 
 .mdm-page .obs-result {
   :first-child {
-    font-weight: bold;
-    min-width: 2.75rem;
     display: inline-block;
+    font-weight: bold;
     margin-right: .5rem;
+    min-width: 2.75rem;
     white-space: nowrap;
   }
 
@@ -28,9 +28,9 @@
 
 .expandable {
   clear: both;
+  float: left;
   height: 0;
   opacity: 0;
-  float: left;
   width: 100%;
 
   &.expanded {

data/app/assets/stylesheets/renalware/partials/_modal_window.scss

@@ -3,26 +3,28 @@
     border-bottom: solid 1px $winter-sky;
     margin-bottom: 10px;
 
-    h1, h2, h3 {
-      margin: 0 0 0.5rem 0;
-      font-size: 1.3rem;
+    h1,
+    h2,
+    h3 {
       color: $dark-grey;
       display: inline-block;
+      font-size: 1.3rem;
+      margin: 0 0 0.5rem 0;
     }
 
     h3 {
-      font-weight: normal;
       color: $dashboard-muted-color;
+      font-weight: normal;
     }
 
     .reveal-modal-close {
-      position: absolute;
-      top: 0.3rem;
-      right: 0.8rem;
-      font-size: 1.5rem;
       color: $winter-sky;
-      padding: 0.2rem;
+      font-size: 1.5rem;
       font-weight: normal;
+      padding: 0.2rem;
+      position: absolute;
+      right: 0.8rem;
+      top: 0.3rem;
 
       i {
         padding-right: 5px;
@@ -31,7 +33,7 @@
   }
 
   .modal__body {
-    /* remove excessive l and r padding in modals */
+    // remove excessive l and r padding in modals
     .row {
       margin-left: 0;
       margin-right: 0;
@@ -49,41 +51,41 @@
 }
 
 .modal-show {
-  position: relative;
   background: $oil;
   background: rgba(56, 80, 70, 0.5);
-  width: 100%;
   height: 100%;
+  left: 0;
+  position: relative;
   position: fixed;
   top: 0;
-  left: 0;
+  width: 100%;
   z-index: 100;
 }
 
 .modal-window {
   background: $white;
-  width: 600px;
-  margin-left: auto;
-  margin: auto;
-  margin-top: 100px;
-  padding: 20px;
   border-radius: 5px;
   box-shadow: 1px 1px 1px $oil;
   height: 460px;
+  margin: auto;
+  margin-left: auto;
+  margin-top: 100px;
+  padding: 20px;
+  width: 600px;
 }
 
 #modal-holder {
-  width: 560px;
   height: 380px;
   overflow: scroll;
+  width: 560px;
 }
 
 .modal-close {
+  cursor: pointer;
   display: fixed;
   float: right;
-  width: 20px;
   height: 20px;
-  cursor: pointer;
+  width: 20px;
   z-index: 100;
 }
 

data/app/assets/stylesheets/renalware/partials/_navigation.scss

@@ -1,13 +1,13 @@
 .save {
-  background-color: green !important;
+  background-color: #008000 !important;
 }
 
 .cancel {
-  background-color: red !important;
+  background-color: #f00 !important;
 }
 
 .delete {
-  color: red !important;
+  color: #f00 !important;
 }
 
 .sub-nav dd a.has-tip:hover {
@@ -18,18 +18,18 @@
   margin-bottom: 0.8rem;
 
   dd {
-    margin:0;
-    padding:0;
+    margin: 0;
+    padding: 0;
   }
 }
 
 .tooltip {
   background-color: rgba(92,92,92,0.9);
   border-radius: 0.5em;
-  radius: 20px;
-  padding: 6px 8px;
-  font-size: 0.9rem;
   color: $white;
+  font-size: 0.9rem;
+  padding: 6px 8px;
+  radius: 20px;
 }
 
 .tooltip > .nub {
@@ -68,9 +68,9 @@ dd.patient-name {
   }
 
   background-color: $patient-menu-background-colour;
+  min-width: $patient-side-nav-width;
   padding: 0.6rem 0 2rem 0.6rem;
   width: $patient-side-nav-width;
-  min-width: $patient-side-nav-width;
 
   hr {
     margin: 0.3rem 0 0.5rem;
@@ -86,9 +86,9 @@ dd.patient-name {
 
       a {
         border-radius: 3px;
+        color: $nhs-blue;
         padding: 0.1rem 0.5rem;
         text-decoration: underline;
-        color: $nhs-blue;
       }
 
       span {
@@ -100,22 +100,22 @@ dd.patient-name {
         padding-right: .5rem;
 
         a {
-          text-decoration: none;
-          text-align: left;
-          margin-right:1rem;
+          background-color: $light-grey;
+          border-radius: 2px;
+          border-radius: 3px;
+          color: $dark-grey;
           margin-bottom: 0.2rem;
+          margin-right: 1rem;
           margin-top: 0.1rem;
           padding: 0.2rem 0.5rem;
-          background-color: $light-grey;
-          color: $dark-grey;
-          border-radius: 3px;
+          text-align: left;
+          text-decoration: none;
           transition: all 0.3s ease 0s;
-          border-radius: 2px;
 
           &:hover {
             background-color: $nhs-blue;
-            color: $off-white;
             box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.13), 0 1px 3px 0 rgba(0, 0, 0, 0.08);
+            color: $off-white;
           }
         }
       }
@@ -134,18 +134,18 @@ dd.patient-name {
 .patient-side-nav li > a:hover,
 .patient-side-nav li > a:hover:first-child:not(.button) {
   background-color: $link-colour;
-  color: $white;
-  border-top-right-radius: 0;
   border-bottom-right-radius: 0;
+  border-top-right-radius: 0;
+  color: $white;
 }
 
 .patient-side-nav li.active > a,
 .patient-side-nav li.active > a:first-child:not(.button) {
   background-color: $white;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 0;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 0;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 0;
   color: $dark-grey;
   margin-right: 0;
   text-decoration: none;
@@ -158,19 +158,19 @@ dd.patient-name {
 
 .patient-side-nav li.heading {
   color: $dark-grey;
-  font-weight: normal;
   font-size: .9rem;
+  font-weight: normal;
 }
 
 .mdm-top-bar {
   height: 2.3rem;
 
   ul li.name {
+    color: $white;
+    font-size: 1rem;
     height: 2.2rem;
     padding-left: 0.5rem;
     padding-top: 0.4rem;
-    color: $white;
-    font-size: 1rem;
 
     a {
       color: $white;
@@ -187,9 +187,9 @@ dd.patient-name {
 
 .top-bar-section  .dropdown li.info {
   color: rgba(255, 255, 255, 0.5);
-  padding: 0 15px;
-  line-height: 45px;
   font-size: 0.8em;
+  line-height: 45px;
+  padding: 0 15px;
 }
 
 .dropdown.button {
@@ -217,10 +217,10 @@ dd.patient-name {
 // so that the active one seems to have no bottom border.
 .tabs-container {
   border-bottom: 1px solid $tab-border-color;
-  float: left;
-  width: 100%;
   clear: both;
+  float: left;
   margin-bottom: 1rem;
+  width: 100%;
 
   .sub-nav {
     margin: 0;
@@ -230,15 +230,15 @@ dd.patient-name {
 }
 
 .sub-nav dd a {
-  display: block;
-  color: $monsoon;
   background-color: transparent;
-  text-decoration: none;
-  white-space: nowrap;
   border: solid transparent;
-  border-width: 3px 1px 1px;
   border-radius: 3px 3px 0 0;
+  border-width: 3px 1px 1px;
+  color: $monsoon;
+  display: block;
   padding: 0.3rem 1.3rem;
+  text-decoration: none;
+  white-space: nowrap;
 }
 
 .sub-nav dd a:hover {
@@ -246,9 +246,9 @@ dd.patient-name {
 }
 
 .sub-nav dd.active a {
+  background-color: $white;
   border-color: $nhs-orange $tab-border-color transparent;
   color: $dark-grey;
-  background-color: $white;
   padding: 0.3rem 1.3rem;
 }
 
@@ -263,10 +263,10 @@ dd.patient-name {
 
 .f-dropdown li {
   &.disabled {
-    padding: 0.5rem;
     color: $mid-grey;
     cursor: default;
     display: block;
+    padding: 0.5rem;
 
     &:hover {
       background-color: $white;