Skip to content

1.1.3 develop michael #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 1.1.3-develop
Choose a base branch
from
Open

1.1.3 develop michael #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
315f341
UI color and logo changes
MichaelADL Feb 25, 2021
f6558f4
Merge branches '1.1.3-develop' and '1.1.3-develop-michael' of https:/…
MichaelADL Feb 25, 2021
0035f1c
pulled and brought 1.1.3-develop-michael to 1.1.3-develop tree line
MichaelADL Feb 25, 2021
910ef5b
added background image for login
MichaelADL Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion admin-ui/src/app/core/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="mosip-logo">
<span
><img
src="./assets/images/icta-logo-final.png"
src="./assets/images/logo-final.jpg"
width="45"
height="45"
alt="Logo"/></span
Expand Down
2 changes: 1 addition & 1 deletion admin-ui/src/app/core/side-menu/side-menu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.mat-nav-list {
.list-item-active {
background: #f1f1f3 !important;
border-right: 4px solid #ff4081 !important;
border-right: 4px solid #f67725 !important;
height: 42px !important;
}
}
Expand Down
8 changes: 4 additions & 4 deletions admin-ui/src/app/features/packet-status/packet-status/packet-status.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
}

.complete {
border-left-color: #FF4081 !important;
border-left-color: #f67725 !important;
}

.milestone-complete {
background-color: #FF4081 !important;
background-color: #f67725 !important;
}


Expand All @@ -81,7 +81,7 @@
height: 10px !important;
width: 10px !important;
background-color: white !important;
border: 2px solid #FF4081 !important;
border: 2px solid #f67725 !important;
}

.incomplete-hollow {
Expand All @@ -105,4 +105,4 @@

h3 {
font-size: 10.5px;
}
}
8 changes: 4 additions & 4 deletions admin-ui/src/app/features/resources/center/create/create.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
"
>
<div
style="height: 30px;width: 100px;border: 1px solid #FF4081;border-radius: 30px;padding: 7px;margin: 15px;cursor: pointer;font-size: 11px;"
style="height: 30px;width: 100px;border: 1px solid #f67725;border-radius: 30px;padding: 7px;margin: 15px;cursor: pointer;font-size: 11px;"
*ngIf="primary.exceptionalHolidays.value.length>=0 && data.exceptionHolidayDate!==null"
>
<span>{{ data.exceptionHolidayDate }}</span>
Expand All @@ -767,7 +767,7 @@ <h3>{{ "center.operational-details" | translate }}</h3>
margin-left: 65px;
margin-top: -18px;
cursor: pointer;
color: #FF4081;"
color: #f67725;"
(click)="deleteHoliday(i)"
>
<i class="material-icons">cancel</i>
Expand Down Expand Up @@ -1219,7 +1219,7 @@ <h3>{{ secondaryLanguageLabels["operational-details"] }}</h3>
let i = index
">
<div
style="height: 30px;width: 100px;border: 1px solid #FF4081;border-radius: 30px;padding: 7px;margin: 15px;cursor: pointer; font-size: 11px;;"
style="height: 30px;width: 100px;border: 1px solid #f67725;border-radius: 30px;padding: 7px;margin: 15px;cursor: pointer; font-size: 11px;;"
*ngIf="primary.exceptionalHolidays.value.length>=0 && data.exceptionHolidayDate!==null"

>
Expand All @@ -1229,7 +1229,7 @@ <h3>{{ secondaryLanguageLabels["operational-details"] }}</h3>
margin-left: 65px;
margin-top: -18px;
cursor: pointer;
color: #FF4081;"
color: #f67725;"
(click)="deleteHoliday(i)"
>
<i class="material-icons">cancel</i>
Expand Down
6 changes: 3 additions & 3 deletions admin-ui/src/app/shared/dialog/dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
type="reset"
mat-button
class="footer-button"
style="color: #FF4081; border: inherit"
style="color: #f67725; border: inherit"
>
<img
src="assets/images/refresh.png"
Expand All @@ -153,15 +153,15 @@ <h2 class="filter-heading">{{ "filters.titleTxt" | translate }}</h2>
mat-button
class="footer-button"
(click)="onNoClick()"
style="color: #FF4081; background-color: white;"
style="color: #f67725; background-color: white;"
>
{{ "filters.footerButtons.cancelTxt" | translate }}
</button>
<button
type="submit"
mat-button
class="footer-button"
style="background-color:#FF4081; color:white;"
style="background-color:#f67725; color:white;"
>
{{ "filters.footerButtons.applyTxt" | translate }}
</button>
Expand Down
8 changes: 4 additions & 4 deletions admin-ui/src/app/shared/dialog/dialog.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ h5 {
padding: 4px 15px;
}
.footer-button {
border: 0.8px solid #FF4081;
border: 0.8px solid #f67725;
border-radius: 2px;
margin: 5px;
text-transform: capitalize;
Expand Down Expand Up @@ -88,15 +88,15 @@ h5 {
margin-bottom: 0px;
padding: 0 16px;
.mat-button {
outline: 1px solid #FF4081 !important;
outline: 1px solid #f67725 !important;
margin: 0 10px;
border-radius: 0;
color: #FF4081;
color: #f67725;
}
}
.pop-up-footer {
.mat-button:focus {
background: #FF4081 !important;
background: #f67725 !important;
color: #ffffff;
outline: 0 !important;
}
Expand Down
4 changes: 2 additions & 2 deletions admin-ui/src/app/shared/hamburger-menu/hamburger-menu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
left: 0;
text-align: right;
visibility: hidden;
background-color: #ff4081;
background-color: #f67725;
color: #fff;
padding: 5px 5px;
font-size: 7px;
Expand Down Expand Up @@ -96,4 +96,4 @@
font-size: x-small;
font-family: "Roboto", sans-serif;
text-transform: uppercase;
}
}
8 changes: 4 additions & 4 deletions admin-ui/src/app/shared/toolbar/toolbar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
cursor: pointer;
}
.button-style {
background-color: #ff4081;
background-color: #f67725;
color: white;
font-size: 9.2px;
height: 32px !important;
Expand All @@ -134,15 +134,15 @@
.filter-button-style {
height: 32px !important;
font-size: 9.2px;
color: #ff4081;
border: 1px solid #ff4081;
color: #f67725;
border: 1px solid #f67725;
font-family: "Roboto", sans-serif;
line-height: 7px;
transform: scale(0.95);
}

.filter-placer {
color: #ff4081 !important;
color: #f67725 !important;
position: absolute !important;
right: 0 !important;
margin: -12px -7px 0 10px;
Expand Down
4 changes: 2 additions & 2 deletions admin-ui/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ h3 {
}

.action-buttons > #createButton {
background-color: #FF4081 !important;
background-color: #f67725 !important;
color: white !important;
}

Expand Down Expand Up @@ -253,4 +253,4 @@ mat-keyboard-container {
position: absolute !important;
bottom: 0% !important;
margin-left: 20% !important;
}
}
Loading