diff --git a/Test.UI/Components/Layout/MainLayout.razor b/Test.UI/Components/Layout/MainLayout.razor index 5a24bb1..1a87012 100644 --- a/Test.UI/Components/Layout/MainLayout.razor +++ b/Test.UI/Components/Layout/MainLayout.razor @@ -1,8 +1,8 @@ @inherits LayoutComponentBase
-
- +
+
@@ -13,6 +13,7 @@
@Body
+
diff --git a/Test.UI/Components/Layout/MainLayout.razor.cs b/Test.UI/Components/Layout/MainLayout.razor.cs new file mode 100644 index 0000000..88d293f --- /dev/null +++ b/Test.UI/Components/Layout/MainLayout.razor.cs @@ -0,0 +1,15 @@ +namespace Test.UI.Components.Layout +{ + public partial class MainLayout + { + protected string sideClass { get; set; } = "sidebar"; + + protected void UpdateNavDisplay() + { + navLarge = !navLarge; + sideClass = navLarge ? "sidebar" : "sidebarSmall"; + } + + private bool navLarge = true; + } +} diff --git a/Test.UI/Components/Layout/MainLayout.razor.css b/Test.UI/Components/Layout/MainLayout.razor.css index 038baf1..5d0becd 100644 --- a/Test.UI/Components/Layout/MainLayout.razor.css +++ b/Test.UI/Components/Layout/MainLayout.razor.css @@ -1,96 +1,83 @@ -.page { - position: relative; - display: flex; - flex-direction: column; +.page { + position: relative; + display: flex; + flex-direction: column; } - main { - flex: 1; + flex: 1; + margin-left: 14rem; } - -.sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); +.sidebar, +.sidebarSmall { + /*background-image: linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%);*/ + background: -webkit-linear-gradient(to bottom, #d5f1f2, #d5f1f2); + /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to bottom, #d5f1f2, #d5f1f2); + /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ } - .top-row { - background-color: #f7f7f7; - border-bottom: 1px solid #d6d5d5; - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + /*justify-content: flex-end;*/ + height: 3.5rem; + display: flex; + align-items: center; +} +.top-row ::deep a, +.top-row .btn-link { + white-space: nowrap; + margin-left: 1.5rem; +} +.top-row a:first-child { + overflow: hidden; + text-overflow: ellipsis; +} +.bottom-row { + color: #dedede; + background-color: #000000; + height: 1.6rem; + align-items: center; } - - .top-row ::deep a, .top-row ::deep .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - text-decoration: none; - } - - .top-row ::deep a:hover, .top-row ::deep .btn-link:hover { - text-decoration: underline; - } - - .top-row ::deep a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } - @media (max-width: 640.98px) { - .top-row { - justify-content: space-between; - } - - .top-row ::deep a, .top-row ::deep .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .top-row { - position: sticky; - top: 0; - z-index: 1; - } - - .top-row.auth ::deep a:first-child { - flex: 1; - text-align: right; - width: 0; - } - - .top-row, article { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } -} - -#blazor-error-ui { - background: lightyellow; - bottom: 0; - box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2); + .top-row:not(.auth) { display: none; - left: 0; - padding: 0.6rem 1.25rem 0.7rem 1.25rem; - position: fixed; - width: 100%; - z-index: 1000; + } + .top-row.auth { + justify-content: space-between; + } + .top-row a, + .top-row .btn-link { + margin-left: 0; + } } - - #blazor-error-ui .dismiss { - cursor: pointer; - position: absolute; - right: 0.75rem; - top: 0.5rem; - } +@media (min-width: 641px) { + .page { + flex-direction: row; + } + .sidebar { + width: 13.5rem; + height: 100vh; + position: fixed; + top: 0; + left: 0; + border-radius: 30px; + z-index: 1000; + } + .sidebarSmall { + width: 4.5rem; + height: 100vh; + position: sticky; + top: 0; + border-radius: 30px; + } + .top-row { + position: sticky; + top: 0; + z-index: 1; + } + .top-row, + article { + padding-left: 0.5rem !important; + padding-right: 0.5rem !important; + } +} \ No newline at end of file diff --git a/Test.UI/Components/Layout/MainLayout.razor.less b/Test.UI/Components/Layout/MainLayout.razor.less new file mode 100644 index 0000000..e2a6c3b --- /dev/null +++ b/Test.UI/Components/Layout/MainLayout.razor.less @@ -0,0 +1,92 @@ +.page { + position: relative; + display: flex; + flex-direction: column; +} + +main { + flex: 1; + margin-left: 14rem; +} + +.sidebar, +.sidebarSmall { + /*background-image: linear-gradient(180deg, rgb(5, 39, 103) 20%, #3aa6ff 90%);*/ + background: -webkit-linear-gradient(to bottom, #d5f1f2, #d5f1f2); /* Chrome 10-25, Safari 5.1-6 */ + background: linear-gradient(to bottom, #d5f1f2, #d5f1f2); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ +} + +.top-row { + background-color: #f7f7f7; + border-bottom: 1px solid #d6d5d5; + /*justify-content: flex-end;*/ + height: 3.5rem; + display: flex; + align-items: center; +} + +.top-row ::deep a, .top-row .btn-link { + white-space: nowrap; + margin-left: 1.5rem; +} + +.top-row a:first-child { + overflow: hidden; + text-overflow: ellipsis; +} + +.bottom-row { + color: #dedede; + background-color: #000000; + height: 1.6rem; + align-items: center; +} + +@media (max-width: 640.98px) { + .top-row:not(.auth) { + display: none; + } + + .top-row.auth { + justify-content: space-between; + } + + .top-row a, .top-row .btn-link { + margin-left: 0; + } +} + +@media (min-width: 641px) { + .page { + flex-direction: row; + } + + .sidebar { + width: 13.5rem; + height: 100vh; + position: fixed; + top: 0; + left: 0; + border-radius: 30px; + z-index:1000; + } + + .sidebarSmall { + width: 4.5rem; + height: 100vh; + position: sticky; + top: 0; + border-radius: 30px; + } + + .top-row { + position: sticky; + top: 0; + z-index: 1; + } + + .top-row, article { + padding-left: 0.5rem !important; + padding-right: 0.5rem !important; + } +} diff --git a/Test.UI/Components/Layout/MainLayout.razor.min.css b/Test.UI/Components/Layout/MainLayout.razor.min.css new file mode 100644 index 0000000..3a0416e --- /dev/null +++ b/Test.UI/Components/Layout/MainLayout.razor.min.css @@ -0,0 +1 @@ +.page{position:relative;display:flex;flex-direction:column;}main{flex:1;margin-left:14rem;}.sidebar,.sidebarSmall{background:-webkit-linear-gradient(to bottom,#d5f1f2,#d5f1f2);background:linear-gradient(to bottom,#d5f1f2,#d5f1f2);}.top-row{background-color:#f7f7f7;border-bottom:1px solid #d6d5d5;height:3.5rem;display:flex;align-items:center;}.top-row ::deep a,.top-row .btn-link{white-space:nowrap;margin-left:1.5rem;}.top-row a:first-child{overflow:hidden;text-overflow:ellipsis;}.bottom-row{color:#dedede;background-color:#000;height:1.6rem;align-items:center;}@media(max-width:640.98px){.top-row:not(.auth){display:none;}.top-row.auth{justify-content:space-between;}.top-row a,.top-row .btn-link{margin-left:0;}}@media(min-width:641px){.page{flex-direction:row;}.sidebar{width:13.5rem;height:100vh;position:fixed;top:0;left:0;border-radius:30px;z-index:1000;}.sidebarSmall{width:4.5rem;height:100vh;position:sticky;top:0;border-radius:30px;}.top-row{position:sticky;top:0;z-index:1;}.top-row,article{padding-left:.5rem!important;padding-right:.5rem!important;}} \ No newline at end of file diff --git a/Test.UI/Components/Layout/NavMenu.razor b/Test.UI/Components/Layout/NavMenu.razor index a6ee1fe..c9fb1e4 100644 --- a/Test.UI/Components/Layout/NavMenu.razor +++ b/Test.UI/Components/Layout/NavMenu.razor @@ -1,46 +1,45 @@ -
-
- Test.UI +@implements IDisposable + +@inject NavigationManager NavigationManager + +
+
+ @if (!showText) + { + Wind + } + else + { + Window + }
- - -
+
diff --git a/Test.UI/Components/Layout/NavMenu.razor.cs b/Test.UI/Components/Layout/NavMenu.razor.cs new file mode 100644 index 0000000..5ee29cc --- /dev/null +++ b/Test.UI/Components/Layout/NavMenu.razor.cs @@ -0,0 +1,51 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Routing; + +namespace Test.UI.Components.Layout +{ + public partial class NavMenu + { + [Parameter] + public EventCallback EC_compressUpdated { get; set; } + + public void Dispose() + { + NavigationManager.LocationChanged -= OnLocationChanged; + } + + protected string hideText { get => showText ? "" : "invisible"; } + + protected string? NavMenuCssClass => collapseNavMenu ? "collapse" : null; + + protected string? TextCss => onlyIcon ? "d-none" : ""; + + protected override void OnInitialized() + { + currentUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri); + NavigationManager.LocationChanged += OnLocationChanged; + } + + protected void ToggleCompress() + { + showText = !showText; + EC_compressUpdated.InvokeAsync(showText); + } + protected void ToggleNavMenu() + { + collapseNavMenu = !collapseNavMenu; + } + + private bool collapseNavMenu = false; + + private string? currentUrl; + private bool onlyIcon = false; + + private bool showText { get; set; } = true; + + private void OnLocationChanged(object? sender, LocationChangedEventArgs e) + { + currentUrl = NavigationManager.ToBaseRelativePath(e.Location); + StateHasChanged(); + } + } +} diff --git a/Test.UI/Components/Layout/NavMenu.razor.css b/Test.UI/Components/Layout/NavMenu.razor.css index 4e15395..7cc1281 100644 --- a/Test.UI/Components/Layout/NavMenu.razor.css +++ b/Test.UI/Components/Layout/NavMenu.razor.css @@ -1,105 +1,58 @@ -.navbar-toggler { - appearance: none; - cursor: pointer; - width: 3.5rem; - height: 2.5rem; - color: white; - 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); +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); } - -.navbar-toggler:checked { - background-color: rgba(255, 255, 255, 0.5); -} - .top-row { - height: 3.5rem; - background-color: rgba(0,0,0,0.4); + height: 3.5rem; + background-color: rgba(64, 62, 62, 0.8); +} +.navbar { + border-radius: 15px; + left: 0; + display: block; + text-align: center; } - .navbar-brand { - font-size: 1.1rem; + font-size: 1.1rem; + text-align: center; } - -.bi { - display: inline-block; - position: relative; - width: 1.25rem; - height: 1.25rem; - margin-right: 0.75rem; - top: -1px; - background-size: cover; +.oi { + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; } - -.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"); -} - -.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"); -} - -.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"); -} - .nav-item { - font-size: 0.9rem; - padding-bottom: 0.5rem; + font-size: 0.9rem; + padding-bottom: 0.1rem; +} +.nav-item:first-of-type { + padding-top: 0.5rem; +} +.nav-item:last-of-type { + padding-bottom: 0.5rem; +} +.nav-item ::deep a { + color: #000000; + border-radius: 10px; + height: 2.7rem; + display: flex; + align-items: center; + line-height: 2.7rem; } - - .nav-item:first-of-type { - padding-top: 1rem; - } - - .nav-item:last-of-type { - padding-bottom: 1rem; - } - - .nav-item ::deep .nav-link { - color: #d7d7d7; - background: none; - border: none; - border-radius: 4px; - height: 3rem; - display: flex; - align-items: center; - line-height: 3rem; - width: 100%; - } - .nav-item ::deep a.active { - background-color: rgba(255,255,255,0.37); - color: white; + background-color: rgba(255, 255, 255, 0.75); + color: black; } - -.nav-item ::deep .nav-link:hover { - background-color: rgba(255,255,255,0.1); - color: white; +.nav-item ::deep a:hover { + background-color: rgba(255, 255, 255, 0.5); + color: black; } - -.nav-scrollable { - display: none; -} - -.navbar-toggler:checked ~ .nav-scrollable { - display: block; -} - @media (min-width: 641px) { - .navbar-toggler { - display: none; - } - - .nav-scrollable { - /* Never collapse the sidebar for wide screens */ - display: block; - - /* Allow sidebar to scroll for tall menus */ - height: calc(100vh - 3.5rem); - overflow-y: auto; - } -} + .navbar-toggler { + display: none; + } + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +} \ No newline at end of file diff --git a/Test.UI/Components/Layout/NavMenu.razor.less b/Test.UI/Components/Layout/NavMenu.razor.less new file mode 100644 index 0000000..479ceaf --- /dev/null +++ b/Test.UI/Components/Layout/NavMenu.razor.less @@ -0,0 +1,70 @@ +.navbar-toggler { + background-color: rgba(255, 255, 255, 0.1); +} + +.top-row { + height: 3.5rem; + background-color: rgba(64,62,62,0.8); +} + +.navbar { + border-radius: 15px; + left: 0; + display: block; + text-align: center; +} + +.navbar-brand { + font-size: 1.1rem; + text-align:center; +} + +.oi { + width: 2rem; + font-size: 1.1rem; + vertical-align: text-top; + top: -2px; +} + +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.1rem; +} + +.nav-item:first-of-type { + padding-top: 0.5rem; +} + +.nav-item:last-of-type { + padding-bottom: 0.5rem; +} + +.nav-item ::deep a { + color: #000000; + border-radius: 10px; + height: 2.7rem; + display: flex; + align-items: center; + line-height: 2.7rem; +} + +.nav-item ::deep a.active { + background-color: rgba(255,255,255,0.75); + color: black; +} + +.nav-item ::deep a:hover { + background-color: rgba(255,255,255,0.5); + color: black; +} + +@media (min-width: 641px) { + .navbar-toggler { + display: none; + } + + .collapse { + /* Never collapse the sidebar for wide screens */ + display: block; + } +} diff --git a/Test.UI/Components/Layout/NavMenu.razor.min.css b/Test.UI/Components/Layout/NavMenu.razor.min.css new file mode 100644 index 0000000..6bc5dd0 --- /dev/null +++ b/Test.UI/Components/Layout/NavMenu.razor.min.css @@ -0,0 +1 @@ +.navbar-toggler{background-color:rgba(255,255,255,.1);}.top-row{height:3.5rem;background-color:rgba(64,62,62,.8);}.navbar{border-radius:15px;left:0;display:block;text-align:center;}.navbar-brand{font-size:1.1rem;text-align:center;}.oi{width:2rem;font-size:1.1rem;vertical-align:text-top;top:-2px;}.nav-item{font-size:.9rem;padding-bottom:.1rem;}.nav-item:first-of-type{padding-top:.5rem;}.nav-item:last-of-type{padding-bottom:.5rem;}.nav-item ::deep a{color:#000;border-radius:10px;height:2.7rem;display:flex;align-items:center;line-height:2.7rem;}.nav-item ::deep a.active{background-color:rgba(255,255,255,.75);color:#000;}.nav-item ::deep a:hover{background-color:rgba(255,255,255,.5);color:#000;}@media(min-width:641px){.navbar-toggler{display:none;}.collapse{display:block;}} \ No newline at end of file diff --git a/Test.UI/Components/Pages/Home.razor b/Test.UI/Components/Pages/Home.razor index afc54d4..87ac691 100644 --- a/Test.UI/Components/Pages/Home.razor +++ b/Test.UI/Components/Pages/Home.razor @@ -1,4 +1,5 @@ @page "/" +@page "/Home" @rendermode InteractiveServer Home diff --git a/Test.UI/Data/FinestraDueAnteSeparate.jwd b/Test.UI/Data/FinestraDueAnteSeparate.jwd new file mode 100644 index 0000000..0cfd829 --- /dev/null +++ b/Test.UI/Data/FinestraDueAnteSeparate.jwd @@ -0,0 +1,154 @@ +{ + "ProfilePath": "Profilo78", + "AreaList": [ + { + "Shape": "DOUBLECHAMFER", + "DimensionList": [ + { + "nIndex": 1, + "sName": "Width", + "dValue": 1500.0 + }, + { + "nIndex": 2, + "sName": "Height", + "dValue": 1500.0 + }, + { + "nIndex": 3, + "sName": "Full Height", + "dValue": 1800.0 + } + ], + "JointList": [ + { + "nIndex": 1, + "JointType": "FULL_H" + }, + { + "nIndex": 2, + "JointType": "FULL_H" + }, + { + "nIndex": 3, + "JointType": "FULL_H" + }, + { + "nIndex": 4, + "JointType": "FULL_H" + } + ], + "BottomRail": false, + "BottomRailQty": 0, + "AreaList": [ + { + "SplitShape": "VERTICAL", + "SplitPositionList": [ + { + "bIsRelative": true, + "dDimension": 50.0 + }, + { + "bIsRelative": true, + "dDimension": 50.0 + } + ], + "AreaList": [ + { + "AreaList": [ + { + "bIsSashVertical": true, + "SashList": [ + { + "OpeningType": "TILTTURN_LEFT", + "bHasHandle": true, + "dDimension": 100.0 + } + ], + "SashType": "NULL", + "JointList": [ + { + "nIndex": 1, + "JointType": "FULL_H" + }, + { + "nIndex": 2, + "JointType": "FULL_H" + }, + { + "nIndex": 3, + "JointType": "FULL_H" + }, + { + "nIndex": 4, + "JointType": "FULL_H" + } + ], + "BottomRail": false, + "BottomRailQty": 0, + "Hardware": "000000", + "AreaList": [ + { + "FillType": "GLASS", + "AreaList": [], + "AreaType": "FILL" + } + ], + "AreaType": "SASH" + } + ], + "AreaType": "SPLITTED" + }, + { + "AreaList": [ + { + "bIsSashVertical": true, + "SashList": [ + { + "OpeningType": "TILTTURN_RIGHT", + "bHasHandle": true, + "dDimension": 100.0 + } + ], + "SashType": "NULL", + "JointList": [ + { + "nIndex": 1, + "JointType": "FULL_H" + }, + { + "nIndex": 2, + "JointType": "FULL_H" + }, + { + "nIndex": 3, + "JointType": "FULL_H" + }, + { + "nIndex": 4, + "JointType": "FULL_H" + } + ], + "BottomRail": false, + "BottomRailQty": 0, + "Hardware": "000000", + "AreaList": [ + { + "FillType": "GLASS", + "AreaList": [], + "AreaType": "FILL" + } + ], + "AreaType": "SASH" + } + ], + "AreaType": "SPLITTED" + } + ], + "AreaType": "SPLIT" + } + ], + "AreaType": "FRAME" + } + ] +} \ No newline at end of file diff --git a/Test.UI/Data/Setup.json b/Test.UI/Data/Setup.json index f46dea8..f11b42d 100644 --- a/Test.UI/Data/Setup.json +++ b/Test.UI/Data/Setup.json @@ -13,21 +13,26 @@ }, { "Index": 3, + "Description": "Finestra con due ante separate", + "SVGFileName": "FinestraDueAnteSeparate.svg", + "JwdFileName": "Data/FinestraDueAnteSeparate.jwd" + }, + { + "Index": 4, "Description": "Finestra con split verticale", "SVGFileName": "FinestraSplitVert.svg", "JwdFileName": "Data/FinestraSplitVert.jwd" }, { - "Index": 4, + "Index": 5, "Description": "Finestra con split verticale e orizzontale", "SVGFileName": "FinestraSplitVertOriz.svg", "JwdFileName": "Data/FinestraSplitVertOriz.jwd" }, { - "Index": 5, + "Index": 6, "Description": "Finestra con split orizzontale (sopra due ante e sotto vetro fisso)", "SVGFileName": "FinDueAnteBottomFisso.svg", "JwdFileName": "Data/FinDueAnteBottomFisso.jwd" } - ] \ No newline at end of file diff --git a/Test.UI/compilerconfig.json b/Test.UI/compilerconfig.json index 42a9e0b..d8172f8 100644 --- a/Test.UI/compilerconfig.json +++ b/Test.UI/compilerconfig.json @@ -2,5 +2,13 @@ { "outputFile": "wwwroot/css/site.css", "inputFile": "wwwroot/css/site.less" + }, + { + "outputFile": "Components/Layout/NavMenu.razor.css", + "inputFile": "Components/Layout/NavMenu.razor.less" + }, + { + "outputFile": "Components/Layout/MainLayout.razor.css", + "inputFile": "Components/Layout/MainLayout.razor.less" } ] \ No newline at end of file diff --git a/Test.UI/wwwroot/css/fonts.css b/Test.UI/wwwroot/css/fonts.css new file mode 100644 index 0000000..5f85b51 --- /dev/null +++ b/Test.UI/wwwroot/css/fonts.css @@ -0,0 +1,30 @@ +/* lato-regular - latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: url('../fonts/lato-v17-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); + /* Legacy iOS */ +} +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-v27-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); + /* Legacy iOS */ +} +/* roboto-condensed-regular - latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); + /* Legacy iOS */ +} \ No newline at end of file diff --git a/Test.UI/wwwroot/css/fonts.less b/Test.UI/wwwroot/css/fonts.less new file mode 100644 index 0000000..d5cbbe6 --- /dev/null +++ b/Test.UI/wwwroot/css/fonts.less @@ -0,0 +1,36 @@ +/* lato-regular - latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: url('../fonts/lato-v17-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */ +} +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-v27-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-condensed-regular - latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); /* Legacy iOS */ +} \ No newline at end of file diff --git a/Test.UI/wwwroot/css/fonts.min.css b/Test.UI/wwwroot/css/fonts.min.css new file mode 100644 index 0000000..d0d21fe --- /dev/null +++ b/Test.UI/wwwroot/css/fonts.min.css @@ -0,0 +1 @@ +@font-face{font-family:'Lato';font-style:normal;font-weight:400;src:url('../fonts/lato-v17-latin-regular.eot?');src:local(''),url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/lato-v17-latin-regular.woff2') format('woff2'),url('../fonts/lato-v17-latin-regular.woff') format('woff'),url('../fonts/lato-v17-latin-regular.ttf') format('truetype'),url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/roboto-v27-latin-regular.eot?');src:local(''),url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'),url('../fonts/roboto-v27-latin-regular.woff') format('woff'),url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'),url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('../fonts/roboto-condensed-v19-latin-regular.eot?');src:local(''),url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'),url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'),url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'),url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg');} \ No newline at end of file diff --git a/Test.UI/wwwroot/css/textures.css b/Test.UI/wwwroot/css/textures.css new file mode 100644 index 0000000..7ccc5e1 --- /dev/null +++ b/Test.UI/wwwroot/css/textures.css @@ -0,0 +1,18 @@ +.wood-01 { + /*background-color: #FB8004;*/ + background-image: url('../images/textures/wood-01.jpg'); + /* path to your wood texture */ + background-repeat: repeat; + /* repeat both horizontally & vertically */ + background-size: 100px 100px; + /* adjust size as needed */ +} +.wood-02 { + /*background-color: #CC6600;*/ + background-image: url('../images/textures/wood-02.jpg'); + /* path to your wood texture */ + background-repeat: repeat; + /* repeat both horizontally & vertically */ + background-size: 50px 150px; + /* adjust size as needed */ +} \ No newline at end of file diff --git a/Test.UI/wwwroot/css/textures.less b/Test.UI/wwwroot/css/textures.less new file mode 100644 index 0000000..8082ae9 --- /dev/null +++ b/Test.UI/wwwroot/css/textures.less @@ -0,0 +1,12 @@ +.wood-01 { + /*background-color: #FB8004;*/ + background-image: url('../images/textures/wood-01.jpg'); /* path to your wood texture */ + background-repeat: repeat; /* repeat both horizontally & vertically */ + background-size: 100px 100px; /* adjust size as needed */ +} +.wood-02 { + /*background-color: #CC6600;*/ + background-image: url('../images/textures/wood-02.jpg'); /* path to your wood texture */ + background-repeat: repeat; /* repeat both horizontally & vertically */ + background-size: 50px 150px; /* adjust size as needed */ +} \ No newline at end of file diff --git a/Test.UI/wwwroot/css/textures.min.css b/Test.UI/wwwroot/css/textures.min.css new file mode 100644 index 0000000..33c13c6 --- /dev/null +++ b/Test.UI/wwwroot/css/textures.min.css @@ -0,0 +1 @@ +.wood-01{background-image:url('../images/textures/wood-01.jpg');background-repeat:repeat;background-size:100px 100px;}.wood-02{background-image:url('../images/textures/wood-02.jpg');background-repeat:repeat;background-size:50px 150px;} \ No newline at end of file diff --git a/Test.UI/wwwroot/fonts/lato-v17-latin-regular.eot b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.eot new file mode 100644 index 0000000..c641306 Binary files /dev/null and b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.eot differ diff --git a/Test.UI/wwwroot/fonts/lato-v17-latin-regular.svg b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.svg new file mode 100644 index 0000000..55b43fb --- /dev/null +++ b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.svg @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Test.UI/wwwroot/fonts/lato-v17-latin-regular.ttf b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.ttf new file mode 100644 index 0000000..3c2d417 Binary files /dev/null and b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.ttf differ diff --git a/Test.UI/wwwroot/fonts/lato-v17-latin-regular.woff b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.woff new file mode 100644 index 0000000..189a0fe Binary files /dev/null and b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.woff differ diff --git a/Test.UI/wwwroot/fonts/lato-v17-latin-regular.woff2 b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.woff2 new file mode 100644 index 0000000..6904b66 Binary files /dev/null and b/Test.UI/wwwroot/fonts/lato-v17-latin-regular.woff2 differ diff --git a/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.eot b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.eot new file mode 100644 index 0000000..e64b69b Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.eot differ diff --git a/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.svg b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.svg new file mode 100644 index 0000000..803c3b8 --- /dev/null +++ b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.ttf b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.ttf new file mode 100644 index 0000000..878bdb2 Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.ttf differ diff --git a/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff new file mode 100644 index 0000000..90f54ea Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff differ diff --git a/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff2 b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff2 new file mode 100644 index 0000000..bcbfde7 Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff2 differ diff --git a/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.eot b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.eot new file mode 100644 index 0000000..6dd5e3a Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.eot differ diff --git a/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.svg b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.svg new file mode 100644 index 0000000..627f5a3 --- /dev/null +++ b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.ttf b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.ttf new file mode 100644 index 0000000..637971a Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.ttf differ diff --git a/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.woff b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.woff new file mode 100644 index 0000000..86b3863 Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.woff differ diff --git a/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.woff2 b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.woff2 new file mode 100644 index 0000000..ebe1795 Binary files /dev/null and b/Test.UI/wwwroot/fonts/roboto-v27-latin-regular.woff2 differ diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 2243e46..b9310fd 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -3,7 +3,7 @@
-
+
  • @if (currStep == CompileStep.Template) @@ -49,13 +49,18 @@
- - @* *@ @if (currStep != CompileStep.Template) { - +
+ +
} - +
+ +
+
+ +
@@ -566,19 +571,19 @@
- +
-
+
@for (int k = 1; k <= i*2+j; k++) { int IndexCopy = k; int IndexModify = i * 2 + j; -
-
+
+
diff --git a/WebWindowComplex/TableComp.razor.css b/WebWindowComplex/TableComp.razor.css index 5f28270..c3d90e3 100644 --- a/WebWindowComplex/TableComp.razor.css +++ b/WebWindowComplex/TableComp.razor.css @@ -1 +1,26 @@ - \ No newline at end of file +.nav-item { + font-size: 0.9rem; + padding-bottom: 0.1rem; +} + .nav-item ::deep a { + color: #000000; + border-radius: 5px; + height: 2.7rem; + display: flex; + align-items: center; + line-height: 2.7rem; + } + + .nav-item ::deep a.active { + color: #000000; + background-color: rgba(255,255,255,0.75); + color: black; + border-color: rgba(255,255,255,0.5); + } + + .nav-item ::deep a:hover { + color: #282727; + background-color: rgba(255,255,255,0.5); + color: black; + border-color: rgba(255,255,255,0.5); + } diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 7a6080f..e2ac932 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 2.7.9.818 + 2.7.9.913 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -217,6 +217,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +