From 464b1e92c6c9339f7b1d97f48152278efd931d18 Mon Sep 17 00:00:00 2001 From: Milad Raeisi Date: Fri, 25 Oct 2024 17:03:14 +0400 Subject: [PATCH 1/3] Update nuget packages --- src/Angor.Test/Angor.Test.csproj | 8 ++++---- src/Angor/Client/Angor.Client.csproj | 6 +++--- src/Angor/Server/Angor.Server.csproj | 6 +++--- src/Angor/Shared/Angor.Shared.csproj | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Angor.Test/Angor.Test.csproj b/src/Angor.Test/Angor.Test.csproj index 17a933e7..34ae9fbd 100644 --- a/src/Angor.Test/Angor.Test.csproj +++ b/src/Angor.Test/Angor.Test.csproj @@ -20,11 +20,11 @@ - - - + + + - + diff --git a/src/Angor/Client/Angor.Client.csproj b/src/Angor/Client/Angor.Client.csproj index 08d6413b..91363d30 100644 --- a/src/Angor/Client/Angor.Client.csproj +++ b/src/Angor/Client/Angor.Client.csproj @@ -13,10 +13,10 @@ - + - - + + diff --git a/src/Angor/Server/Angor.Server.csproj b/src/Angor/Server/Angor.Server.csproj index 42eff20f..6df0b36e 100644 --- a/src/Angor/Server/Angor.Server.csproj +++ b/src/Angor/Server/Angor.Server.csproj @@ -10,11 +10,11 @@ - + - - + + diff --git a/src/Angor/Shared/Angor.Shared.csproj b/src/Angor/Shared/Angor.Shared.csproj index 150db58c..43f67d77 100644 --- a/src/Angor/Shared/Angor.Shared.csproj +++ b/src/Angor/Shared/Angor.Shared.csproj @@ -12,7 +12,7 @@ - + From 38eb2a7923c85b31768c4dd38be2820ae39e1ba9 Mon Sep 17 00:00:00 2001 From: Milad Raeisi Date: Sat, 26 Oct 2024 07:12:59 +0400 Subject: [PATCH 2/3] Update manifest.json --- src/Angor/Client/wwwroot/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Angor/Client/wwwroot/manifest.json b/src/Angor/Client/wwwroot/manifest.json index ea8af363..e9c6d1de 100644 --- a/src/Angor/Client/wwwroot/manifest.json +++ b/src/Angor/Client/wwwroot/manifest.json @@ -1,7 +1,7 @@ { "name": "Angor", "short_name": "Angor", - "description": "Stay in control of your investments with Angor", + "description": "non custodial crowdfunding with Angor", "lang": "en", "start_url": "./", "display": "standalone", @@ -21,12 +21,12 @@ "related_applications": [ { "platform": "windows", - "url": "https://app.angor.io", + "url": "https://beta.angor.io", "id": "io.AngorApp" }, { "platform": "play", - "url": "https://app.angor.io" + "url": "https://beta.angor.io" } ], "shortcuts": [ From 3e4c781d35b9361009319ca9585b5c49a0726e64 Mon Sep 17 00:00:00 2001 From: Milad Raeisi Date: Sat, 26 Oct 2024 11:36:39 +0400 Subject: [PATCH 3/3] Clean css --- src/Angor/Client/Pages/Browse.razor | 2 +- src/Angor/Client/Pages/Founder.razor | 2 +- src/Angor/Client/Pages/Invest.razor | 6 +- src/Angor/Client/Pages/Penalties.razor | 4 +- src/Angor/Client/Pages/Recover.razor | 8 +- src/Angor/Client/Pages/Settings.razor | 14 +- src/Angor/Client/Pages/Signatures.razor | 4 +- src/Angor/Client/Pages/View.razor | 12 +- src/Angor/Client/Pages/Wallet.razor | 10 +- .../Client/Shared/NotificationComponent.razor | 2 +- .../Client/wwwroot/ServiceWorkerRegister.js | 42 +- src/Angor/Client/wwwroot/assets/css/app.css | 448 +++--------------- .../Client/wwwroot/assets/css/dashboard.css | 302 ++++++------ .../Client/wwwroot/assets/icons/refresh.svg | 4 +- src/Angor/Client/wwwroot/service-worker.js | 3 - .../wwwroot/service-worker.published.js | 35 +- 16 files changed, 301 insertions(+), 597 deletions(-) diff --git a/src/Angor/Client/Pages/Browse.razor b/src/Angor/Client/Pages/Browse.razor index dc79617d..e43f74d9 100644 --- a/src/Angor/Client/Pages/Browse.razor +++ b/src/Angor/Client/Pages/Browse.razor @@ -66,7 +66,7 @@
- + No projects found.
diff --git a/src/Angor/Client/Pages/Founder.razor b/src/Angor/Client/Pages/Founder.razor index 87f5521e..91471ea9 100644 --- a/src/Angor/Client/Pages/Founder.razor +++ b/src/Angor/Client/Pages/Founder.razor @@ -53,7 +53,7 @@
- + No projects found.
diff --git a/src/Angor/Client/Pages/Invest.razor b/src/Angor/Client/Pages/Invest.razor index e41d0ea9..e9e91544 100644 --- a/src/Angor/Client/Pages/Invest.razor +++ b/src/Angor/Client/Pages/Invest.razor @@ -67,7 +67,7 @@
- + You already invested. @@ -84,7 +84,7 @@
- + You are the founder. @@ -101,7 +101,7 @@
- + The project was not found. diff --git a/src/Angor/Client/Pages/Penalties.razor b/src/Angor/Client/Pages/Penalties.razor index 403e92bd..6f6449f9 100644 --- a/src/Angor/Client/Pages/Penalties.razor +++ b/src/Angor/Client/Pages/Penalties.razor @@ -55,7 +55,7 @@
- + No penalties found
@@ -99,7 +99,7 @@ else { if (penalty.IsReleased) { - + } else { diff --git a/src/Angor/Client/Pages/Recover.razor b/src/Angor/Client/Pages/Recover.razor index feaf71d9..ad9493ba 100644 --- a/src/Angor/Client/Pages/Recover.razor +++ b/src/Angor/Client/Pages/Recover.razor @@ -102,7 +102,7 @@ @if (StageInfo.CanRelease) { -
- +
- +
- + @if (showChangeNetworkModal) @@ -147,7 +147,7 @@
@@ -173,7 +173,7 @@
@@ -217,7 +217,7 @@ @@ -245,7 +245,7 @@
@@ -293,7 +293,7 @@ @@ -359,7 +359,7 @@
@if (showWipeallModal) { diff --git a/src/Angor/Client/Pages/Signatures.razor b/src/Angor/Client/Pages/Signatures.razor index 373fc319..bd3eb20a 100644 --- a/src/Angor/Client/Pages/Signatures.razor +++ b/src/Angor/Client/Pages/Signatures.razor @@ -59,7 +59,7 @@
- + No pending signatures yet...
@@ -95,7 +95,7 @@
- +
} else @@ -295,7 +295,7 @@

Seize the opportunity to invest in this project.

- + @if (isGeneratingNsec) { diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor index 0075b263..ed822503 100644 --- a/src/Angor/Client/Pages/Wallet.razor +++ b/src/Angor/Client/Pages/Wallet.razor @@ -59,7 +59,7 @@
- + No Wallet Found
@@ -115,10 +115,10 @@ @if (isNewWallet) {
-
- +
diff --git a/src/Angor/Client/wwwroot/ServiceWorkerRegister.js b/src/Angor/Client/wwwroot/ServiceWorkerRegister.js index d8d49705..2c29a629 100644 --- a/src/Angor/Client/wwwroot/ServiceWorkerRegister.js +++ b/src/Angor/Client/wwwroot/ServiceWorkerRegister.js @@ -6,8 +6,14 @@ const blazorInstallMethod = 'PWAInstallable'; const notifyNewVersion = () => { const bc = new BroadcastChannel('angor-channel'); - bc.postMessage('new-version-found'); -} + bc.postMessage('skip-waiting'); + bc.onmessage = (message) => { + if (message && message.data === "reload-page") { + location.reload(); + } + }; +}; + window.updateAvailable = new Promise(function (resolve, reject) { if ('serviceWorker' in navigator) { @@ -34,22 +40,29 @@ window.updateAvailable = new Promise(function (resolve, reject) { console.log('Service worker registration failed, error:', error)); } }); -window['updateAvailable'] +window.updateAvailable .then(isAvailable => { if (isAvailable) { - notifyNewVersion(); + if (confirm("New update is available. Would you like to refresh?")) { + notifyNewVersion(); + } } }); function showAddToHomeScreen() { - setTimeout(function () { - const installButton = document.getElementById('installButton'); - if (installButton) { - installButton.classList.remove('d-none'); - } - }, 3000); + const installButton = document.getElementById('installButton'); + if (installButton) { + installButton.classList.remove('d-none'); + } } +window.addEventListener('beforeinstallprompt', function (e) { + e.preventDefault(); + window.PWADeferredPrompt = e; + showAddToHomeScreen(); +}); + + window.AngorAPP = { installPWA: function () { if (window.PWADeferredPrompt) { @@ -64,11 +77,4 @@ window.AngorAPP = { } } } -}; - -window.addEventListener('beforeinstallprompt', function (e) { - e.preventDefault(); - window.PWADeferredPrompt = e; - - showAddToHomeScreen(); -}); +}; \ No newline at end of file diff --git a/src/Angor/Client/wwwroot/assets/css/app.css b/src/Angor/Client/wwwroot/assets/css/app.css index 270b8cb5..86daf210 100644 --- a/src/Angor/Client/wwwroot/assets/css/app.css +++ b/src/Angor/Client/wwwroot/assets/css/app.css @@ -1,405 +1,104 @@ - -:root { - --angor-primary: #1f5d6a; - --angor-secondary: #ff9900; - --angor-success: #4CAF50; - --angor-info: #1A73E8; - --angor-warning: #fb8c00; - --angor-danger: #F44335; - --angor-light: #f0f2f5; - --angor-dark: #344767; - --angor-blue: #63B3ED; - --angor-indigo: #596CFF; - --angor-purple: #6f42c1; - --angor-pink: #d63384; - --angor-red: #F56565; - --angor-orange: #fd7e14; - --angor-yellow: #FBD38D; - --angor-green: #81E6D9; - --angor-teal: #20c997; - --angor-cyan: #0dcaf0; - --angor-white: #fff; - --angor-gray: #6c757d; - --angor-gray-dark: #343a40; - --angor-gray-100: #f8f9fa; - --angor-gray-200: #f0f2f5; - --angor-gray-300: #dee2e6; - --angor-gray-400: #ced4da; - --angor-gray-500: #adb5bd; - --angor-gray-600: #6c757d; - --angor-gray-700: #495057; - --angor-gray-800: #343a40; - --angor-gray-900: #212529; - --angor-dark-blue: #1A237E; - --angor-primary-rgb: 31, 93, 106; - --angor-secondary-rgb: 255, 153, 0; - --angor-success-rgb: 76, 175, 80; - --angor-info-rgb: 26, 115, 232; - --angor-warning-rgb: 251, 140, 0; - --angor-danger-rgb: 244, 67, 53; - --angor-light-rgb: 240, 242, 245; - --angor-dark-rgb: 52, 71, 103; - --angor-white-rgb: 255, 255, 255; - --angor-black-rgb: 0, 0, 0; - --angor-body-color-rgb: 0, 128, 154; - --angor-body-bg-rgb: 255, 255, 255; +:root { + --angor-primary: #022229; + --angor-secondary: #086c81; + --angor-accent: #cbdde1; + --angor-link: #ff9900; + + --angor-light: #cbdde1; + --angor-dark: #022229; + --angor-primary-rgb: 2, 34, 41; + --angor-secondary-rgb: 8, 108, 129; + --angor-accent-rgb: 203, 221, 225; + --angor-text-bg-primary: rgba(var(--angor-primary-rgb), 1); + --angor-text-bg-secondary: rgba(var(--angor-secondary-rgb), 1); + --angor-shadow-primary: rgba(var(--angor-primary-rgb), 0.4); + --angor-shadow-light: rgba(var(--angor-secondary-rgb), 0.4); + --angor-dark-shadow: rgba(var(--angor-accent-rgb), 0.4); + --angor-scrollbar-thumb-hover-bg: #086c81c0; --angor-font-sans-serif: "Roboto", Helvetica, Arial, sans-serif; --angor-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --angor-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0)); - --angor-body-font-family: var(--angor-font-sans-serif); --angor-body-font-size: 1rem; --angor-body-font-weight: 400; --angor-body-line-height: 1.5; - --angor-body-color: var(--angor-primary); - --angor-body-bg: #cbdde1; --angor-border-width: 1px; --angor-border-style: solid; - --angor-border-color: #dee2e6; - --angor-border-color-translucent: rgba(0, 0, 0, 0.175); --angor-border-radius: 0.375rem; --angor-border-radius-sm: 0.125rem; --angor-border-radius-lg: 0.5rem; --angor-border-radius-xl: 0.75rem; --angor-border-radius-2xl: 1rem; --angor-border-radius-pill: 50rem; - --angor-link-color: var(--angor-primary); - --angor-link-hover-color: var(--angor-primary); - --angor-code-color: var(--angor-pink); - --angor-highlight-bg: #fcf8e3; - --angor-white: #e7fbff; - --angor-table-color: var(--angor-secondary); - --angor-table-striped-color: var(--angor-secondary); - --angor-table-active-color: var(--angor-secondary); - --angor-table-hover-color: var(--angor-secondary); - --angor-form-check-input-checked-bg: var(--angor-success); - --angor-form-check-input-checked-border: var(--angor-success); - --angor-form-check-input-indeterminate-bg: var(--angor-primary); - --angor-form-check-input-indeterminate-border: var(--angor-primary); - --angor-form-range-thumb-bg: var(--angor-primary); - --angor-btn-color: var(--angor-secondary); - --angor-btn-primary-bg: var(--angor-primary); - --angor-btn-primary-border: var(--angor-primary); - --angor-btn-secondary-bg: var(--angor-secondary); - --angor-btn-secondary-border: var(--angor-secondary); - --angor-dropdown-color: var(--angor-secondary); - --angor-dropdown-link-color: var(--angor-secondary); - --angor-dropdown-link-active-color: var(--angor-secondary); - --angor-accordion-color: var(--angor-secondary); - --angor-accordion-btn-color: var(--angor-secondary); - --angor-pagination-color: var(--angor-primary); - --angor-pagination-hover-color: var(--angor-primary); - --angor-pagination-hover-bg: var(--angor-light); - --angor-pagination-active-bg: var(--angor-primary); - --angor-pagination-active-border: var(--angor-primary); - --angor-progress-bar-bg: var(--angor-primary); - --angor-list-group-action-active-color: var(--angor-secondary); - --angor-list-group-active-bg: var(--angor-primary); - --angor-list-group-active-border: var(--angor-primary); - --angor-btn-close-focus-shadow: rgba(var(--angor-primary-rgb), 0.25); - --angor-btn-close-bg: var(--angor-primary); - --angor-popover-body-color: var(--angor-secondary); - --angor-text-bg-primary: rgba(var(--angor-primary-rgb), 1); - --angor-text-bg-secondary: rgba(var(--angor-secondary-rgb), 1); - --angor-link-primary: var(--angor-primary); - --angor-link-secondary: var(--angor-secondary); - --angor-border-primary: var(--angor-primary); - --angor-border-secondary: var(--angor-secondary); - --angor-text-primary: var(--angor-primary); - --angor-text-secondary: var(--angor-secondary); - --angor-shadow-primary: rgba(var(--angor-primary-rgb), 0.4); - --angor-shadow-light: rgba(var(--angor-primary-rgb), 0.4); - --angor-alert-primary-bg: var(--angor-primary); - --angor-badge-primary-bg: var(--angor-primary); - --angor-badge-secondary-bg: var(--angor-secondary); - --angor-btn-bg-white-hover: var(--angor-secondary); - --angor-btn-primary-hover-bg: var(--angor-primary); - --angor-btn-primary-hover-border: var(--angor-primary); - --angor-btn-primary-active-bg: var(--angor-primary); - --angor-btn-primary-active-border: var(--angor-primary); - --angor-btn-secondary-hover-bg: var(--angor-secondary); - --angor-btn-secondary-hover-border: var(--angor-secondary); - --angor-btn-secondary-active-bg: var(--angor-secondary); - --angor-btn-secondary-active-border: var(--angor-secondary); - --angor-btn-link-color: var(--angor-primary); - --angor-btn-link-hover-color: var(--angor-primary); - --angor-card-bg: #FFFDFA; - --angor-scrollbar-thumb-bg: #f1fafc; - --angor-scrollbar-thumb-hover-bg: #e78a02c0; - --angor-loading-progress-stroke: #e0e0e0; - --angor-loading-progress-stroke-active: #1b6ec2; - --angor-loading-text-color: #333; - --angor-snackbar-bg: #fdfefe; - --angor-snackbar-text-color: #08111f; - --angor-snackbar-bg-dark: #060b14; - --angor-snackbar-text-color-dark: #fff; - --angor-inner-table-border: #ddd; - --angor-inner-table-bg: gainsboro; - --angor-card-header-img-bg: #084a59; - --angor-card-header-img-hover-bg: #033742; - --angor-card-header-img-border: #012e39; - --angor-btn-angor: var(--angor-primary); - --angor-btn-angor-dark: var(--angor-white); - --angor-btn-angor-hover: #e08604; - --angor-dark-text-white: #fff; - --angor-dark-text-dark: #000; - --angor-dark-bg-gray-100: #f8f9fa; - --angor-dark-bg-gray-600: #6c757d; - --angor-dark-border-dark: #343a40; - --angor-dark-shadow: rgba(255, 255, 255, 0.4); - --angor-primary-btn-icon: #e7fbff; - --angor-modal-bg: #FFFDFA; - --angor-modal-header-border-color: #344767; - --angor-modal-header-border-color-dark: #fff; --angor-modal-zindex: 1050; --angor-modal-width: 500px; --angor-modal-padding: 1rem; --angor-modal-margin: 0.5rem; - --angor-modal-bg: #fff; - --angor-modal-border-color: rgba(0, 0, 0, 0.2); --angor-modal-border-width: 1px; - --angor-modal-border-radius: 0.5rem; - --angor-modal-box-shadow: 0 0.3125rem 0.625rem 0 rgba(0, 0, 0, 0.12); --angor-modal-inner-border-radius: calc(0.5rem - 1px); --angor-modal-header-padding-x: 1rem; --angor-modal-header-padding-y: 1rem; --angor-modal-header-padding: 1rem 1rem; - --angor-modal-header-border-color: #dee2e6; - --angor-modal-header-border-color-dark: #046479; - --angor-modal-header-border-width: 1px; --angor-modal-title-line-height: 1.5; --angor-modal-footer-gap: 0.5rem; - --angor-modal-footer-border-color: #dee2e6; - --angor-modal-footer-border-color-dark: #046479; - --angor-modal-footer-border-width: 1px; - --angor-btn-hover-bg: #fb8c00; } .dark { - --angor-primary: var(--angor-white); - --angor-secondary: #ff9900; - --angor-body-bg: #022229; - --angor-body-color: #FFFDFA; - --angor-table-color: var(--angor-secondary); - --angor-table-striped-color: var(--angor-secondary); - --angor-table-active-color: var(--angor-secondary); - --angor-table-hover-color: var(--angor-secondary); - --angor-form-check-input-checked-bg: var(--angor-success); - --angor-form-check-input-checked-border: var(--angor-success); - --angor-form-check-input-indeterminate-bg: var(--angor-primary); - --angor-form-check-input-indeterminate-border: var(--angor-primary); - --angor-form-range-thumb-bg: var(--angor-primary); - --angor-btn-color: var(--angor-secondary); - --angor-btn-primary-bg: #022229; - --angor-btn-primary-border: var(--angor-primary); - --angor-btn-secondary-bg: var(--angor-secondary); - --angor-btn-secondary-border: var(--angor-secondary); - --angor-dropdown-color: var(--angor-secondary); - --angor-dropdown-link-color: var(--angor-secondary); - --angor-dropdown-link-active-color: var(--angor-secondary); - --angor-accordion-color: var(--angor-secondary); - --angor-accordion-btn-color: var(--angor-secondary); - --angor-pagination-color: var(--angor-primary); - --angor-pagination-hover-color: var(--angor-primary); - --angor-pagination-hover-bg: #033742; - --angor-pagination-active-bg: var(--angor-primary); - --angor-pagination-active-border: var(--angor-primary); - --angor-progress-bar-bg: var(--angor-primary); - --angor-list-group-action-active-color: var(--angor-secondary); - --angor-list-group-active-bg: var(--angor-primary); - --angor-list-group-active-border: var(--angor-primary); - --angor-btn-close-focus-shadow: rgba(231, 251, 255, 0.25); - --angor-btn-close-bg: var(--angor-primary); - --angor-popover-body-color: var(--angor-secondary); - --angor-text-bg-primary: rgba(231, 251, 255, 1); - --angor-text-bg-secondary: rgba(var(--angor-secondary-rgb), 1); - --angor-link-primary: var(--angor-primary); - --angor-link-secondary: var(--angor-secondary); - --angor-border-primary: var(--angor-primary); - --angor-border-secondary: var(--angor-secondary); - --angor-text-primary: var(--angor-primary); - --angor-text-secondary: var(--angor-secondary); - --angor-shadow-primary: rgba(231, 251, 255, 0.4); - --angor-shadow-light: rgba(231, 251, 255, 0.4); - --angor-alert-primary-bg: var(--angor-primary); - --angor-badge-primary-bg: var(--angor-primary); - --angor-badge-secondary-bg: var(--angor-secondary); - --angor-btn-bg-white-hover: var(--angor-secondary); - --angor-btn-primary-hover-bg: #022229; - --angor-btn-primary-hover-border: var(--angor-primary); - --angor-btn-primary-active-bg: #022229; - --angor-btn-primary-active-border: var(--angor-primary); - --angor-btn-secondary-hover-bg: var(--angor-secondary); - --angor-btn-secondary-hover-border: var(--angor-secondary); - --angor-btn-secondary-active-bg: var(--angor-secondary); - --angor-btn-secondary-active-border: var(--angor-secondary); - --angor-btn-link-color: var(--angor-primary); - --angor-btn-link-hover-color: var(--angor-primary); - --angor-card-bg: #084a59; - --angor-scrollbar-thumb-bg: #083b46; - --angor-scrollbar-thumb-hover-bg: #e78a02c0; - --angor-loading-progress-stroke: #e0e0e0; - --angor-loading-progress-stroke-active: #1b6ec2; - --angor-loading-text-color: #333; - --angor-snackbar-bg: #060b14; - --angor-snackbar-text-color: #fff; - --angor-inner-table-border: #ddd; - --angor-inner-table-bg: gainsboro; - --angor-card-header-img-bg: #084a59; - --angor-card-header-img-hover-bg: #033742; - --angor-card-header-img-border: #012e39; - --angor-btn-angor: var(--angor-primary); - --angor-btn-angor-dark: var(--angor-white); - --angor-btn-angor-hover: #e08604; - --angor-dark-text-white: #fff; - --angor-dark-text-dark: #000; - --angor-dark-bg-gray-100: #f8f9fa; - --angor-dark-bg-gray-600: #6c757d; - --angor-dark-border-dark: #343a40; - --angor-dark-shadow: rgba(255, 255, 255, 0.4); - --angor-modal-header-border-color: #fff; - --angor-modal-zindex: 1050; - --angor-modal-width: 500px; - --angor-modal-padding: 1rem; - --angor-modal-margin: 0.5rem; - --angor-modal-bg: #084a59; - --angor-modal-border-color: rgba(0, 0, 0, 0.2); - --angor-modal-border-width: 1px; - --angor-modal-border-radius: 0.5rem; - --angor-modal-box-shadow: 0 0.3125rem 0.625rem 0 rgba(0, 0, 0, 0.12); - --angor-modal-inner-border-radius: calc(0.5rem - 1px); - --angor-modal-header-padding-x: 1rem; - --angor-modal-header-padding-y: 1rem; - --angor-modal-header-padding: 1rem 1rem; - --angor-modal-header-border-color: #fff; - --angor-modal-header-border-color-dark: #046479; - --angor-modal-header-border-width: 1px; - --angor-modal-title-line-height: 1.5; - --angor-modal-footer-gap: 0.5rem; - --angor-modal-footer-border-color: #fff; - --angor-modal-footer-border-color-dark: #046479; - --angor-modal-footer-border-width: 1px; + --angor-primary: var(--angor-light) !important; + --angor-accent: var(--angor-dark) !important; } + .col-form-label { - color: var(--angor-body-color); + color: var(--angor-primary); } .form-check-input:checked[type="checkbox"] { - background-image: linear-gradient(195deg, var(--angor-form-check-input-checked-bg) 0%, var(--angor-form-check-input-checked-border) 100%); + background-image: linear-gradient(195deg, var(--angor-secondary) 0%, var(--angor-secondary) 100%); } .form-check-input:checked[type="radio"] { - background-image: linear-gradient(195deg, var(--angor-form-check-input-checked-bg) 0%, var(--angor-form-check-input-checked-border) 100%); + background-image: linear-gradient(195deg, var(--angor-secondary) 0%, var(--angor-secondary) 100%); } .form-check-input[type="checkbox"]:indeterminate { - background-color: var(--angor-form-check-input-indeterminate-bg); - border-color: var(--angor-form-check-input-indeterminate-border); + background-color: var(--angor-primary); + border-color: var(--angor-primary); } .form-range::-webkit-slider-thumb { - background-color: var(--angor-form-range-thumb-bg); + background-color: var(--angor-primary); } .form-range::-moz-range-thumb { - background-color: var(--angor-form-range-thumb-bg); + background-color: var(--angor-primary); } -.btn { - --angor-btn-color: var(--angor-btn-color); -} .btn-primary { - --angor-btn-bg: var(--angor-btn-primary-bg); - --angor-btn-border-color: var(--angor-btn-primary-border); - --angor-btn-disabled-bg: var(--angor-btn-primary-bg); - --angor-btn-disabled-border-color: var(--angor-btn-primary-border); -} - -.btn-secondary { - --angor-btn-bg: var(--angor-btn-secondary-bg); - --angor-btn-border-color: var(--angor-btn-secondary-border); - --angor-btn-disabled-bg: var(--angor-btn-secondary-bg); - --angor-btn-disabled-border-color: var(--angor-btn-secondary-border); -} - -.btn-outline-primary { - --angor-btn-color: var(--angor-primary); + --angor-btn-bg: var(--angor-primary); --angor-btn-border-color: var(--angor-primary); - --angor-btn-hover-bg: var(--angor-btn-primary-hover-bg); - --angor-btn-hover-border-color: var(--angor-primary); - --angor-btn-focus-shadow-rgb: var(--angor-primary-rgb); - --angor-btn-active-bg: var(--angor-primary); - --angor-btn-active-border-color: var(--angor-primary); - --angor-btn-disabled-color: var(--angor-primary); - --angor-btn-disabled-bg: transparent; + --angor-btn-disabled-bg: var(--angor-primary); --angor-btn-disabled-border-color: var(--angor-primary); } -.btn-outline-secondary { - --angor-btn-color: var(--angor-secondary); +.btn-secondary { + --angor-btn-bg: var(--angor-secondary); --angor-btn-border-color: var(--angor-secondary); - --angor-btn-hover-bg: var(--angor-btn-secondary-hover-bg); - --angor-btn-hover-border-color: var(--angor-secondary); - --angor-btn-focus-shadow-rgb: var(--angor-secondary-rgb); - --angor-btn-active-bg: var(--angor-secondary); - --angor-btn-active-border-color: var(--angor-secondary); - --angor-btn-disabled-color: var(--angor-secondary); - --angor-btn-disabled-bg: transparent; + --angor-btn-disabled-bg: var(--angor-secondary); --angor-btn-disabled-border-color: var(--angor-secondary); } -.btn-link { - --angor-btn-color: var(--angor-btn-link-color); - --angor-btn-hover-color: var(--angor-btn-link-hover-color); - --angor-btn-active-color: var(--angor-btn-link-hover-color); -} - -.dropdown-menu { - --angor-dropdown-color: var(--angor-dropdown-color); - --angor-dropdown-link-color: var(--angor-dropdown-link-color); - --angor-dropdown-link-active-color: var(--angor-dropdown-link-active-color); -} - -.dropdown-menu-dark { - --angor-dropdown-link-active-color: var(--angor-dropdown-link-active-color); -} - -.accordion { - --angor-accordion-color: var(--angor-accordion-color); - --angor-accordion-btn-color: var(--angor-accordion-btn-color); -} - -.pagination { - --angor-pagination-color: var(--angor-pagination-color); - --angor-pagination-hover-color: var(--angor-pagination-hover-color); - --angor-pagination-hover-bg: var(--angor-pagination-hover-bg); - --angor-pagination-focus-color: var(--angor-pagination-focus-color); - --angor-pagination-active-bg: var(--angor-pagination-active-bg); - --angor-pagination-active-border-color: var(--angor-pagination-active-border-color); -} - -.progress { - --angor-progress-bar-bg: var(--angor-progress-bar-bg); -} - -.list-group { - --angor-list-group-action-active-color: var(--angor-list-group-action-active-color); - --angor-list-group-active-bg: var(--angor-list-group-active-bg); - --angor-list-group-active-border-color: var(--angor-list-group-active-border-color); -} - .btn-close:focus { box-shadow: 0 0 0 0.2rem var(--angor-btn-close-focus-shadow); } .btn-close { - background-color: var(--angor-btn-close-bg); + background-color: var(--angor-primary); } .popover { - --angor-popover-body-color: var(--angor-popover-body-color); + --angor-secondary: var(--angor-secondary); } .text-bg-primary { @@ -411,27 +110,27 @@ } .link-primary { - color: var(--angor-link-primary) !important; + color: var(--angor-primary) !important; } .link-secondary { - color: var(--angor-link-secondary) !important; + color: var(--angor-secondary) !important; } .border-primary { - border-color: var(--angor-border-primary) !important; + border-color: var(--angor-primary) !important; } .border-secondary { - border-color: var(--angor-border-secondary); + border-color: var(--angor-secondary); } .text-primary { - color: var(--angor-text-primary) !important; + color: var(--angor-primary) !important; } .text-secondary { - color: var(--angor-text-secondary) !important; + color: var(--angor-secondary) !important; } .text-body { @@ -447,19 +146,19 @@ } .alert-primary { - background-image: linear-gradient(195deg, var(--angor-alert-primary-bg) 0%, var(--angor-alert-primary-bg) 100%); + background-image: linear-gradient(195deg, var(--angor-primary) 0%, var(--angor-primary) 100%); } .badge.bg-primary { - background: var(--angor-badge-primary-bg); + background: var(--angor-primary); } .badge.bg-secondary { - background: var(--angor-badge-secondary-bg); + background: var(--angor-secondary); } .btn.bg-white:hover { - color: var(--angor-btn-bg-white-hover); + color: var(--angor-secondary); } .btn-primary, @@ -469,8 +168,8 @@ .btn-primary:hover, .btn.bg-gradient-primary:hover { - background-color: var(--angor-btn-primary-hover-bg); - border-color: var(--angor-btn-primary-hover-border); + background-color: var(--angor-primary); + border-color: var(--angor-primary); box-shadow: 0 14px 26px -12px var(--angor-shadow-primary), 0 4px 23px 0 rgba(31, 93, 106, 0.15), 0 8px 10px -5px rgba(31, 93, 106, 0.2); } @@ -486,8 +185,8 @@ .btn.bg-gradient-primary:not(:disabled):not(.disabled):active, .show > .btn.bg-gradient-primary.dropdown-toggle { color: color-yiq(var(--angor-primary)); - background-color: var(--angor-btn-primary-active-bg); - border-color: var(--angor-btn-primary-active-border); + background-color: var(--angor-primary); + border-color: var(--angor-primary); } .btn-outline-primary:hover:not(.active) { @@ -504,8 +203,8 @@ .btn-secondary:hover, .btn.bg-gradient-secondary:hover { - background-color: var(--angor-btn-secondary-hover-bg); - border-color: var(--angor-btn-secondary-hover-border); + background-color: var(--angor-secondary); + border-color: var(--angor-secondary); box-shadow: 0 14px 26px -12px rgba(255,153,0,0.4), 0 4px 23px 0 rgba(255,153,0,0.15), 0 8px 10px -5px rgba(255,153,0,0.2); } @@ -521,8 +220,8 @@ .btn.bg-gradient-secondary:not(:disabled):not(.disabled):active, .show > .btn.bg-gradient-secondary.dropdown-toggle { color: color-yiq(var(--angor-secondary)); - background-color: var(--angor-btn-secondary-active-bg); - border-color: var(--angor-btn-secondary-active-border); + background-color: var(--angor-secondary); + border-color: var(--angor-secondary); } .btn-outline-secondary:hover:not(.active) { @@ -543,7 +242,7 @@ } ::-webkit-scrollbar-thumb { - background: var(--angor-scrollbar-thumb-bg); + background: var(--angor-light); } ::-webkit-scrollbar-thumb:hover { @@ -865,8 +564,8 @@ tr[style*="cursor: pointer;"] { visibility: hidden; min-width: 250px; margin-left: -125px; - background-color: var(--angor-snackbar-bg); - color: var(--angor-snackbar-text-color); + background-color: var(--angor-primary); + color: var(--angor-light); text-align: center; border-radius: 10px; padding: 16px; @@ -884,8 +583,8 @@ tr[style*="cursor: pointer;"] { } .dark #snackbar { - background-color: var(--angor-snackbar-bg-dark); - color: var(--angor-snackbar-text-color-dark); + background-color: var(--angor-dark); + color: var(--angor-light); } @-webkit-keyframes fadein { @@ -1061,15 +760,15 @@ tr[style*="cursor: pointer;"] { } .dark .border { - border-color: var(--angor-dark-border-dark) !important; + border-color: var(--angor-dark) !important; } .dark hr.light { - border-color: var(--angor-dark-text-white); + border-color: var(--angor-primary); } .dark .text-white { - color: var(--angor-dark-text-white) !important; + color: var(--angor-primary) !important; } .dark .text-dark { @@ -1077,24 +776,24 @@ tr[style*="cursor: pointer;"] { } .dark .text-secondary { - color: var(--angor-dark-text-white) !important; + color: var(--angor-primary) !important; } .dark .bg-gray-100 { - background-color: var(--angor-dark-bg-gray-100) !important; + background-color: var(--angor-light) !important; } .dark .bg-gray-600 { - background-color: var(--angor-dark-bg-gray-600) !important; + background-color: var(--angor-secondary) !important; } .dark .btn-link.text-white, .dark .border-dark { - border-color: var(--angor-dark-border-dark) !important; + border-color: var(--angor-dark) !important; } .dark g[fill] { - fill: var(--angor-dark-text-white) !important; + fill: var(--angor-primary) !important; } .btn-content { @@ -1160,7 +859,7 @@ tr[style*="cursor: pointer;"] { } .dark .menu-text { - color: var(--angor-dark-text-white) !important; + color: var(--angor-primary) !important; } .menu-text.active { @@ -1168,7 +867,7 @@ tr[style*="cursor: pointer;"] { } .dark .menu-text.active { - color: var(--angor-dark-text-white) !important; + color: var(--angor-primary) !important; } .navbar-main { @@ -1184,7 +883,7 @@ tr[style*="cursor: pointer;"] { } .text-white { - color: var(--angor-dark-text-white) !important; + color: var(--angor-primary) !important; } .project-card { @@ -1268,6 +967,10 @@ tr[style*="cursor: pointer;"] { background-color: rgba(31, 93, 106, 0.2); color: var(--angor-primary) !important; } + .btn-border:hover { + color: var(--angor-accent); + background-color: rgba(31, 93, 106, 0.6); + } input[type="checkbox"] + label { display: block; @@ -1420,9 +1123,9 @@ input[type="checkbox"] { height: 100%; display: block; object-fit: cover; - } +} + - .profile-container { position: absolute; bottom: 10px; @@ -1607,6 +1310,5 @@ textarea.form-control { } a, a p { - color: var(--angor-secondary) !important; + color: var(--angor-link) !important; } - diff --git a/src/Angor/Client/wwwroot/assets/css/dashboard.css b/src/Angor/Client/wwwroot/assets/css/dashboard.css index ea6733ff..7209916b 100644 --- a/src/Angor/Client/wwwroot/assets/css/dashboard.css +++ b/src/Angor/Client/wwwroot/assets/css/dashboard.css @@ -12,13 +12,13 @@ body { margin: 0; - font-family: var(--angor-body-font-family); + font-family: var(--angor-font-sans-serif); font-size: var(--angor-body-font-size); font-weight: var(--angor-body-font-weight); line-height: var(--angor-body-line-height); - color: var(--angor-body-color) !important; + color: var(--angor-primary) !important; text-align: var(--angor-body-text-align); - background-color: var(--angor-body-bg); + background-color: var(--angor-accent); overflow-y: scroll; -webkit-text-size-adjust: 100%; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); @@ -194,12 +194,12 @@ sup { } a { - color: var(--angor-link-color); + color: var(--angor-primary); text-decoration: none; } a:hover { - color: var(--angor-link-hover-color); + color: var(--angor-primary); text-decoration: none; } @@ -233,7 +233,7 @@ pre { code { font-size: 0.875em; - color: var(--angor-code-color); + color: var(--angor-pink); word-wrap: break-word; } @@ -2368,15 +2368,15 @@ progress { } .table { - --angor-table-color: #ff9900; + --angor-secondary: #ff9900; --angor-table-bg: transparent; --angor-table-border-color: #f0f2f5; --angor-table-accent-bg: transparent; - --angor-table-striped-color: #ff9900; + --angor-secondary: #ff9900; --angor-table-striped-bg: rgba(0, 0, 0, 0.05); - --angor-table-active-color: #ff9900; + --angor-secondary: #ff9900; --angor-table-active-bg: rgba(0, 0, 0, 0.1); - --angor-table-hover-color: #ff9900; + --angor-secondary: #ff9900; --angor-table-hover-bg: rgba(0, 0, 0, 0.075); width: 100%; margin-bottom: 1rem; @@ -2429,133 +2429,133 @@ progress { .table-striped > tbody > tr:nth-of-type(odd) > * { --angor-table-accent-bg: var(--angor-table-striped-bg); - color: var(--angor-table-striped-color); + color: var(--angor-secondary); } .table-striped-columns > :not(caption) > tr > :nth-child(even) { --angor-table-accent-bg: var(--angor-table-striped-bg); - color: var(--angor-table-striped-color); + color: var(--angor-secondary); } .table-active { --angor-table-accent-bg: var(--angor-table-active-bg); - color: var(--angor-table-active-color); + color: var(--angor-secondary); } .table-hover > tbody > tr:hover > * { --angor-table-accent-bg: var(--angor-table-hover-bg); - color: var(--angor-table-hover-color); + color: var(--angor-secondary); } .table-primary { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #fbd2e0; --angor-table-border-color: #e2bdca; --angor-table-striped-bg: #eec8d5; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #e2bdca; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #e8c2cf; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-secondary { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #e5e6eb; --angor-table-border-color: #cecfd4; --angor-table-striped-bg: #dadbdf; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #cecfd4; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #d4d5d9; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-success { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #dbefdc; --angor-table-border-color: #c5d7c6; --angor-table-striped-bg: #d0e3d1; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #c5d7c6; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #cbddcc; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-info { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #d1e3fa; --angor-table-border-color: #bccce1; --angor-table-striped-bg: #c7d8ee; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #bccce1; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #c1d2e7; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-warning { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #fee8cc; --angor-table-border-color: #e5d1b8; --angor-table-striped-bg: #f1dcc2; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #e5d1b8; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #ebd7bd; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-danger { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #fdd9d7; --angor-table-border-color: #e4c3c2; --angor-table-striped-bg: #f0cecc; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #e4c3c2; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #eac9c7; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-light { - --angor-table-color: #000; + --angor-secondary: #000; --angor-table-bg: #f0f2f5; --angor-table-border-color: #d8dadd; --angor-table-striped-bg: #e4e6e9; - --angor-table-striped-color: #000; + --angor-secondary: #000; --angor-table-active-bg: #d8dadd; - --angor-table-active-color: #000; + --angor-secondary: #000; --angor-table-hover-bg: #dee0e3; - --angor-table-hover-color: #000; - color: var(--angor-table-color); + --angor-secondary: #000; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } .table-dark { - --angor-table-color: #fff; + --angor-secondary: #fff; --angor-table-bg: #344767; --angor-table-border-color: #485976; --angor-table-striped-bg: #3e506f; - --angor-table-striped-color: #fff; + --angor-secondary: #fff; --angor-table-active-bg: #485976; - --angor-table-active-color: #fff; + --angor-secondary: #fff; --angor-table-hover-bg: #435572; - --angor-table-hover-color: #fff; - color: var(--angor-table-color); + --angor-secondary: #fff; + color: var(--angor-secondary); border-color: var(--angor-table-border-color); } @@ -3514,7 +3514,7 @@ textarea.form-control.is-invalid { --angor-btn-font-size: 0.75rem; --angor-btn-font-weight: 700; --angor-btn-line-height: 1.667; - --angor-btn-color: #ff9900; + --angor-secondary: #ff9900; --angor-btn-bg: transparent; --angor-btn-border-width: 1px; --angor-btn-border-color: transparent; @@ -3529,7 +3529,7 @@ textarea.form-control.is-invalid { font-size: var(--angor-btn-font-size); font-weight: var(--angor-btn-font-weight); line-height: var(--angor-btn-line-height); - color: var(--angor-btn-color); + color: var(--angor-secondary); text-align: center; vertical-align: middle; cursor: pointer; @@ -3546,21 +3546,15 @@ textarea.form-control.is-invalid { } } -.btn:hover { - color: var(--angor-btn-hover-color); - background-color: var(--angor-btn-hover-bg); - border-color: var(--angor-btn-hover-border-color); -} - .btn-check + .btn:hover { - color: var(--angor-btn-color); + color: var(--angor-secondary); background-color: var(--angor-btn-bg); border-color: var(--angor-btn-border-color); } .btn:focus-visible { color: var(--angor-btn-hover-color); - background-color: var(--angor-btn-hover-bg); + background-color: var(--angor-secondary); border-color: var(--angor-btn-hover-border-color); outline: 0; box-shadow: var(--angor-btn-focus-box-shadow); @@ -3601,11 +3595,11 @@ fieldset:disabled .btn { } .btn-primary { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #1f5d6a; --angor-btn-border-color: #1f5d6a; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #ec407a; + --angor-secondary: #ec407a; --angor-btn-hover-border-color: #eb3573; --angor-btn-focus-shadow-rgb: 198, 26, 84; --angor-btn-active-color: #000; @@ -3618,11 +3612,11 @@ fieldset:disabled .btn { } .btn-secondary { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #ff9900; --angor-btn-border-color: #ff9900; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #8f93a9; + --angor-secondary: #8f93a9; --angor-btn-hover-border-color: #888da4; --angor-btn-focus-shadow-rgb: 105, 109, 131; --angor-btn-active-color: #000; @@ -3635,11 +3629,11 @@ fieldset:disabled .btn { } .btn-success { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #4CAF50; --angor-btn-border-color: #4CAF50; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #67bb6a; + --angor-secondary: #67bb6a; --angor-btn-hover-border-color: #5eb762; --angor-btn-focus-shadow-rgb: 65, 149, 68; --angor-btn-active-color: #000; @@ -3652,11 +3646,11 @@ fieldset:disabled .btn { } .btn-info { - --angor-btn-color: #fff; + --angor-secondary: #fff; --angor-btn-bg: #1A73E8; --angor-btn-border-color: #1A73E8; --angor-btn-hover-color: #fff; - --angor-btn-hover-bg: #1662c5; + --angor-secondary: #1662c5; --angor-btn-hover-border-color: #155cba; --angor-btn-focus-shadow-rgb: 60, 136, 235; --angor-btn-active-color: #fff; @@ -3669,11 +3663,11 @@ fieldset:disabled .btn { } .btn-warning { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #fb8c00; --angor-btn-border-color: #fb8c00; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #fc9d26; + --angor-secondary: #fc9d26; --angor-btn-hover-border-color: #fb981a; --angor-btn-focus-shadow-rgb: 213, 119, 0; --angor-btn-active-color: #000; @@ -3686,11 +3680,11 @@ fieldset:disabled .btn { } .btn-danger { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #F44335; --angor-btn-border-color: #F44335; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #f65f53; + --angor-secondary: #f65f53; --angor-btn-hover-border-color: #f55649; --angor-btn-focus-shadow-rgb: 207, 57, 45; --angor-btn-active-color: #000; @@ -3703,11 +3697,11 @@ fieldset:disabled .btn { } .btn-light { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #f0f2f5; --angor-btn-border-color: #f0f2f5; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #ccced0; + --angor-secondary: #ccced0; --angor-btn-hover-border-color: #c0c2c4; --angor-btn-focus-shadow-rgb: 204, 206, 208; --angor-btn-active-color: #000; @@ -3720,11 +3714,11 @@ fieldset:disabled .btn { } .btn-dark { - --angor-btn-color: #fff; + --angor-secondary: #fff; --angor-btn-bg: #344767; --angor-btn-border-color: #344767; --angor-btn-hover-color: #fff; - --angor-btn-hover-bg: #52637e; + --angor-secondary: #52637e; --angor-btn-hover-border-color: #485976; --angor-btn-focus-shadow-rgb: 82, 99, 126; --angor-btn-active-color: #fff; @@ -3737,11 +3731,11 @@ fieldset:disabled .btn { } .btn-white { - --angor-btn-color: #000; + --angor-secondary: #000; --angor-btn-bg: #fff; --angor-btn-border-color: #fff; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: white; + --angor-secondary: white; --angor-btn-hover-border-color: white; --angor-btn-focus-shadow-rgb: 217, 217, 217; --angor-btn-active-color: #000; @@ -3754,11 +3748,11 @@ fieldset:disabled .btn { } .btn-dark-blue { - --angor-btn-color: #fff; + --angor-secondary: #fff; --angor-btn-bg: #1A237E; --angor-btn-border-color: #1A237E; --angor-btn-hover-color: #fff; - --angor-btn-hover-bg: #161e6b; + --angor-secondary: #161e6b; --angor-btn-hover-border-color: #151c65; --angor-btn-focus-shadow-rgb: 60, 68, 145; --angor-btn-active-color: #fff; @@ -3771,10 +3765,10 @@ fieldset:disabled .btn { } .btn-outline-primary { - --angor-btn-color: #1f5d6a; + --angor-secondary: #1f5d6a; --angor-btn-border-color: #1f5d6a; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #1f5d6a; + --angor-secondary: #1f5d6a; --angor-btn-hover-border-color: #1f5d6a; --angor-btn-focus-shadow-rgb: 233, 30, 99; --angor-btn-active-color: #000; @@ -3788,10 +3782,10 @@ fieldset:disabled .btn { } .btn-outline-secondary { - --angor-btn-color: #ff9900; + --angor-secondary: #ff9900; --angor-btn-border-color: #ff9900; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #ff9900; + --angor-secondary: #ff9900; --angor-btn-hover-border-color: #ff9900; --angor-btn-focus-shadow-rgb: 0, 128, 154; --angor-btn-active-color: #000; @@ -3805,10 +3799,10 @@ fieldset:disabled .btn { } .btn-outline-success { - --angor-btn-color: #4CAF50; + --angor-secondary: #4CAF50; --angor-btn-border-color: #4CAF50; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #4CAF50; + --angor-secondary: #4CAF50; --angor-btn-hover-border-color: #4CAF50; --angor-btn-focus-shadow-rgb: 76, 175, 80; --angor-btn-active-color: #000; @@ -3822,10 +3816,10 @@ fieldset:disabled .btn { } .btn-outline-info { - --angor-btn-color: #1A73E8; + --angor-secondary: #1A73E8; --angor-btn-border-color: #1A73E8; --angor-btn-hover-color: #fff; - --angor-btn-hover-bg: #1A73E8; + --angor-secondary: #1A73E8; --angor-btn-hover-border-color: #1A73E8; --angor-btn-focus-shadow-rgb: 26, 115, 232; --angor-btn-active-color: #fff; @@ -3839,10 +3833,10 @@ fieldset:disabled .btn { } .btn-outline-warning { - --angor-btn-color: #fb8c00; + --angor-secondary: #fb8c00; --angor-btn-border-color: #fb8c00; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #fb8c00; + --angor-secondary: #fb8c00; --angor-btn-hover-border-color: #fb8c00; --angor-btn-focus-shadow-rgb: 251, 140, 0; --angor-btn-active-color: #000; @@ -3856,10 +3850,10 @@ fieldset:disabled .btn { } .btn-outline-danger { - --angor-btn-color: #F44335; + --angor-secondary: #F44335; --angor-btn-border-color: #F44335; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #F44335; + --angor-secondary: #F44335; --angor-btn-hover-border-color: #F44335; --angor-btn-focus-shadow-rgb: 244, 67, 53; --angor-btn-active-color: #000; @@ -3873,10 +3867,10 @@ fieldset:disabled .btn { } .btn-outline-light { - --angor-btn-color: #f0f2f5; + --angor-secondary: #f0f2f5; --angor-btn-border-color: #f0f2f5; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #f0f2f5; + --angor-secondary: #f0f2f5; --angor-btn-hover-border-color: #f0f2f5; --angor-btn-focus-shadow-rgb: 240, 242, 245; --angor-btn-active-color: #000; @@ -3890,10 +3884,10 @@ fieldset:disabled .btn { } .btn-outline-dark { - --angor-btn-color: #344767; + --angor-secondary: #344767; --angor-btn-border-color: #344767; --angor-btn-hover-color: #fff; - --angor-btn-hover-bg: #344767; + --angor-secondary: #344767; --angor-btn-hover-border-color: #344767; --angor-btn-focus-shadow-rgb: 52, 71, 103; --angor-btn-active-color: #fff; @@ -3907,10 +3901,10 @@ fieldset:disabled .btn { } .btn-outline-white { - --angor-btn-color: #fff; + --angor-secondary: #fff; --angor-btn-border-color: #fff; --angor-btn-hover-color: #000; - --angor-btn-hover-bg: #fff; + --angor-secondary: #fff; --angor-btn-hover-border-color: #fff; --angor-btn-focus-shadow-rgb: 255, 255, 255; --angor-btn-active-color: #000; @@ -3924,10 +3918,10 @@ fieldset:disabled .btn { } .btn-outline-dark-blue { - --angor-btn-color: #1A237E; + --angor-secondary: #1A237E; --angor-btn-border-color: #1A237E; --angor-btn-hover-color: #fff; - --angor-btn-hover-bg: #1A237E; + --angor-secondary: #1A237E; --angor-btn-hover-border-color: #1A237E; --angor-btn-focus-shadow-rgb: 26, 35, 126; --angor-btn-active-color: #fff; @@ -3942,7 +3936,7 @@ fieldset:disabled .btn { .btn-link { --angor-btn-font-weight: 400; - --angor-btn-color: #1f5d6a; + --angor-secondary: #1f5d6a; --angor-btn-bg: transparent; --angor-btn-border-color: transparent; --angor-btn-hover-color: #1f5d6a; @@ -3962,7 +3956,7 @@ fieldset:disabled .btn { } .btn-link:focus-visible { - color: var(--angor-btn-color); + color: var(--angor-secondary); } .btn-link:hover { @@ -4062,7 +4056,7 @@ fieldset:disabled .btn { --angor-dropdown-padding-y: 0.5rem; --angor-dropdown-spacer: 1.625rem; --angor-dropdown-font-size: 0.875rem; - --angor-dropdown-color: #ff9900; + --angor-secondary: #ff9900; --angor-dropdown-bg: #fff; --angor-dropdown-border-color: transparent; --angor-dropdown-border-radius: 0.375rem; @@ -4071,10 +4065,10 @@ fieldset:disabled .btn { --angor-dropdown-divider-bg: transparent; --angor-dropdown-divider-margin-y: 0.5rem; --angor-dropdown-box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); - --angor-dropdown-link-color: #ff9900; + --angor-secondary: #ff9900; --angor-dropdown-link-hover-color: #344767; --angor-dropdown-link-hover-bg: #f0f2f5; - --angor-dropdown-link-active-color: #ff9900; + --angor-secondary: #ff9900; --angor-dropdown-link-active-bg: transparent; --angor-dropdown-link-disabled-color: #6c757d; --angor-dropdown-item-padding-x: 1rem; @@ -4089,7 +4083,7 @@ fieldset:disabled .btn { padding: var(--angor-dropdown-padding-y) var(--angor-dropdown-padding-x); margin: 0; font-size: var(--angor-dropdown-font-size); - color: var(--angor-dropdown-color); + color: var(--angor-secondary); text-align: left; list-style: none; background-color: var(--angor-dropdown-bg); @@ -4322,7 +4316,7 @@ fieldset:disabled .btn { padding: var(--angor-dropdown-item-padding-y) var(--angor-dropdown-item-padding-x); clear: both; font-weight: 400; - color: var(--angor-dropdown-link-color); + color: var(--angor-secondary); text-align: inherit; white-space: nowrap; background-color: transparent; @@ -4337,7 +4331,7 @@ fieldset:disabled .btn { .dropdown-item.active, .dropdown-item:active { - color: var(--angor-dropdown-link-active-color); + color: var(--angor-secondary); text-decoration: none; background-color: var(--angor-dropdown-link-active-bg); } @@ -4365,18 +4359,18 @@ fieldset:disabled .btn { .dropdown-item-text { display: block; padding: var(--angor-dropdown-item-padding-y) var(--angor-dropdown-item-padding-x); - color: var(--angor-dropdown-link-color); + color: var(--angor-secondary); } .dropdown-menu-dark { - --angor-dropdown-color: #dee2e6; + --angor-secondary: #dee2e6; --angor-dropdown-bg: #343a40; --angor-dropdown-border-color: transparent; - --angor-dropdown-link-color: #dee2e6; + --angor-secondary: #dee2e6; --angor-dropdown-link-hover-color: #fff; --angor-dropdown-divider-bg: transparent; --angor-dropdown-link-hover-bg: rgba(255, 255, 255, 0.15); - --angor-dropdown-link-active-color: #ff9900; + --angor-secondary: #ff9900; --angor-dropdown-link-active-bg: transparent; --angor-dropdown-link-disabled-color: #adb5bd; --angor-dropdown-header-color: #adb5bd; @@ -4501,8 +4495,8 @@ fieldset:disabled .btn { .nav { --angor-nav-link-padding-x: 1rem; --angor-nav-link-padding-y: 0.5rem; - --angor-nav-link-color: var(--angor-link-color); - --angor-nav-link-hover-color: var(--angor-link-hover-color); + --angor-nav-link-color: var(--angor-primary); + --angor-nav-link-hover-color: var(--angor-primary); --angor-nav-link-disabled-color: #6c757d; display: flex; flex-wrap: wrap; @@ -5135,7 +5129,7 @@ fieldset:disabled .btn { --angor-card-cap-padding-x: 1rem; --angor-card-cap-bg: #fff; --angor-card-color: #1f5d6a; - --angor-card-bg: rgba(245, 253, 255, 0.9); + --angor-accent: rgba(245, 253, 255, 0.9); --angor-card-img-overlay-padding: 1rem; --angor-card-group-margin: 0.75rem; position: relative; @@ -5144,14 +5138,16 @@ fieldset:disabled .btn { min-width: 0; height: var(--angor-card-height); word-wrap: break-word; - background-color: var(--angor-card-bg); + background-color: var(--angor-accent); background-clip: border-box; border: var(--angor-card-border-width) solid var(--angor-card-border-color); border-radius: var(--angor-card-border-radius); margin-left: 4px; margin-right: 4px; } - +.dark .card { + --angor-accent: var(--angor-dark) !important; +} .card > hr { margin-right: 0; margin-left: 0; @@ -5233,8 +5229,8 @@ fieldset:disabled .btn { } .card-header-tabs .nav-link.active { - background-color: var(--angor-card-bg); - border-bottom-color: var(--angor-card-bg); + background-color: var(--angor-accent); + border-bottom-color: var(--angor-accent); } .card-header-pills { @@ -5322,7 +5318,7 @@ fieldset:disabled .btn { } .accordion { - --angor-accordion-color: #ff9900; + --angor-secondary: #ff9900; --angor-accordion-bg: transparent; --angor-accordion-transition: all 0.15s ease-in, border-radius 0.15s ease; --angor-accordion-border-color: rgba(0, 0, 0, 0.125); @@ -5331,7 +5327,7 @@ fieldset:disabled .btn { --angor-accordion-inner-border-radius: 0.125rem; --angor-accordion-btn-padding-x: 0rem; --angor-accordion-btn-padding-y: 1rem; - --angor-accordion-btn-color: #ff9900; + --angor-secondary: #ff9900; --angor-accordion-btn-bg: transparent; --angor-accordion-btn-icon: none; --angor-accordion-btn-icon-width: 1rem; @@ -5353,7 +5349,7 @@ fieldset:disabled .btn { width: 100%; padding: var(--angor-accordion-btn-padding-y) var(--angor-accordion-btn-padding-x); font-size: 1rem; - color: var(--angor-accordion-btn-color); + color: var(--angor-secondary); text-align: left; background-color: var(--angor-accordion-btn-bg); border: 0; @@ -5512,20 +5508,20 @@ fieldset:disabled .btn { --angor-pagination-padding-x: 0.75rem; --angor-pagination-padding-y: 0.375rem; --angor-pagination-font-size: 1rem; - --angor-pagination-color: #1f5d6a; + --angor-primary: #1f5d6a; --angor-pagination-bg: #fff; --angor-pagination-border-width: 1px; --angor-pagination-border-color: #dee2e6; --angor-pagination-border-radius: 0.375rem; - --angor-pagination-hover-color: #1f5d6a; - --angor-pagination-hover-bg: #f0f2f5; + --angor-primary: #1f5d6a; + --angor-light: #f0f2f5; --angor-pagination-hover-border-color: #dee2e6; --angor-pagination-focus-color: #1f5d6a; --angor-pagination-focus-bg: #f0f2f5; --angor-pagination-focus-box-shadow: 0 0 0 0.2rem rgba(233, 30, 99, 0.25); --angor-pagination-active-color: #fff; - --angor-pagination-active-bg: #1f5d6a; - --angor-pagination-active-border-color: #1f5d6a; + --angor-primary: #1f5d6a; + --angor-primary-color: #1f5d6a; --angor-pagination-disabled-color: #6c757d; --angor-pagination-disabled-bg: #fff; --angor-pagination-disabled-border-color: #dee2e6; @@ -5539,7 +5535,7 @@ fieldset:disabled .btn { display: block; padding: var(--angor-pagination-padding-y) var(--angor-pagination-padding-x); font-size: var(--angor-pagination-font-size); - color: var(--angor-pagination-color); + color: var(--angor-primary); background-color: var(--angor-pagination-bg); border: var(--angor-pagination-border-width) solid var(--angor-pagination-border-color); transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; @@ -5553,8 +5549,8 @@ fieldset:disabled .btn { .page-link:hover { z-index: 2; - color: var(--angor-pagination-hover-color); - background-color: var(--angor-pagination-hover-bg); + color: var(--angor-primary); + background-color: var(--angor-light); border-color: var(--angor-pagination-hover-border-color); } @@ -5570,8 +5566,8 @@ fieldset:disabled .btn { .active > .page-link { z-index: 3; color: var(--angor-pagination-active-color); - background-color: var(--angor-pagination-active-bg); - border-color: var(--angor-pagination-active-border-color); + background-color: var(--angor-primary); + border-color: var(--angor-primary-color); } .page-link.disabled, @@ -5733,7 +5729,7 @@ fieldset:disabled .btn { } .alert-danger { - --angor-alert-color: #922820; + --angor-alert-color: #cbdde1; --angor-alert-bg: #fdd9d7; --angor-alert-border-color: #fcc7c2; } @@ -5795,7 +5791,7 @@ fieldset:disabled .btn { --angor-progress-border-radius: 0.125rem; --angor-progress-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); --angor-progress-bar-color: #fff; - --angor-progress-bar-bg: #1f5d6a; + --angor-primary: #1f5d6a; --angor-progress-bar-transition: width 0.6s ease; display: flex; height: var(--angor-progress-height); @@ -5813,7 +5809,7 @@ fieldset:disabled .btn { color: var(--angor-progress-bar-color); text-align: center; white-space: nowrap; - background-color: var(--angor-progress-bar-bg); + background-color: var(--angor-primary); transition: var(--angor-progress-bar-transition); } @@ -5849,13 +5845,13 @@ fieldset:disabled .btn { --angor-list-group-action-color: #495057; --angor-list-group-action-hover-color: #495057; --angor-list-group-action-hover-bg: #f8f9fa; - --angor-list-group-action-active-color: #ff9900; + --angor-secondary: #ff9900; --angor-list-group-action-active-bg: #f0f2f5; --angor-list-group-disabled-color: #6c757d; --angor-list-group-disabled-bg: #fff; --angor-list-group-active-color: #fff; - --angor-list-group-active-bg: #1f5d6a; - --angor-list-group-active-border-color: #1f5d6a; + --angor-primary: #1f5d6a; + --angor-primary-color: #1f5d6a; display: flex; flex-direction: column; padding-left: 0; @@ -5888,7 +5884,7 @@ fieldset:disabled .btn { } .list-group-item-action:active { - color: var(--angor-list-group-action-active-color); + color: var(--angor-secondary); background-color: var(--angor-list-group-action-active-bg); } @@ -5921,8 +5917,8 @@ fieldset:disabled .btn { .list-group-item.active { z-index: 2; color: var(--angor-list-group-active-color); - background-color: var(--angor-list-group-active-bg); - border-color: var(--angor-list-group-active-border-color); + background-color: var(--angor-primary); + border-color: var(--angor-primary-color); } .list-group-item + .list-group-item { @@ -6464,10 +6460,10 @@ fieldset:disabled .btn { width: 100%; color: var(--angor-modal-color); pointer-events: auto; - background-color: var(--angor-modal-bg); + background-color: var(--angor-accent); background-clip: padding-box; - border: var(--angor-modal-border-width) solid var(--angor-modal-border-color); - border-radius: var(--angor-modal-border-radius); + border: 2px solid var(--angor-secondary); + border-radius: 10px; outline: 0; } @@ -6724,7 +6720,7 @@ fieldset:disabled .btn { display: block; padding: var(--angor-tooltip-arrow-height); margin: var(--angor-tooltip-margin); - font-family: var(--angor-body-font-family); + font-family: var(--angor-font-sans-serif); font-style: normal; font-weight: 400; line-height: 1.5; @@ -6838,14 +6834,14 @@ fieldset:disabled .btn { --angor-popover-header-bg: #f0f2f5; --angor-popover-body-padding-x: 1rem; --angor-popover-body-padding-y: 1rem; - --angor-popover-body-color: #ff9900; + --angor-secondary: #ff9900; --angor-popover-arrow-width: 1rem; --angor-popover-arrow-height: 0.5rem; --angor-popover-arrow-border: var(--angor-popover-border-color); z-index: var(--angor-popover-zindex); display: block; max-width: var(--angor-popover-max-width); - font-family: var(--angor-body-font-family); + font-family: var(--angor-font-sans-serif); font-style: normal; font-weight: 400; line-height: 1.5; @@ -7012,7 +7008,7 @@ fieldset:disabled .btn { .popover-body { padding: var(--angor-popover-body-padding-y) var(--angor-popover-body-padding-x); - color: var(--angor-popover-body-color); + color: var(--angor-secondary); } .carousel { @@ -24325,7 +24321,7 @@ body:not(.dark) .sidenav.bg-transparent .collapse .nav-item .nav-link.active.tex } .navbar-main { - --angor-card-bg: rgba(245, 253, 255, 0.9); + --angor-accent: rgba(245, 253, 255, 0.9); } .navbar-main.fixed-top { diff --git a/src/Angor/Client/wwwroot/assets/icons/refresh.svg b/src/Angor/Client/wwwroot/assets/icons/refresh.svg index a84d4c92..a83ecd14 100644 --- a/src/Angor/Client/wwwroot/assets/icons/refresh.svg +++ b/src/Angor/Client/wwwroot/assets/icons/refresh.svg @@ -1,4 +1,4 @@  - - + + \ No newline at end of file diff --git a/src/Angor/Client/wwwroot/service-worker.js b/src/Angor/Client/wwwroot/service-worker.js index fe614dae..8fb539fb 100644 --- a/src/Angor/Client/wwwroot/service-worker.js +++ b/src/Angor/Client/wwwroot/service-worker.js @@ -1,4 +1 @@ -// In development, always fetch from the network and do not enable offline support. -// This is because caching would make development more difficult (changes would not -// be reflected on the first load after each change). self.addEventListener('fetch', () => { }); diff --git a/src/Angor/Client/wwwroot/service-worker.published.js b/src/Angor/Client/wwwroot/service-worker.published.js index f64e8d62..99d66a8e 100644 --- a/src/Angor/Client/wwwroot/service-worker.published.js +++ b/src/Angor/Client/wwwroot/service-worker.published.js @@ -36,27 +36,30 @@ const onAppUpdating = () => { async function onActivate(event) { console.info('Service worker: Activate'); + self.skipWaiting(); - // Delete unused caches const cacheKeys = await caches.keys(); - await Promise.all(cacheKeys - .filter(key => key.startsWith(cacheNamePrefix) && key !== cacheName) - .map(key => caches.delete(key))); + await Promise.all( + cacheKeys + .filter(key => key.startsWith(cacheNamePrefix) && key !== cacheName) + .map(key => caches.delete(key)) + ); } + async function onFetch(event) { - let cachedResponse = null; - if (event.request.method === 'GET') { - // For all navigation requests, try to serve index.html from cache - // If you need some URLs to be server-rendered, edit the following check to exclude those URLs - if (!event.request.url.includes('/swagger/') && !event.request.url.includes('/jobs') && !event.request.url.includes('/api/') && !event.request.url.includes('/Files/')) { - const shouldServeIndexHtml = event.request.mode === 'navigate'; - - const request = shouldServeIndexHtml ? 'index.html' : event.request; - const cache = await caches.open(cacheName); - cachedResponse = await cache.match(request); - } + if (event.request.method === 'GET' && !event.request.url.includes('/api/')) { + const cache = await caches.open(cacheName); + const cachedResponse = await cache.match(event.request); + + const networkFetch = fetch(event.request).then(networkResponse => { + cache.put(event.request, networkResponse.clone()); + return networkResponse; + }); + + return cachedResponse || networkFetch; } - return cachedResponse || fetch(event.request); + return fetch(event.request); } +