Skip to content

Commit

Permalink
nav disabled link color added, site padding updated to match designs.
Browse files Browse the repository at this point in the history
  • Loading branch information
ncrosssancsoft committed Apr 25, 2024
1 parent 2315ffc commit 6bc9a94
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/angular/hq/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!-- header -->
<header class="justify-between items-end grid grid-cols-3 py-4 px-6">
<header class="justify-between items-end grid grid-cols-3 py-[20px] px-[30px]">
<!-- col one -->
<div>&nbsp;</div>
<!-- col two -->
<nav class="nav flex flex-1 justify-center h-[30px]">
<div class="px-5 border-r border-r-gray-100"><a routerLink="/clients" routerLinkActive="text-gray-100 border-b border-b-orange-500/100" class="inline-block text-center font-bold text-sm text-gray-100 border-b border-b-orange-500/0 px-3 py-1 min-w-[100px]">Clients</a></div>
<div class="px-5 border-r border-r-gray-100"><a routerLink="/psr" routerLinkActive="text-gray-100 border-b border-b-orange-500/100" class="inline-block text-center font-bold text-sm text-gray-100 border-b border-b-orange-500/0 px-3 py-1 min-w-[100px]">PSR</a></div>
<div class="px-5"><a routerLink="/my-stuff" routerLinkActive="text-gray-100 border-b border-b-orange-500/100" class="inline-block text-center font-bold text-sm text-gray-100 border-b border-b-orange-500/0 px-3 py-1 min-w-[100px]">My Stuff</a></div>
<div class="px-5"><a routerLink="/my-stuff" routerLinkActive="text-gray-100 border-b border-b-orange-500/100" class="inline-block text-center font-bold text-sm text-nav-disabled border-b border-b-orange-500/0 px-3 py-1 min-w-[100px]">My Stuff</a></div>
</nav>
<!-- col three -->
<div class="flex column justify-end items-center">
Expand Down Expand Up @@ -37,7 +37,7 @@
</div>

<!-- footer -->
<footer class="px-6 py-4">
<footer class="py-[20px] px-[30px]">
<div class="flex justify-between">
<div class="text-[10px] text-gray-50">&copy;Sanctuary Software Studio Inc.</div>
<div class="text-[10px] text-gray-50">1-20 / 200 items</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="px-6">
<div class="px-[30px]">
<h1 class="font-rajdhani font-semibold text-3xl">[Client Name Here]</h1>

<div class="grid gap-2 grid-flow-row lg:grid-flow-col lg:gap-7 auto-cols-max pt-3 text-sm">
Expand All @@ -8,7 +8,7 @@ <h1 class="font-rajdhani font-semibold text-3xl">[Client Name Here]</h1>
</div>
</div>

<div class="px-6 pt-3">
<div class="px-[30px] pt-3">
<div class="flex flex-col lg:flex-row justify-between items-center">
<div class="order-2 lg:order-1">
Search, Dropdown, Toggle Here
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="px-6">
<div class="px-[30px]">
<h1 class="font-rajdhani font-semibold text-3xl">Clients</h1>

<div class="grid gap-7 grid-flow-col auto-cols-max pt-3 text-sm">
&nbsp;
</div>
</div>

<div class="px-6 pt-3">
<div class="px-[30px] pt-3">
<a routerLink="someId1">Some ID 1</a><br />
<a routerLink="someId2">Some ID 2</a><br />
<a routerLink="someId3">Some ID 3</a>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="px-6">
<div class="px-[30px]">
<h1 class="font-rajdhani font-semibold text-3xl">P 1006; POS</h1>

<div class="grid gap-7 grid-flow-col auto-cols-max pt-3 text-sm">
Expand Down
4 changes: 2 additions & 2 deletions src/angular/hq/src/app/psr/psrlist/psrlist.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="px-6">
<div class="px-[30px]">
<h1 class="font-rajdhani font-semibold text-3xl">PSR</h1>

<div class="grid gap-7 grid-flow-col auto-cols-max pt-3 text-sm">
Expand All @@ -8,7 +8,7 @@ <h1 class="font-rajdhani font-semibold text-3xl">PSR</h1>
</div>
</div>

<div class="px-6 pt-3">
<div class="px-[30px] pt-3">
<a routerLink="someId1">Some ID 1</a><br />
<a routerLink="someId2">Some ID 2</a><br />
<a routerLink="someId3">Some ID 3</a>
Expand Down
2 changes: 1 addition & 1 deletion src/angular/hq/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ html, body {
height: 100%;
@apply text-gray-100;
}
body { margin: 0; font-family: "Open Sans", Roboto, "Helvetica Neue", sans-serif; }
body { margin: 0; font-family: "Open Sans", Roboto, "Helvetica Neue", sans-serif; font-size:0.9rem; }
3 changes: 2 additions & 1 deletion src/angular/hq/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ module.exports = {
'900': '#3e3e3e',
'950': '#262626',
},
'black-alt': "#242424"
'black-alt': "#242424",
'nav-disabled': "#707070"
}
},
},
Expand Down

0 comments on commit 6bc9a94

Please sign in to comment.