Skip to content
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.

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

AO-874: changing the logo, background color and name #149

Merged
merged 2 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"/openlmis-offline-ui"
],
"REPORTING_SERVICES": "angola",
"applicationLoadingMessage": "Iniciando SIGLOFA",
"applicationTitle": "SIGLOFA",
"applicationLoadingMessage": "Iniciando SIGECA",
"applicationTitle": "SIGECA",
"defaultLanguage": "pt",
"showRequisitionLessOrder": "true"
}
Binary file modified src/branding-angola/logo-header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/branding-angola/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 95 additions & 0 deletions src/openlmis-auth/_auth-modal.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
.auth-modal {
background-color: $dark-gray;

.modal-content {
background-image: linear-gradient(to bottom, $white 0%, $white 48%, $light-gray 100%);
}

.modal-dialog {
margin-top: 15%;
@media screen and (min-width: $res-md) {
width: 700px;
}
@media screen and (max-width: $res-md) {
margin-right: 3%;
margin-left: 3%;
}
max-width: 700px;
}

.modal-header {
align-items: center;
background-image: linear-gradient(to bottom, $white 30%, $light-gray 100%);
border-bottom: 1px solid $light-gray;
border-radius: $border-radius $border-radius 0 0;
display: flex;
padding: 0.5em 1em !important;
overflow: hidden;

& > h1 {
margin-right: auto;
word-break: normal !important;
}

button {
margin: 0px 1em;
min-width: 92px;
@media screen and (max-width: $res-xs) {
display: flex;
min-width: 12px;
}
}
}

.modal-body {
background-image: url("../assets/common/openlmis-logo-stacked.svg");
background-size: 40% auto;
background-position: 2em 45%;
background-repeat: no-repeat;
@media screen and (max-width: $res-sm) {
background-size: 30% auto;
}
// AO-874: Changed auth modal body position
padding: 20% 25% 1em 25% !important;
// AO-874: ends here
& > .form-desc,
& > form > fieldset {
width: 100%;
}

& > form > .alert {
flex: initial;
}
& > form > .input-control{
width: 100%;
}
.form-group .input-control{
@media screen and (max-width: $res-sm) {
width: 100%;
}
}

.button-group {
@media screen and (max-width: $res-sm) {
overflow: hidden;
display: grid;
}
@media screen and (max-width: $res-xs) {
position: relative;
right: 0px;
bottom: 0px;
}
}
}

.modal-footer {
border-top: none;
text-align: right;
padding: 0 !important;
margin: 0;
display: flex;
justify-content: flex-end;

color: $gray;
}
}
2 changes: 1 addition & 1 deletion src/openlmis-header/header.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- ANGOLASUP-686: Visually distinguish between Test and Production Servers -->
<div ng-controller="HeaderController as vm"
class="openlmis-header" ng-class="{'is-offline':isOffline}"
ng-style="{'background': vm.isProdDomain ? 'linear-gradient(to top, #e4e4e4 0%, white 80%, #ffffff 100%)' : 'linear-gradient(to top, #33bb33 0%, #fff 80%, #fff 100%)'}" offline>
ng-style="{'background': vm.isProdDomain ? 'linear-gradient(to top, #e4e4e4 0%, white 80%, #ffffff 100%)' : 'linear-gradient(to top, #012853 0%, #fff 80%, #fff 100%)'}" offline>
<!-- ANGOLASUP-686: ends here -->
<h1 class="title">{{'openlmisHeader.appHeader' | message}}</h1>
<div class="openlmis-header-actions">
Expand Down
11 changes: 11 additions & 0 deletions src/openlmis-header/user.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="user-info">
<span>{{ 'openlmisHeader.loggedAs' | message }}</span>&nbsp;
<a ui-sref="openlmis.profile.basicInformation" ng-style="{'color': vm.isProdDomain ? '#3a95bc' : '#ffffff'}">
{{user}}
</a>
<span ng-show="hasPermission('VIEW_HELP')">|
<a href="/pages/help/helpContent/index.html#/viewDashboard">
{{ 'openlmisHeader.help' | message }}
</a>
</span>
</div>
2 changes: 1 addition & 1 deletion src/openlmis-login/login-form.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- ANGOLASUP-686: Visually distinguish between Test and Production Servers -->
<div class="modal auth-modal" tabindex="-1"
role="dialog" aria-hidden="true"
ng-style="{'background-color': vm.isProdDomain ? '#333333' : '#33bb33'}">
ng-style="{'background-color': vm.isProdDomain ? '#333333' : '#012853'}">
<!-- ANGOLASUP-686: ends here -->
<div class="modal-dialog">
<div class="modal-content">
Expand Down
Loading