Merge pull request #347 from afaneca/develop

5.3.0
afaneca · Nov 1, 2023 · f893c42 · f893c42
2 parents 7ebb8f8 + 47f3d74
commit f893c42
Show file tree

Hide file tree

Showing 33 changed files with 266 additions and 66 deletions.
diff --git a/css/dashboard.css b/css/dashboard.css
@@ -12,16 +12,3 @@
     color: var(--main-text-color);
     font-size: small;
 }
-
-#dashboard-trx-list-see-more {
-    font-weight: bold;
-    text-decoration: underline;
-    text-underline-position: under;
-    text-decoration-thickness: 2px;
-    transition: 1s;
-}
-
-#dashboard-trx-list-see-more:hover {
-    text-decoration: none;
-    transition: 1s;
-}
diff --git a/css/main.css b/css/main.css
@@ -527,6 +527,9 @@ table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
 
 .top-summary-key {
     font-size: small;
+    background: var(--main-card-background);
+    padding: 6px;
+    border-radius: 5px;
 }
 
 /* Tooltip container */
@@ -1053,6 +1056,55 @@ svg:not(:root) {
     border: 2px solid var(--main-accent-color);
 }
 
+[type=checkbox].filled-in:checked+span:not(.lever):after {
+    top: 0;
+    width: 20px;
+    height: 20px;
+    border: 2px solid var(--main-accent-color);
+    background-color: var(--main-accent-color);
+    z-index: 0;
+}
+
 [type=radio]:not(:checked)+span:before, [type=radio]:not(:checked)+span:after {
     border: 2px solid var(--main-accent-color);
+}
+
+.z-depth-1, nav, .card-panel, .card, .toast, .btn, .btn-large, .btn-small, .btn-floating, .dropdown-content, .collapsible, .sidenav {
+    /* -webkit-box-shadow: 0 0px 0px 0 rgb(0 0 0 / 14%), 0 1px 1px -2px rgb(0 0 0 / 12%), 0 1px 4px 0 rgb(0 0 0 / 20%); */
+    /* box-shadow: 0 0px 0px 0 rgb(0 0 0 / 14%), 0 1px 1px -2px rgb(0 0 0 / 12%), 0 1px 4px 0 rgb(0 0 0 / 20%); */
+    border-radius: 5px;
+    -webkit-box-shadow: 0 1px 10px 0 rgba(69,90,100,.08);
+    box-shadow: 0 1px 10px 0 rgba(69,90,100,.08);
+    border: none;
+}
+
+.table-toolbar {
+    float:left;
+}
+
+.bold-link {
+    font-weight: bold;
+    text-decoration: underline;
+    text-underline-position: under;
+    text-decoration-thickness: 2px;
+    transition: 1s;
+}
+
+.bold-link:hover {
+    text-decoration: none;
+    transition: 1s;
+}
+
+.regular-link {
+    font-weight: normal;
+    text-decoration: underline;
+    text-underline-position: under;
+    text-decoration-thickness: 2px;
+    transition: 1s;
+    cursor: pointer;
+}
+
+.regular-link:hover {
+    text-decoration: none;
+    transition: 1s;
 }
diff --git a/css/themes/light_theme.css b/css/themes/light_theme.css
@@ -4,12 +4,12 @@
 
     --main-light-gray-color: #7f8285;
     --main-accent-color: var(--main-light-blue);
-    --main-body-background: linear-gradient(rgb(248, 250, 253) 0%, rgba(248, 250, 253, 0) 413px); /*var(--main-light-gray-color);*/
+    --main-body-background: #f3f3f3;
     --main-sidebar-background: white;
     --main-card-background: white;
     --main-modal-background: white;
     --main-disabled-color: var(--light-grey);
-    --main-dashboard-angular-chart-background: var(--main-light-gray-color);
+    --main-dashboard-angular-chart-background: var(--main-body-background);
 }
 
 /*body {
@@ -100,18 +100,22 @@ table.dataTable thead th, table.dataTable thead td {
 }
 
 .z-depth-1, nav, .card-panel, .card, .toast, .btn, .btn-large, .btn-small, .btn-floating, .dropdown-content, .collapsible, .sidenav {
-    -webkit-box-shadow: 0 0px 0px 0 rgb(0 0 0 / 14%), 0 1px 1px -2px rgb(0 0 0 / 12%), 0 1px 4px 0 rgb(0 0 0 / 20%);
-    box-shadow: 0 0px 0px 0 rgb(0 0 0 / 14%), 0 1px 1px -2px rgb(0 0 0 / 12%), 0 1px 4px 0 rgb(0 0 0 / 20%);
+    /* -webkit-box-shadow: 0 0px 0px 0 rgb(0 0 0 / 14%), 0 1px 1px -2px rgb(0 0 0 / 12%), 0 1px 4px 0 rgb(0 0 0 / 20%); */
+    /* box-shadow: 0 0px 0px 0 rgb(0 0 0 / 14%), 0 1px 1px -2px rgb(0 0 0 / 12%), 0 1px 4px 0 rgb(0 0 0 / 20%); */
+    border-radius: 5px;
+    -webkit-box-shadow: 0 1px 20px 0 rgba(69,90,100,.08);
+    box-shadow: 0 1px 20px 0 rgba(69,90,100,.08);
+    border: none;
 }
 
 .list-item {
     background-color: #f5f5f57d;
 }
 
-.collapsible-header {
-    /*background: none !important;*/
+/*.collapsible-header {
+    !*background: none !important;*!
     background: linear-gradient(rgb(248, 250, 253) 0%, rgba(248, 250, 253, 0) 413px);
-}
+}*/
 
 .collapsible-body {
     /*background: none !important;*/

diff --git a/css/themes/mauve_theme.css b/css/themes/mauve_theme.css
@@ -137,6 +137,19 @@ input:not([type]):disabled, input:not([type])[readonly="readonly"], input[type=t
     cursor: not-allowed;
 }
 
+[type=checkbox].filled-in:checked+span:not(.lever):after {
+    top: 0;
+    width: 20px;
+    height: 20px;
+    border: 2px solid var(--main-light-blue);
+    background-color: var(--main-light-blue);
+    z-index: 0;
+}
+
+[type=checkbox].filled-in:not(:checked)+span:not(.lever):after {
+    border: 2px solid #ffffffd9;
+}
+
 .select2-container--default.select2-container--disabled .select2-selection--single {
     background-color: #0000000f;
     cursor: not-allowed;

diff --git a/css/themes/nord_nightfall_theme.css b/css/themes/nord_nightfall_theme.css
@@ -0,0 +1,91 @@
+:root {
+    /* Dark Gray theme */
+    --main-dark-background: #1f2d3d;
+    --main-light-gray-color: #c0ccda;
+    --main-dark-on-dark-background: #253649;
+}
+
+tr {
+    border-bottom: 1px solid var(--main-dark-background);
+}
+
+table.dataTable tbody tr {
+    background-color: var(--main-dark-on-dark-background);
+}
+
+table.dataTable thead th, table.dataTable thead td {
+    border-bottom: 1px solid white; /*var(--main-light-green);*/
+}
+
+table.dataTable.hover tbody tr:hover, table.dataTable.display tbody tr:hover {
+    background-color: #5a5a5a !important;
+}
+
+/*
+.select2-container--default .select2-selection--single {
+    background-color: var(--main-dark-background);
+}*/
+
+.btn.disabled, .disabled.btn-large, .disabled.btn-small, .btn-floating.disabled, .btn-large.disabled, .btn-small.disabled, .btn-flat.disabled, .btn:disabled, .btn-large:disabled, .btn-small:disabled, .btn-floating:disabled, .btn-large:disabled, .btn-small:disabled, .btn-flat:disabled, .btn[disabled], .btn-large[disabled], .btn-small[disabled], .btn-floating[disabled], .btn-large[disabled], .btn-small[disabled], .btn-flat[disabled] {
+    color: #635b5b !important;
+}
+
+/* Select2 */
+.select2-container--default .select2-selection--single {
+    background-color: var(--main-body-background);
+}
+
+.modal-content .select2-selection--single {
+    background: #1a212b;
+}
+
+.select2-container--default.select2-container--disabled .select2-selection--single {
+    background-color: rgb(0 0 0 / 20%);
+}
+
+.select2-container--default .select2-results__group {
+    background: #181a1c;
+}
+
+/* Side Nav */
+.side-nav-menu-active {
+    background: #00bcd4;
+    background: linear-gradient(to top, #0083B0, #00B4DB);
+    background: -webkit-linear-gradient(to top, #0083B0, #00B4DB);
+}
+
+.side-nav-menu-active:not(:hover) > i:not(:hover) {
+    color: var(--main-body-background) !important;
+}
+
+.side-nav-menu-active:not(:hover) > span:not(:hover) {
+    color: var(--main-body-background) !important;
+    font-weight: bold;
+}
+
+nav ul a:hover {
+    color: #ffffffa1;
+}
+
+.highlighted-budget-item {
+    border-bottom: 2px solid rgb(55 60 63);
+}
+
+
+.collapsible-body {
+    border-top: none !important;
+}
+
+.select-wrapper input.select-dropdown:focus {
+    border-bottom: 1px solid var(--main-accent-color);
+}
+
+input:not([type]):not(.browser-default):focus:not([readonly]), input[type=text]:not(.browser-default):focus:not([readonly]), input[type=password]:not(.browser-default):focus:not([readonly]), input[type=email]:not(.browser-default):focus:not([readonly]), input[type=url]:not(.browser-default):focus:not([readonly]), input[type=time]:not(.browser-default):focus:not([readonly]), input[type=date]:not(.browser-default):focus:not([readonly]), input[type=datetime]:not(.browser-default):focus:not([readonly]), input[type=datetime-local]:not(.browser-default):focus:not([readonly]), input[type=tel]:not(.browser-default):focus:not([readonly]), input[type=number]:not(.browser-default):focus:not([readonly]), input[type=search]:not(.browser-default):focus:not([readonly]), textarea.materialize-textarea:focus:not([readonly]) {
+    border-bottom: 1px solid var(--main-accent-color);
+    -webkit-box-shadow: 0 1px 0 0 var(--main-accent-color);
+    box-shadow: 0 1px 0 0 var(--main-accent-color);
+}
+
+input:not([type]):not(.browser-default):focus:not([readonly])+label, input[type=text]:not(.browser-default):focus:not([readonly])+label, input[type=password]:not(.browser-default):focus:not([readonly])+label, input[type=email]:not(.browser-default):focus:not([readonly])+label, input[type=url]:not(.browser-default):focus:not([readonly])+label, input[type=time]:not(.browser-default):focus:not([readonly])+label, input[type=date]:not(.browser-default):focus:not([readonly])+label, input[type=datetime]:not(.browser-default):focus:not([readonly])+label, input[type=datetime-local]:not(.browser-default):focus:not([readonly])+label, input[type=tel]:not(.browser-default):focus:not([readonly])+label, input[type=number]:not(.browser-default):focus:not([readonly])+label, input[type=search]:not(.browser-default):focus:not([readonly])+label, textarea.materialize-textarea:focus:not([readonly])+label {
+    color: var(--main-accent-color);
+}
diff --git a/css/themes/solarized_green_theme.css b/css/themes/solarized_green_theme.css
@@ -98,4 +98,13 @@ label {
     border-left: 2px solid transparent;
     border-right: 2px solid #fff;
     border-bottom: 2px solid #fff;
+}
+
+[type=checkbox].filled-in:checked+span:not(.lever):after {
+    top: 0;
+    width: 20px;
+    height: 20px;
+    border: 2px solid var(--main-light-blue);
+    background-color: var(--main-light-blue);
+    z-index: 0;
 }
diff --git a/js/budgets.js b/js/budgets.js
diff --git a/js/components/transactionsListComponent.js b/js/components/transactionsListComponent.js
diff --git a/js/consts.js b/js/consts.js
diff --git a/js/external/monthpicker/monthpicker.css b/js/external/monthpicker/monthpicker.css
@@ -37,9 +37,12 @@
 .monthpicker_selector {
     position: absolute;
     top: 100%;
-    background-color: #2C2C2C;
+    background-color: var(--main-card-background);
     min-width: 173px;
-    box-shadow: 1px 2.5px 5px 0;
+    border-radius: 5px;
+    -webkit-box-shadow: 0 1px 20px 0 rgba(69,90,100,.08);
+    box-shadow: 0 1px 20px 0 rgba(69,90,100,.08);
+    border: none;
     z-index: 100;
 }
 
@@ -105,16 +108,17 @@
 /* months */
 
 .monthpicker_selector .month {
-    border: 1px solid #444;
+    border: 1px solid var(--main-card-background);
     cursor: pointer;
+    background: var(--main-body-background);
 }
 
 .monthpicker_selector .month:hover {
     background-color: #444
 }
 
 .month.selected {
-    background: #D4D4D4;
+    background: var(--main-light-blue);
     color: #2C2C2C;
     font-weight: bold;
 }

diff --git a/js/profile.js b/js/profile.js
diff --git a/js/transactions.js b/js/transactions.js
diff --git a/js/utils/chartUtils.js b/js/utils/chartUtils.js