Skip to content

Commit

Permalink
Merge 8c2223e into 240af75
Browse files Browse the repository at this point in the history
  • Loading branch information
Helias committed Mar 18, 2020
2 parents 240af75 + 8c2223e commit 4035606
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/app/features/item/select-item/select-item.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,13 @@
{{ row.entry }}
</ng-template>
</ngx-datatable-column>
<ngx-datatable-column name="Name" prop="name" [minWidth]="60"></ngx-datatable-column>
<ngx-datatable-column name="Name" prop="name" [minWidth]="60">
<ng-template let-row="row" ngx-datatable-cell-template>
<div class="item-select">
<b [ngClass]="'q' + row.Quality">{{ row.name }}</b>
</div>
</ng-template>
</ngx-datatable-column>
<ngx-datatable-column name="DisplayID" prop="displayid"></ngx-datatable-column>
<ngx-datatable-column name="Class" prop="class"></ngx-datatable-column>
<ngx-datatable-column name="Subclass" prop="subclass"></ngx-datatable-column>
Expand Down
Binary file added src/assets/img/money/copper.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/money/gold.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/money/silver.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions src/assets/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,41 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
@import './sidebar.scss';
@import './utils.scss';
@import './editor.scss';

.item-preview {
.item-stock, .item-name {
line-height: 30px;
font-size: 22px;
}

.q { color: #ffd100!important; }
.q0 { color: #9d9d9d!important; }
.q1 { color: #ffffff!important; }
.q2 { color: #1eff00!important; }
.q3 { color: #0070dd!important; }
.q4 { color: #a335ee!important; }
.q5 { color: #ff8000!important; }
.q6 { color: #e5cc80!important; }
.q7 { color: #e5cc80!important; }

.moneyitem, .moneygold, .moneysilver, .moneycopper, .moneyalliance, .moneyhorde, .moneyarena, .moneyachievement, .moneysocketmeta, .moneysocketred, .moneysocketyellow, .moneysocketblue, .moneysocketprismatic {
background: no-repeat right center;
color: white;
}

.moneygold { padding-right: 15px; background-image: url(../img/money/gold.gif); }
.moneysilver { padding-right: 15px; background-image: url(../img/money/silver.gif); }
.moneycopper { padding-right: 15px; background-image: url(../img/money/copper.gif); }
}

.item-select {
.q { color: #ffd100!important; }
.q0 { color: #757575!important; }
/* .q1 { color:#ffffff!important; } */
.q2 { color: #4CAF50!important; }
.q3 { color: #0070dd!important; }
.q4 { color: #a335ee!important; }
.q5 { color: #ffc107!important; }
.q6 { color: #ffab00!important; }
.q7 { color: #ff8a65!important; }
}

0 comments on commit 4035606

Please sign in to comment.