resolve merge conflicts: keep incoming .env version, incoming nominee HTML, HEAD guardian SCSS

This commit is contained in:
Nitesh Yadav
2026-05-15 13:17:44 +05:30
35 changed files with 4394 additions and 191 deletions
+10 -2
View File
@@ -188,7 +188,11 @@ import {
faCube,
faLongArrowAltRight,
faStream,
faThLarge
faThLarge,
faBrain,
faRobot,
faMicrochip,
faMagic
} from '@fortawesome/free-solid-svg-icons';
/**
@@ -383,7 +387,11 @@ export class IconsModule {
faCube,
faLongArrowAltRight,
faStream,
faThLarge
faThLarge,
faBrain,
faRobot,
faMicrochip,
faMagic
);
}
}
@@ -19,7 +19,36 @@
matBadgeSize="medium"
>
<span class="sr-only">{{ 'tooltips.Notifications' | translate }}</span>
<fa-icon icon="bell" size="lg"></fa-icon>
<!-- Custom colorful bell mark — same size language as the AI icon -->
<svg class="t-notif-svg" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
<defs>
<linearGradient id="cbsNotifBell" x1="32" y1="14" x2="32" y2="50" gradientUnits="userSpaceOnUse">
<stop offset="0%" stop-color="#fde68a" />
<stop offset="55%" stop-color="#fbbf24" />
<stop offset="100%" stop-color="#f59e0b" />
</linearGradient>
</defs>
<!-- top loop / handle -->
<circle cx="32" cy="12" r="3.2" fill="#b45309" />
<!-- bell body -->
<path
d="M32 15 c-10 0 -15 7 -15 17 v8 c0 1 -1 2 -2 2 h-2 v3 h38 v-3 h-2 c-1 0 -2 -1 -2 -2 v-8 c0 -10 -5 -17 -15 -17 z"
fill="url(#cbsNotifBell)"
stroke="#b45309"
stroke-width="1.4"
/>
<!-- inside highlight -->
<path
d="M22 23 c-2 4 -2 9 -2 12"
stroke="#ffffff"
stroke-width="2.6"
stroke-linecap="round"
fill="none"
opacity="0.55"
/>
<!-- clapper -->
<circle cx="32" cy="52" r="3.6" fill="#b45309" />
</svg>
</button>
<mat-menu
@@ -20,7 +20,6 @@ import { MatIconButton } from '@angular/material/button';
import { MatTooltip } from '@angular/material/tooltip';
import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu';
import { MatBadge } from '@angular/material/badge';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { MatIcon } from '@angular/material/icon';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -38,7 +37,6 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
MatTooltip,
MatMenuTrigger,
MatBadge,
FaIconComponent,
MatMenu,
MatIcon,
MatMenuItem