improvement: add more whitespace above and below the grid footer temp…

…late
Third-Culture-Software · Nov 26, 2020 · e9510c2 · e9510c2
1 parent bd7cc40
commit e9510c2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 29 deletions.
diff --git a/client/src/css/structure.css b/client/src/css/structure.css
@@ -889,42 +889,23 @@ a[disabled] {
 }
 
 .expired {
-  background-color: #FF7B7B !important;
-}
-
-.icon-expired {
-  color: #FF7B7B !important;
+  background-color: #ff000083 !important;
 }
 
 .icon-expired {
   color: #FF7B7B !important;
 }
 
 .at-risk {
-  background-color: #FFFFA9 !important;
-}
-
-.icon-at-risk {
-  background-color:#FFFFA9 !important;
+  background-color: #ffff6686 !important;
 }
 
 .icon-at-risk {
   color: #FFFFA9 !important;
-  background-color: #FFFFA9;
-  border:1px solid black;
-  height:2.1ex;
-  border-radius:50%;
-  -moz-border-radius:50%;
-  -webkit-border-radius:50%;
-  width:2.1ex;
 }
 
 .at-risk-of-expiring {
-  background-color: #FFB766 !important;
-}
-
-.icon-at-risk-of-expiring {
-  color: #FFB766 !important;
+  background-color: #ff880191 !important;
 }
 
 .icon-at-risk-of-expiring {
@@ -933,15 +914,20 @@ a[disabled] {
 
 .out-of-stock {
   /* text-decoration : line-through; */
-  background-color: #E067FF !important;
+  background-color: #cc00ff8f !important;
 }
 
 .icon-out-of-stock {
   color: #E067FF !important;
 }
 
-.icon-out-of-stock {
-  color: #E067FF !important;
+.legend {
+  border:1px solid black;
+  height:2.1ex;
+  border-radius:50%;
+  -moz-border-radius:50%;
+  -webkit-border-radius:50%;
+  width:2.1ex;
 }
 
 .dropdown-menu {

diff --git a/client/src/i18n/en/stock.json b/client/src/i18n/en/stock.json
@@ -171,6 +171,7 @@
     "RECEPTION_DONATION" : "Stock Entry from a donation",
     "REQUIRES_PO"     : "Requires a purchase order",
     "RESPONSIBLE"     : "Stock Manager",
+    "RISK_OF_EXPIRATION" : "Risk of expiration",
     "ROWS"            : "Rows",
     "SEARCH"          : "Search",
     "SECURITY"        : "Security Stock",

diff --git a/client/src/i18n/fr/stock.json b/client/src/i18n/fr/stock.json
@@ -172,6 +172,7 @@
     "RECEPTION_DONATION" : "Entrée de stock en provenance d'une donation",
     "REQUIRES_PO"     : "Nécessitant une commande d'achat",
     "RESPONSIBLE"     : "Gestionnaire du stock",
+    "RISK_OF_EXPIRATION" : "Risque de péremption",
     "ROWS"            : "Lignes",
     "SEARCH"          : "Chercher",
     "SECURITY"        : "Stock de securité",

diff --git a/client/src/modules/stock/lots/registry.service.js b/client/src/modules/stock/lots/registry.service.js
@@ -151,21 +151,21 @@ function LotsRegistryService(uiGridConstants, Session) {
     }];
 
   service.gridFooterTemplate = `
-    <div>
+    <div class="ui-grid-cell-contents">
       <b>{{ grid.appScope.countGridRows() }}</b>
       <span translate>TABLE.AGGREGATES.ROWS</span>
 
-      <span class="fa fa-circle icon-expired"></span>
+      <span class="fa fa-circle icon-expired legend"></span>
       <strong>
         <span translate>STOCK.EXPIRATION</span>:
       </strong>
 
-      <span class="fa fa-circle icon-at-risk"></span>
+      <span class="fa fa-circle icon-at-risk legend"></span>
       <strong>
         <span translate>STOCK.RISK_OF_EXPIRATION</span>:
       </strong>
 
-      <span class="fa fa-circle icon-out-of-stock"></span>
+      <span class="fa fa-circle icon-out-of-stock legend"></span>
       <strong>
         <span translate>STOCK.STATUS.STOCK_OUT</span>:
       </strong>