renalware-core 2.0.149 → 2.0.156

data/app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss

@@ -4,7 +4,7 @@ span.select2 {
 }
 
 .grouped_select {
-  margin-bottom: 0.7rem;
+   // margin-bottom: 0.7rem;
 
   label {
     margin-bottom: 0;

data/app/assets/stylesheets/renalware/modules/_hd.scss

@@ -411,19 +411,23 @@ use flexbox to layout items inside each prescription.
       .hd-drug--name {
         font-weight: bold;
       }
+
       .hd-drug--name,
       .hd-drug--dose,
       .hd-drug--route,
       .hd-drug--prescribed-on,
-      .hd-drug--frequency {
+      .hd-drug--frequency,
+      .hd-drug--prescriber-name,
+      .hd-drug--prescriber-position {
         display: inline-block;
         padding-right: .5rem;
         color: $dark-grey;
       }
 
-      .hd-drug--prescriber-name {
-        display: inline-block;
-        color: $mid-grey;
+      .hd-drug--prescriber-name,
+      .hd-drug--prescriber-position {
+        color: $muted-dark-grey;
+        padding-right: .3rem;
       }
 
       .hd-drug--termination {

data/app/assets/stylesheets/renalware/modules/_medications.scss

@@ -57,15 +57,15 @@ tbody tr {
 }
 
 .medications-filter {
-  select {
-    width: 250px;
-  }
-
-  .button {
-    border-bottom-left-radius: 0 !important;
-    border-top-left-radius: 0 !important;
-    padding: .53rem 1rem;
-  }
+  // select {
+  //   width: 250px;
+  // }
+
+  // .button {
+  //   border-bottom-left-radius: 0 !important;
+  //   border-top-left-radius: 0 !important;
+  //   padding: .53rem 1rem;
+  // }
 }
 
 .find-drug-list ul.drug-results-admin {

data/app/assets/stylesheets/renalware/modules/_pathology.scss

@@ -37,10 +37,17 @@ table#observations {
 
     td {
       height: 2rem;
-      overflow: visible;
+      overflow: hidden;
       padding: 0 .2rem;
       position: relative;
       text-align: center;
+      text-overflow: ellipsis;
+      max-width: 4rem;
+
+      &.triangle_in_corner {
+        overflow: visible;
+        max-width: unset;
+      }
 
       // Generated with http://triangle.designyourcode.io/
       .triangle-top-right {

data/app/assets/stylesheets/renalware/modules/_patients.scss

@@ -354,6 +354,10 @@ form {
 }
 
 .page--patients-clinical_summaries {
+  .summary-part--messages {
+    @include grid-column(12);
+  }
+
   .summary-part--letters {
     @include grid-column(12);
   }

data/app/assets/stylesheets/renalware/modules/_pd.scss

@@ -1,3 +1,38 @@
+.pet-results--samples-table,
+.adequacy-results--samples-table {
+  max-width: 640px;
+
+  th {
+    width: 14.3%;
+  }
+
+  thead, tbody, th, td {
+    border: none;
+    text-align: center;
+  }
+
+  input {
+    margin: 0;
+  }
+}
+
+.adequacy-path-table {
+  background-color: transparent;
+  thead, tbody, th, td {
+    border: none;
+    text-align: center;
+  }
+
+  thead tr:first-child th {
+    font-style: italic;
+    text-align: center;
+  }
+
+  .bottom-border {
+    border-bottom: 1px solid #ccc;
+  }
+}
+
 .current-regime {
   h3 {
     font-size: 1rem;

data/app/assets/stylesheets/renalware/modules/_users.scss

@@ -1,4 +1,5 @@
-.admin-users {
+.admin-users,
+.all-users {
   td.approved {
     color: $nhs-light-green;
     text-align: center;

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

@@ -0,0 +1,17 @@
+.bart-chart-icon {
+  position: relative; // required for safari otherwise user cannot click on :before content
+  display: inline-block; // required otherwise IE11 will not be able to click on it
+
+  i {
+    @extend %fa-icon;
+    @extend .fas;
+    font-weight: 600;
+    pointer-events: none;
+    text-align: center;
+    width: 1.2rem;
+
+    &:before {
+      content: asset-data-url("renalware/icons/bar-chart.svg");
+    }
+  }
+}

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

@@ -29,6 +29,17 @@ textarea.monospace {
     display: none;
   }
 }
+.filters--flex {
+  .flex {
+    input, select, .select2 {
+      margin: 0;
+    }
+
+    .button {
+      padding: .5rem 1rem
+    }
+  }
+}
 
 // Hide up down arrows on number inputs
 input[type="number"]::-webkit-inner-spin-button,
@@ -182,6 +193,10 @@ article {
         display: inline-block;
         margin-right: .5rem;
       }
+
+      &.right {
+        text-align: right;
+      }
     }
 
     h3 {
@@ -205,7 +220,7 @@ article {
       color: $white;
       display: block;
       float: right;
-      padding: 0.3rem 0.4rem;
+      padding: 0.2rem 0.4rem;
       text-decoration: none;
       margin-left: 0.5rem;
 

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

@@ -49,11 +49,6 @@ dd.patient-name {
   display: none;
 }
 
-[data-magellan-expedition],
-[data-magellan-expedition-clone] {
-  padding: 5px 0;
-}
-
 .sub-nav.fixed {
   left: auto;
 }
@@ -212,7 +207,9 @@ dd.patient-name {
   color: rgba(255, 255, 255, 0.5);
   font-size: 0.8em;
   line-height: 45px;
-  padding: 0 15px;
+  padding: 0 8px;
+  border-top: solid 1px #666;
+  text-transform: uppercase;
 }
 
 .dropdown.button {
@@ -255,7 +252,8 @@ dd.patient-name {
   width: 100%;
 }
 
-.sub-nav dd {
+.sub-nav dd,
+.sub-nav li {
   margin: 0 0.25rem 0 0;
 }
 
@@ -276,7 +274,8 @@ dd.patient-name {
   }
 }
 
-.sub-nav dd a {
+.sub-nav dd a,
+.sub-nav li a {
   background-color: transparent;
   border: solid transparent;
   border-radius: 3px 3px 0 0;
@@ -288,22 +287,26 @@ dd.patient-name {
   white-space: nowrap;
 }
 
-.sub-nav dd a:hover {
+.sub-nav dd a:hover,
+.sub-nav li a:hover {
   color: $dark-grey;
 }
 
-.sub-nav dd.active a {
+.sub-nav dd.active a,
+.sub-nav li.active a {
   background-color: $white;
   border-color: $nhs-orange $tab-border-color transparent;
   color: $dark-grey;
   padding: 0.3rem 1.3rem;
 }
 
-.sub-nav dd.active {
+.sub-nav dd.active,
+.sub-nav li.active {
   font-weight: bold;
 }
 
-.sub-nav dd.active a:hover {
+.sub-nav dd.active a:hover,
+.sub-nav li.active a:hover {
   background-color: $white;
   color: $dark-grey;
 }

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

@@ -61,7 +61,7 @@
   }
 
   .hint {
-    color: $form-hint-colour;
+    color: $form-hint-colour-strong;
     display: block;
     font-size: 0.75rem;
     font-style: italic;
@@ -140,5 +140,13 @@
         }
       }
     }
+
+    &.wrapper_size_xs {
+      > .wrapper__input {
+        @media #{$small-up} {
+          @include grid-column(2, $last-column: false);
+        }
+      }
+    }
   }
 }

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

@@ -228,6 +228,21 @@ table {
   }
 
   tr td {
+    &.with-ellipsis {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: 0;
+    }
+
+    &.col-width-small-with-ellipsis {
+      min-width: 5.1rem;
+      max-width: 5.1rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
     &.col-width-medium-with-ellipsis {
       max-width: 7rem;
       min-width: 5rem;
@@ -427,14 +442,6 @@ td {
       font-size: 0.9em;
     }
 
-    .accordion dd > a.toggle-info {
-      background: none;
-      border-radius: 0.5em;
-      color: $link-colour;
-      font-size: 0.9em;
-      padding: 0 0.3em 0 0.3em;
-    }
-
     thead,
     tbody,
     th,

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

@@ -1,62 +1,3 @@
-.accordion .accordion-navigation > .content,
-.accordion dd > .content {
-  color: $nhs-dark-red;
-  font-weight: normal;
-  padding: 0.25rem 0.5rem;
-}
-
-.accordion-navigation.active {
-  background-color: $white;
-  border-radius: 3px;
-}
-
-.accordion .accordion-navigation > a,
-.accordion dd > a {
-  border-radius: 0.5em;
-  font-size: 1rem;
-  padding: 0 0.5em 0 0;
-  text-decoration: none;
-}
-
-.accordion-navigation a span {
-  color: $dark-grey;
-}
-
-.accordion-navigation a .when {
-  font-weight: bold;
-}
-
-.accordion-navigation a .what,
-.accordion-navigation a .about {
-  color: $link-colour;
-  text-decoration: underline;
-}
-
-.accordion-navigation a .whom {
-  color: $nhs-dark-blue;
-  font-weight: bold;
-}
-
-.accordion .accordion-navigation.active > a,
-.accordion dd.active > a {
-  background-color: $white;
-}
-
-.accordion a.toggle-info:hover {
-  background-color: $link-colour;
-  color: $white;
-}
-
-.accordion a.toggle-info:hover span,
-.accordion a.toggle-info:hover:before {
-  color: $white;
-}
-
-.accordion .active a.toggle-info:hover {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
 .hide-button {
   display: none;
 }
@@ -115,13 +56,6 @@
   display: none;
 }
 
-.accordion dd > a.toggle-info {
-  background: none;
-  border-radius: 3px;
-  color: $link-colour;
-  padding: 0 0.3em 0 0.3em;
-}
-
 .toggle-text {
   font-size: 0.8em;
 }

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

@@ -66,6 +66,24 @@ th.togglers {
     }
   }
 
+  &.easy-read {
+    .toggleable--open {
+      tr,
+      tr:hover {
+        background-color: #fffeee;
+
+        td {
+          border-bottom-color: #eee;
+        }
+
+        p {
+          margin-left: 0;
+          padding-left: 0;
+        }
+      }
+    }
+  }
+
   tbody {
     tr:last-child {
       display: none

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

@@ -1,3 +1,15 @@
+
+// TailwindCSS overides and set all li to have no style - which is pretty mean - so reverting here
+.trix-content {
+  ul li {
+    list-style: initial;
+  }
+
+  ol li {
+    list-style: decimal;
+  }
+}
+
 trix-toolbar {
   display: inline-block;