diff --git a/assets/css/app.css b/assets/css/app.css index e1504ac..ef65652 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -3780,7 +3780,7 @@ form select.error:focus { .btn-inverse-success { - color: #15ca20; + color: #1aad24; background-color: rgba(21, 202, 32, 0.18); @@ -3792,7 +3792,7 @@ form select.error:focus { .btn-inverse-success:hover { - color: #15ca20; + color: #1aad24; background-color: rgba(21, 202, 32, 0.18); @@ -3802,7 +3802,7 @@ form select.error:focus { .btn-inverse-success:focus { - color: #15ca20; + color: #1aad24; background-color: rgba(21, 202, 32, 0.18); diff --git a/assets/css/bootstrap-extended.css b/assets/css/bootstrap-extended.css index 19ec965..d494755 100644 --- a/assets/css/bootstrap-extended.css +++ b/assets/css/bootstrap-extended.css @@ -23,33 +23,33 @@ a { } .valid-feedback { - color: #15ca20 + color: #23ac2c } .form-control.is-valid, .was-validated .form-control:valid { - border-color: #15ca20; + border-color: #23ac2c; } .form-control.is-valid:focus, .was-validated .form-control:valid:focus { - border-color: #15ca20; + border-color: #23ac2c; } .form-select.is-valid, .was-validated .form-select:valid { - border-color: #15ca20; + border-color: #23ac2c; } .form-select.is-valid:focus, .was-validated .form-select:valid:focus { - border-color: #15ca20; + border-color: #23ac2c; } .form-check-input.is-valid, .was-validated .form-check-input:valid { - border-color: #15ca20 + border-color: #23ac2c } .form-check-input.is-valid:checked, .was-validated .form-check-input:valid:checked { - background-color: #15ca20 + background-color: #23ac2c } .form-check-input.is-valid~.form-check-label, .was-validated .form-check-input:valid~.form-check-label { - color: #15ca20 + color: #23ac2c } .invalid-feedback { @@ -120,8 +120,8 @@ a { .btn-success { color: #fff; - background-color: #15ca20; - border-color: #15ca20 + background-color: #2375ac; + border-color: #23ac2c } .btn-success:hover { color: #fff; @@ -207,27 +207,27 @@ a { .btn-outline-success { - color: #15ca20; - border-color: #15ca20 + color: #23ac2c; + border-color: #23ac2c } .btn-outline-success:hover { color: #fff; - background-color: #15ca20; - border-color: #15ca20 + background-color: #23ac2c; + border-color: #23ac2c } .btn-check:focus+.btn-outline-success, .btn-outline-success:focus { box-shadow: 0 0 0 .25rem rgb(23 160 14 / 52%) } .btn-check:active+.btn-outline-success, .btn-check:checked+.btn-outline-success, .btn-outline-success.active, .btn-outline-success.dropdown-toggle.show, .btn-outline-success:active { color: #fff; - background-color: #15ca20; - border-color: #15ca20 + background-color: #23ac2c; + border-color: #23ac2c } .btn-check:active+.btn-outline-success:focus, .btn-check:checked+.btn-outline-success:focus, .btn-outline-success.active:focus, .btn-outline-success.dropdown-toggle.show:focus, .btn-outline-success:active:focus { box-shadow: 0 0 0 .25rem rgb(23 160 14 / 52%) } .btn-outline-success.disabled, .btn-outline-success:disabled { - color: #15ca20; + color: #23ac2c; background-color: transparent } @@ -304,7 +304,7 @@ a { } .border-success { - border-color: #15ca20!important + border-color: #23ac2c!important } .border-danger { @@ -324,7 +324,7 @@ a { color: #6c757d!important } .text-success { - color: #15ca20!important + color: #23ac2c!important } .text-info { color: #0dcaf0!important @@ -364,7 +364,7 @@ a { } .bg-success { - background-color: #15ca20 !important; + background-color: #23ac2c !important; } .bg-danger { @@ -373,19 +373,19 @@ a { .form-check-success .form-check-input:checked { - background-color: #15ca20; - border-color: #15ca20 + background-color: #23ac2c; + border-color: #23ac2c } .form-check-success .form-check-input[type=checkbox]:indeterminate { - background-color: #15ca20; - border-color: #15ca20; + background-color: #23ac2c; + border-color: #23ac2c; background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/%3e%3c/svg%3e") } .form-check-success .form-check-input:focus { - border-color: #15ca20; + border-color: #23ac2c; outline: 0; box-shadow: 0 0 0 .25rem rgba(21, 202, 33, 0.25) } diff --git a/assets/plugins/chartjs/js/chartjs-custom.js b/assets/plugins/chartjs/js/chartjs-custom.js index d5cf4d1..0bfe39d 100644 --- a/assets/plugins/chartjs/js/chartjs-custom.js +++ b/assets/plugins/chartjs/js/chartjs-custom.js @@ -72,11 +72,11 @@ $(function() { label: 'Facebook', data: [12, 30, 16, 23, 8, 14, 11], backgroundColor: [ - '#15ca20' + '#23ac2c' ], tension: 0, borderColor: [ - '#15ca20' + '#23ac2c' ], borderWidth: 3 }] @@ -113,7 +113,7 @@ $(function() { '#6f42c1', '#d63384', '#fd7e14', - '#15ca20', + '#23ac2c', '#0dcaf0' ], borderWidth: 1.5 @@ -146,7 +146,7 @@ $(function() { '#6f42c1', '#d63384', '#fd7e14', - '#15ca20', + '#23ac2c', '#0dcaf0' ], borderWidth: 1 @@ -242,7 +242,7 @@ $(function() { '#6f42c1', '#d63384', '#fd7e14', - '#15ca20', + '#23ac2c', '#0dcaf0' ], }] @@ -372,7 +372,7 @@ var myChart = new Chart(ctx, { label: 'Facebook', data: [5, 30, 16, 23, 8, 14, 2], backgroundColor: [ - '#15ca20' + '#23ac2c' ], fill: { target: 'origin', @@ -381,7 +381,7 @@ var myChart = new Chart(ctx, { }, tension: 0.4, borderColor: [ - '#15ca20' + '#23ac2c' ], borderWidth: 4 }] diff --git a/assets/plugins/morris/js/morris-data.js b/assets/plugins/morris/js/morris-data.js index dc56524..ec68844 100644 --- a/assets/plugins/morris/js/morris-data.js +++ b/assets/plugins/morris/js/morris-data.js @@ -41,12 +41,12 @@ Morris.Area({ labels: ['iPhone', 'iPad'], pointSize: 3, fillOpacity: 0, - pointStrokeColors:['#008cff', '#15ca20'], + pointStrokeColors:['#008cff', '#23ac2c'], behaveLikeLine: true, gridLineColor: '#e0e0e0', lineWidth: 3, hideHover: 'auto', - lineColors: ['#008cff', '#15ca20'], + lineColors: ['#008cff', '#23ac2c'], resize: true }); @@ -67,7 +67,7 @@ Morris.Area({ value: 20 }], resize: true, - colors:['#008cff', '#15ca20', '#fd3550'] + colors:['#008cff', '#23ac2c', '#fd3550'] }); // Morris bar chart @@ -112,7 +112,7 @@ Morris.Area({ xkey: 'y', ykeys: ['a', 'b', 'c'], labels: ['A', 'B', 'C'], - barColors:['#008cff', '#15ca20', '#75808a'], + barColors:['#008cff', '#23ac2c', '#75808a'], hideHover: 'auto', gridLineColor: '#eef0f2', resize: true @@ -153,7 +153,7 @@ Morris.Area({ ], - lineColors: ['#008cff', '#15ca20'], + lineColors: ['#008cff', '#23ac2c'], xkey: 'period', ykeys: ['iphone', 'ipad'], labels: ['Site A', 'Site B'], diff --git a/assets/sass/app.css b/assets/sass/app.css index 6408480..50994fa 100644 --- a/assets/sass/app.css +++ b/assets/sass/app.css @@ -2130,17 +2130,17 @@ form select.error:focus { } .btn-inverse-success { - color: #15ca20; + color: #23ac2c; background-color: rgba(21, 202, 32, 0.18); border-color: rgb(212, 246, 214); } .btn-inverse-success:hover { - color: #15ca20; + color: #23ac2c; background-color: rgba(21, 202, 32, 0.18); border-color: rgba(21, 202, 32, 0.18); } .btn-inverse-success:focus { - color: #15ca20; + color: #23ac2c; background-color: rgba(21, 202, 32, 0.18); border-color: rgba(21, 202, 32, 0.18); box-shadow: 0 0 0 0.25rem rgba(23, 160, 14, 0.32); diff --git a/assets/sass/app.scss b/assets/sass/app.scss index 06d2e51..ee00445 100644 --- a/assets/sass/app.scss +++ b/assets/sass/app.scss @@ -2582,18 +2582,18 @@ form select.error:focus { } .btn-inverse-success { - color: #15ca20; + color: #23ac2c; background-color: rgba(21, 202, 32, 0.18); border-color: rgb(212, 246, 214); &:hover { - color: #15ca20; + color: #23ac2c; background-color: rgba(21, 202, 32, 0.18); border-color: rgba(21, 202, 32, 0.18); } &:focus { - color: #15ca20; + color: #23ac2c; background-color: rgba(21, 202, 32, 0.18); border-color: rgba(21, 202, 32, 0.18); box-shadow: 0 0 0 .25rem rgb(23 160 14 / 32%); diff --git a/public/addFilament.php b/public/addFilament.php index a8b3e72..2abbe7c 100644 --- a/public/addFilament.php +++ b/public/addFilament.php @@ -2,7 +2,7 @@ checkUserRole(['admin']); ?> - +
diff --git a/public/filamentDryer.php b/public/filamentDryer.php index 666fbca..013c8cf 100644 --- a/public/filamentDryer.php +++ b/public/filamentDryer.php @@ -2,7 +2,7 @@ checkUserRole(['admin']); ?> - + diff --git a/public/index.php b/public/index.php index 2cd7a0f..c93365d 100644 --- a/public/index.php +++ b/public/index.php @@ -1,6 +1,6 @@ - + diff --git a/public/login.php b/public/login.php index 2f999f5..104e8ac 100644 --- a/public/login.php +++ b/public/login.php @@ -1,5 +1,5 @@ - + @@ -14,7 +14,10 @@ + + +