Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/ResidencyRoll.Web/Components/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
<link rel="stylesheet" href="_content/Radzen.Blazor/css/default-base.css" />
<link rel="stylesheet" href="@Assets["app.css"]" />
<link rel="stylesheet" href="@Assets["ResidencyRoll.Web.styles.css"]" />
<link rel="stylesheet" href="@Assets["custom-theme.css"]" />
<link rel="stylesheet" href="@Assets["liquid-glass-utils.css"]" />
<link rel="stylesheet" href="@Assets["liquid-glass-accessibility.css"]" />
<link rel="stylesheet" href="@Assets["liquid-glass-force.css"]" />
<link rel="stylesheet" href="@Assets["carbon-theme.css"]" />
<link rel="stylesheet" href="@Assets["carbon-utils.css"]" />
<link rel="stylesheet" href="@Assets["accessibility.css"]" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;600;700&display=swap" rel="stylesheet">
<ImportMap />
<link rel="icon" type="image/png" href="favicon.png" />
<HeadOutlet @rendermode="InteractiveServer" />
Expand All @@ -32,7 +31,6 @@
<script src="@Assets["_framework/blazor.web.js"]"></script>
<script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>
<script src="js/download.js"></script>
<script src="js/liquid-glass.js"></script>
</body>

</html>
6 changes: 3 additions & 3 deletions src/ResidencyRoll.Web/Components/Layout/MainLayout.razor
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@using Radzen.Blazor
@inherits LayoutComponentBase

<RadzenLayout style="background: transparent;">
<RadzenHeader class="glass-header">
<RadzenLayout>
<RadzenHeader>
<div class="header-content">
<h4 class="header-title">Residency Roll - Residency Status Dashboard</h4>
<LoginDisplay />
</div>
</RadzenHeader>

<RadzenSidebar class="glass-sidebar">
<RadzenSidebar>
<NavMenu />
</RadzenSidebar>

Expand Down
16 changes: 8 additions & 8 deletions src/ResidencyRoll.Web/Components/Layout/MainLayout.razor.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ main {
}

.sidebar {
background: transparent !important;
background-image: none !important;
background-color: var(--cds-layer-02, #ffffff);
}

.top-row {
background-color: #f7f7f7;
border-bottom: 1px solid #d6d5d5;
background-color: var(--cds-layer-02, #ffffff);
border-bottom: 1px solid var(--cds-border-subtle-00, #e0e0e0);
justify-content: flex-end;
height: 3.5rem;
height: 3rem;
display: flex;
align-items: center;
}
Expand Down Expand Up @@ -79,13 +78,14 @@ main {

#blazor-error-ui {
color-scheme: light only;
background: lightyellow;
background: #fff1f1;
border-left: 3px solid var(--cds-support-error, #da1e28);
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.1);
box-sizing: border-box;
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
padding: 0.75rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
Expand Down
51 changes: 26 additions & 25 deletions src/ResidencyRoll.Web/Components/Layout/NavMenu.razor.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
cursor: pointer;
width: 3.5rem;
height: 2.5rem;
color: white;
color: var(--cds-icon-primary, #161616);
position: absolute;
top: 0.5rem;
right: 1rem;
border: 1px solid rgba(255, 255, 255, 0.1);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
border: 1px solid var(--cds-border-subtle-00, #e0e0e0);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='%23525252' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem var(--cds-layer-01, #f4f4f4);
}

.navbar-toggler:checked {
background-color: rgba(255, 255, 255, 0.5);
background-color: var(--cds-layer-hover-01, #e8e8e8);
}

.top-row {
min-height: 3.5rem;
background-color: transparent !important;
min-height: 3rem;
background-color: var(--cds-layer-02, #ffffff);
}

.navbar-brand {
Expand All @@ -35,20 +35,20 @@
}

.bi-house-door-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23525252' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
}

.bi-plus-square-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23525252' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
}

.bi-list-nested-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23525252' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
}

.nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
font-size: 0.875rem;
padding-bottom: 0.25rem;
}

.nav-item:first-of-type {
Expand All @@ -60,32 +60,33 @@
}

.nav-item ::deep .nav-link {
color: var(--color-text-primary, #1D1D1F);
background: transparent !important;
color: var(--cds-text-secondary, #525252);
background: transparent;
border: none;
border-radius: 14px;
height: 3rem;
border-radius: 0;
height: 2.5rem;
display: flex;
align-items: center;
line-height: 3rem;
line-height: 2.5rem;
width: 100%;
font-weight: 500;
font-weight: 400;
transition: background-color 110ms cubic-bezier(0.2, 0, 0.38, 0.9);
}

.nav-item ::deep a.active {
background: rgba(0, 113, 227, 0.14) !important;
color: var(--color-accent-active, #005BB5) !important;
box-shadow: inset 0 0 0 1px rgba(0, 113, 227, 0.22) !important;
background-color: var(--cds-layer-selected-01, #e0e0e0);
color: var(--cds-text-primary, #161616);
font-weight: 600;
border-left: 3px solid var(--cds-blue-60, #0f62fe);
}

.nav-item ::deep a.active * {
color: var(--color-accent-active, #005BB5) !important;
color: var(--cds-text-primary, #161616);
}

.nav-item ::deep .nav-link:hover {
background: rgba(255, 255, 255, 0.3) !important;
backdrop-filter: blur(16px) !important;
color: var(--color-text-primary, #1D1D1F);
background-color: var(--cds-layer-hover-01, #e8e8e8);
color: var(--cds-text-primary, #161616);
}

.nav-scrollable {
Expand All @@ -106,7 +107,7 @@
display: block;

/* Allow sidebar to scroll for tall menus */
height: calc(100vh - 3.5rem);
height: calc(100vh - 3rem);
overflow-y: auto;
}
}
Loading
Loading