Преглед изворни кода

Merge branch 'master' of https://git.swopt.com/swopt/fisapp-ui into swopt-eLeave

tigger пре 4 месеци
родитељ
комит
e0be2f157a

+ 1 - 1
package.json

@@ -5,7 +5,7 @@
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 4200",
     "build": "ng build --aot --delete-output-path",
-    "build:next": "ng build --base-href /next/ --aot --delete-output-path",
+    "build:dev": "ng build --base-href /dev/ --aot --output-path dist/dev --delete-output-path",
     "build:prod": "ng build --configuration production --output-path dist/rc --aot --delete-output-path",
     "build:leave:prod": "ng build --configuration leave-prod --output-path dist/leave --aot",
     "build:quot:prod": "ng build --configuration quotation-prod --output-path dist/quotation --aot",

+ 1 - 1
src/app/app.component.html

@@ -59,7 +59,7 @@
             <mat-icon id="{{item.key}}-icon">{{item.icon}}</mat-icon>
             <mat-label>{{(item.key|tr:item.title)}}</mat-label>
             @if (item.key === 'notifs' && notificationCount > 0) {
-              <div class="notif-count">{{notificationCount}}</div>
+              <div class="count-aria">{{notificationCount}}</div>
             }
           </div>
         }

+ 2 - 16
src/app/app.component.scss

@@ -94,20 +94,6 @@
     background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
 }
 
-.toolbar-item .notif-count {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    right: 5%;
-    width:15px;
-    height: 15px;
-    font-size: 8pt;
-    background: yellow;
-    border-radius: 50%;
-    color: $text-color-light;
-}
-
 .profile-pic {
     height: 25px;
     width: 25px;
@@ -205,7 +191,7 @@ chat {
         display: flex;
     }
 
-    .toolbar-item .notif-count {
+    .toolbar-item .count-aria {
         right: 35%;
     }
 
@@ -228,7 +214,7 @@ chat {
 }
 
 @media screen and (pointer: none), (pointer: coarse) and (orientation: landscape) {
-    .toolbar-item .notif-count {
+    .toolbar-item .count-aria {
         right: 43%;
     }
 }

+ 1 - 1
src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit d974522db9d8fae363794f6dd73c0cb9cd575d85
+Subproject commit 4971b24fe485cade5b72edf366b1939c9b68c090

+ 1 - 1
src/dependencies/dp-ui

@@ -1 +1 @@
-Subproject commit 4abaefa9f9d944e3824fe44e7971a220d6ff30f4
+Subproject commit 6878ddf621bc834ecbca9de6e6e0e75d9d31c512

+ 1 - 1
src/dependencies/fis

@@ -1 +1 @@
-Subproject commit 9c9db8eedd9f55f4b65e586737d073a7cdddcf0e
+Subproject commit 97675fa16bfbb36d78de5d01007622045e23e3c0

+ 1 - 1
src/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>SwOPT Angular</title>
+  <title>FIS</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
   <link rel="icon" type="image/x-icon" href="favicon.ico">