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.

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

Jump to bottom

CSS improvements of Angular frontend #129

Merged
merged 4 commits into from
Mar 7, 2024
Merged

CSS improvements of Angular frontend #129

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
1f8ace5
remove account label
maoo Mar 7, 2024
79bbc00
header updates
maoo Mar 7, 2024
1370822
change button colors
maoo Mar 7, 2024
457b41e
remove comment
TheJuanAndOnly99 Mar 7, 2024
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: 3 additions & 1 deletion web-front-end/angular/main/app/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<nav class="navbar navbar-expand-lg bg-body-tertiary text-bg-primary" data-bs-theme="dark">
<div class="container-fluid">
<a class="navbar-brand text-bg-primary" href="#">FINOS | TradeX Sample Application</a>
<img width="50px" src="assets/img/2023_TraderX_Icon_WHT.png"/>
<div style="font-size: 1.5em">FINOS | TraderX Sample Application</div>
<img width="30px" src="assets/img/FINOS_Icon_White.png"/>
</div>
</nav>

Expand Down
1 change: 0 additions & 1 deletion web-front-end/angular/main/app/trade/trade.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<div class="trade-container p-5">
<div class="trade-ops mb-4">
<div class="trade-filter me-3">
Account
<app-ngx-dropdown
name="account"
[items]="accounts"
Expand Down
Binary file added web-front-end/angular/main/assets/img/2023_TraderX_Icon_WHT.png
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you did not want to use one of the existing icons in that directory?
e.g.: /main/web-front-end/angular/main/assets/img/traderx-icon.png, or the apple-touch icon? Not that it's such a big deal, but figured I'd ask.

Copy link
Member

@maoo maoo Mar 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to render it on dark background, so we chose the white version of the icon (and no text)

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web-front-end/angular/main/assets/img/FINOS_Icon_White.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 30 additions & 1 deletion web-front-end/angular/main/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
@import "bootstrap/dist/css/bootstrap.css";
@import 'ag-grid-community/dist/styles/ag-grid.css';
@import 'ag-grid-community/dist/styles/ag-theme-alpine.css';
@import 'ag-grid-community/dist/styles/ag-theme-alpine.css';

.btn-primary {
background-color: #044fbd;
border-color: #044fbd;
}

.btn-primary:hover {
background-color: #0d6efd;
}

#buyButton {
background-color: green;
}

#sellButton {
background-color: red;
}

.btn-info {
background-color: #0d6efd;
}

.btn-info:hover {
background-color: #3583f9;
}

.drpbtn3 {
margin-left: 5px;
}