Skip to content

Commit e9f3da6

Browse files
committed
#449972 - Changing styles
1 parent 80355c5 commit e9f3da6

File tree

9 files changed

+79
-28
lines changed

9 files changed

+79
-28
lines changed

src/app/shared/components/footer/footer.component.scss

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
/* Custom FOOTER component styles */
22

33
.footer {
4-
background-color: #303030;
54
padding: 10px 20px;
6-
border-top: solid 1px rgba(255, 255, 255, 0.12);
5+
border-width: 1px 0px 1px 0px;
6+
border-style: solid;
7+
border-color: var(--Grey-500, #E6E6E6);
78

89
&__company {
9-
border-top: solid 1px rgba(255, 255, 255, 0.12);
10+
border-top: 2px solid#E6E6E6;
1011
padding: 10px 0;
1112
font-family: "Open Sans", sans-serif;
13+
color: var(--secondary-600);
14+
text-align: center;
1215
font-size: 12px;
13-
color: white;
14-
font-weight: 500;
16+
font-weight: 600;
17+
line-height: 16.34px;
1518
text-align: center;
16-
background-color: #303030;
19+
text-underline-position: from-font;
20+
text-decoration-skip-ink: none;
21+
1722
p {
1823
margin: 0;
1924
}
@@ -48,6 +53,7 @@
4853
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
4954
gap: 15px;
5055
}
56+
5157
img {
5258
max-width: 150px;
5359
}
@@ -57,6 +63,7 @@
5763
@media (max-width: 1400px) {
5864
.footer {
5965
padding: 15px;
66+
6067
&__logos {
6168
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
6269
gap: 10px;
@@ -67,6 +74,7 @@
6774
@media (max-width: 1200px) {
6875
.footer {
6976
padding: 10px;
77+
7078
&__logos {
7179
grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
7280
gap: 10px;

src/app/shared/components/navigation/navigation.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<span>{{ titleService.getTitle() }}</span>
3737
<div class="logout">
3838
<span (click)="logout()">
39-
<mat-icon aria-label="Side nav toggle icon">exit_to_app</mat-icon>
39+
<mat-icon aria-label="Side nav toggle icon">logout</mat-icon>
4040
<div>Log out</div>
4141
</span>
4242
</div>

src/app/shared/components/navigation/navigation.component.scss

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@
66

77
.sidenav {
88
width: 300px;
9-
background-color: #202020;
9+
box-shadow: 0.2em 0em 0.5em rgba(0, 0, 0, 0.1);
1010
}
1111

1212
.sidenav .mat-toolbar {
1313
background: inherit;
14+
font-size: 22px;
15+
font-weight: 400;
16+
line-height: 27.24px;
17+
color: var(--secondary-600);
1418
}
1519

1620
.mat-toolbar.mat-primary {
1721
position: sticky;
1822
top: 0;
1923
z-index: 2;
24+
background: var(--brand-500);
2025
}
26+
2127
.logout {
2228
width: 100%;
2329
text-align: right;
@@ -28,19 +34,25 @@
2834

2935
.logout span {
3036
display: flex;
31-
align-items: center; /* Alinea verticalmente el ícono y el texto */
32-
cursor: pointer; /* Cursor tipo pointer solo para el span contenedor */
33-
transition: color 0.3s; /* Transición suave para el cambio de color */
37+
align-items: center;
38+
/* Alinea verticalmente el ícono y el texto */
39+
cursor: pointer;
40+
/* Cursor tipo pointer solo para el span contenedor */
41+
transition: color 0.3s;
42+
/* Transición suave para el cambio de color */
3443
}
3544

3645
.logout span:hover {
37-
color: #ffab40; /* Cambia el color de ambos al hacer hover */
46+
color: #ffab40;
47+
/* Cambia el color de ambos al hacer hover */
3848
}
3949

4050
.logout mat-icon {
41-
font-size: 24px;
42-
margin-right: 3px;
51+
font-size: 18px;
52+
margin-right: 10px;
53+
align-content: center;
4354
}
55+
4456
.container {
4557
display: flex;
4658
flex-direction: column;
@@ -61,4 +73,18 @@ mat-sidenav-content {
6173

6274
mat-toolbar {
6375
min-height: 64px;
76+
font-size: 16px;
77+
}
78+
79+
:host ::ng-deep .mdc-list-item__primary-text,
80+
:host ::ng-deep mat-nav-list mat-icon{
81+
color: var(--secondary-600) !important;
82+
}
83+
84+
:host ::ng-deep .mdc-list-item:focus::before {
85+
background-color: unset;
86+
}
87+
88+
:host ::ng-deep .mdc-list-item:focus {
89+
background-color: var(--grey-400);
6490
}

src/app/shared/components/spinner/spinner.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
.spinner {
1616
border: 8px solid #f3f3f3;
17-
border-top: 8px solid #03a9f4;
17+
border-top: 8px solid #EF7011;
1818
border-radius: 50%;
1919
width: 60px;
2020
height: 60px;

src/assets/config/app.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"participantId": "connector-c1",
66
"storageAccount": "company2assets",
77
"storageExplorerLinkTemplate": "storageexplorer://v=1",
8-
"theme": "theme-2",
8+
"theme": "",
99
"service": {
1010
"asset": {
1111
"baseUrl": "/v3/assets",

src/assets/config/app.config.template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"participantId": "$PARTICIPANT_ID",
66
"storageAccount": "$STORAGE_ACCOUNT",
77
"storageExplorerLinkTemplate": "$STORAGE_LINK_TEMPLATE",
8-
"theme": "$APP_THEME",
8+
"theme": "",
99
"service": {
1010
"asset": {
1111
"baseUrl": "/v3/assets",

src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const environment = {
1717
participantId: "connector-c1",
1818
storageAccount: "company2assets",
1919
storageExplorerLinkTemplate: "storageexplorer://v=1",
20-
theme: "theme-2",
20+
theme: "",
2121
service: {
2222
asset: {
2323
baseUrl: '/v3/assets',

src/styles.scss

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
@import "./theme.scss";
22

3+
:root {
4+
/* Mode 1 */
5+
/* color */
6+
--white: #ffffff;
7+
--brand-500: #ef7011;
8+
--grey-400: #eeeeee;
9+
--grey-500: #e6e6e6;
10+
--grey-600: #d9d8d8;
11+
--grey-700: #b3b3b3;
12+
--grey-800: #a3a3a3;
13+
--secondary-500: #3c6b85;
14+
--secondary-600: #203f57;
15+
--secondary-700: #212529;
16+
--secondary-red-500: #f44336;
17+
--tertiary-500: #4dafba;
18+
}
19+
320
/* global styles */
421

522
html,
@@ -131,9 +148,6 @@ mat-card:not(.dialog-card) {
131148
font-size: 14px;
132149
letter-spacing: 0.04em;
133150
}
134-
.items-center {
135-
align-items: center;
136-
}
137151

138152
.gap-4 {
139153
gap: 1rem;
@@ -155,9 +169,6 @@ mat-card:not(.dialog-card) {
155169
.border-solid {
156170
border-style: solid;
157171
}
158-
.border-l-2 {
159-
border-left-width: 2px;
160-
}
161172
.border-0 {
162173
border-width: 0px;
163174
}
@@ -193,6 +204,13 @@ mat-card:not(.dialog-card) {
193204
.w-2 {
194205
width: 0.5rem;
195206
}
207+
.border-l-2 {
208+
border-left-width: 2px;
209+
}
210+
.items-center {
211+
align-items: center;
212+
}
213+
196214

197215
app-json-dialog {
198216
display: block;

src/theme.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $theming-material-components-typography: mat.define-typography-config(
1313
$font-family: "Open Sans",
1414
);
1515

16-
$theme1: mat-dark-theme(
16+
$theme1: mat-light-theme(
1717
(
1818
color: (
1919
primary: mat-palette($mat-teal),
@@ -38,7 +38,7 @@ $grey-700: #707070;
3838
$grey-800: #808080;
3939
$grey-900: #909090;
4040

41-
$theme2: mat-dark-theme(
41+
$theme2: mat-light-theme(
4242
(
4343
color: (
4444
primary: mat-palette($mat-light-blue),
@@ -50,7 +50,7 @@ $theme2: mat-dark-theme(
5050
)
5151
);
5252

53-
$theme3: mat-dark-theme(
53+
$theme3: mat-light-theme(
5454
(
5555
color: (
5656
primary: mat-palette($mat-light-green),
@@ -122,7 +122,6 @@ $theme3: mat-dark-theme(
122122
.mat-expansion-panel-header[_ngcontent-ng-c808659378]:hover:not(
123123
[aria-disabled="true"]
124124
) {
125-
background: rgb(255 171 64 / 20%);
126125
transition: 0.2s background;
127126
}
128127

0 commit comments

Comments
 (0)