Merge pull request #364 from afaneca/develop

5.7.0
afaneca · Nov 25, 2023 · 51c294b · 51c294b
2 parents 2d0a37f + 9c52401
commit 51c294b
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 48 deletions.
diff --git a/css/main.css b/css/main.css
@@ -533,17 +533,51 @@ table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
 }
 
 /* Tooltip container */
-.tooltip {
+.myfin-tooltip-trigger {
+    position: relative;
+    display: block;
+    /*border-bottom: 1px dotted black; !* If you want dots under the hoverable text *!*/
+}
+
+.myfin-tooltip-text {
+    visibility: hidden;
+    background-color: #1f2125bf;
+    color: #fff;
+    /*text-align: center;*/
+    padding: 10px;
+    border-radius: 6px;
+
+    /* Position the tooltip text */
+    position: absolute;
+    /*z-index: 1;*/
+    z-index: 2222222;
+    bottom: 125%;
+
+    /* Fade in tooltip */
+    opacity: 0;
+    transition: opacity 0.3s;
+
+    font-size: smaller;
+    width: max-content;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.myfin-tooltip-trigger:hover .myfin-tooltip-text {
+    visibility: visible;
+    opacity: 1;
+}
+
+.budget-category-tooltip {
     position: relative;
     display: block;
     /*border-bottom: 1px dotted black; !* If you want dots under the hoverable text *!*/
 }
 
 /* Tooltip text */
-.tooltip .tooltiptext {
+.budget-category-tooltip .budget-category-tooltip-text {
     visibility: hidden;
     /*width: 120px;*/
-    background-color: #555;
+    background-color: #1f2125fc;
     color: #fff;
     /*text-align: center;*/
     padding: 10px;
@@ -566,7 +600,7 @@ table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
 }
 
 /* Tooltip arrow */
-.tooltip .tooltiptext::after {
+.budget-category-tooltip .budget-category-tooltip-text::after {
     content: "";
     position: absolute;
     top: 100%;
@@ -578,7 +612,7 @@ table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
 }
 
 /* Show the tooltip text when you mouse over the tooltip container */
-.tooltip:hover .tooltiptext {
+.budget-category-tooltip:hover .budget-category-tooltip-text {
     visibility: visible;
     opacity: 1;
 }

diff --git a/js/budgetDetails.js b/js/budgetDetails.js
diff --git a/js/categories.js b/js/categories.js
diff --git a/js/consts.js b/js/consts.js
diff --git a/js/funcs/investmentAssetsTableFunc.js b/js/funcs/investmentAssetsTableFunc.js
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -424,7 +424,8 @@
     "roi": "ROI",
     "assetClass": "Asset Class",
     "feesAndTaxes": "Fees & taxes",
-    "showInactives": "Show Inactives"
+    "showInactives": "Show Inactives",
+    "updateValue": "Update Value"
   },
   "stats": {
     "stats": "Stats",

diff --git a/locales/pt/translation.json b/locales/pt/translation.json
@@ -425,7 +425,8 @@
     "roi": "ROI",
     "assetClass": "Classe de Ativos",
     "feesAndTaxes": "Taxas e impostos",
-    "showInactives": "Mostrar Inativos"
+    "showInactives": "Mostrar Inativos",
+    "updateValue": "Atualizar Valor"
   },
   "stats": {
     "stats": "Estatísticas",

diff --git a/myfin.html b/myfin.html
@@ -13,7 +13,7 @@
 
     <!-- Compiled and minified CSS -->
     <link rel="stylesheet"
-          href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0/dist/css/materialize.min.css">
+          href="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.2.2/dist/css/materialize.min.css">
     <link rel="stylesheet" href="https://cdn.datatables.net/1.10.20/css/jquery.dataTables.min.css">
     <link rel="stylesheet" href="./js/external/monthpicker/monthpicker.css">
     <link href="https://unpkg.com/tabulator-tables@4.5.3/dist/css/tabulator.min.css" rel="stylesheet">
@@ -156,7 +156,7 @@
 <script src="./js/external/js.cookie.js" type="text/javascript"></script>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
 <script src="https://cdn.datatables.net/1.10.20/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.1.0/dist/js/materialize.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@materializecss/materialize@1.2.2/dist/js/materialize.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/chart.js@3.8.0/dist/chart.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-trendline"></script>
 <script src="./js/external/monthpicker/monthpicker.js"></script>

diff --git a/views/budgetDetails.html b/views/budgetDetails.html
@@ -110,7 +110,6 @@ <h4><span data-i18n="common.credit"></span></h4>
     $('#conclusion-close-btn').click(() => BudgetDetails.onBudgetCloseClicked())
     $('#clone-month-btn').click(() => BudgetDetails.onCloneMonthClicked())
 
-    $('.tooltipped').tooltip()
     DialogUtils.initStandardModal()
   })
 </script>