Compare commits

...

7 Commits

Author SHA1 Message Date
semantic-release-bot
3c62ff6913 chore(release): 6.10.1 [skip ci]
## [6.10.1](https://git.datacontroller.io/dc/dc/compare/v6.10.0...v6.10.1) (2024-06-07)

### Bug Fixes

* adding 60 more colours to crayons table. Closes [#112](#112) ([3521579](3521579dea))
* terms and conditions colours, editor on smaller screens show only icons ([e32d44b](e32d44b1bc))
2024-06-07 15:46:58 +00:00
f4f589af94 Merge pull request 'fix: adding 60 more colours to crayons table. Closes #112' (#114) from issue112 into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 4m41s
Release / Build-and-test-development (push) Successful in 8m42s
Release / release (push) Successful in 10m11s
Reviewed-on: #114
2024-06-07 15:29:09 +00:00
3521579dea fix: adding 60 more colours to crayons table. Closes #112
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m45s
2024-06-07 16:23:40 +01:00
e97a6f52da Merge pull request 'fix: terms and conditions colours, editor on smaller screens show only icons' (#113) from issue111 into main
Some checks failed
Release / Build-and-test-development (push) Has been cancelled
Release / release (push) Has been cancelled
Release / Build-production-and-ng-test (push) Has been cancelled
Reviewed-on: #113
2024-06-07 15:22:00 +00:00
Mihajlo Medjedovic
3584aa35c7 chore: package-locks
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m49s
2024-06-07 17:07:23 +02:00
Mihajlo Medjedovic
b553520abe style: lint, package-locks
Some checks failed
Build / Build-and-ng-test (pull_request) Failing after 55s
2024-06-07 16:58:04 +02:00
Mihajlo Medjedovic
e32d44b1bc fix: terms and conditions colours, editor on smaller screens show only icons
Some checks failed
Build / Build-and-ng-test (pull_request) Failing after 52s
2024-06-07 16:34:47 +02:00
9 changed files with 1020 additions and 2168 deletions

View File

@ -1,3 +1,11 @@
## [6.10.1](https://git.datacontroller.io/dc/dc/compare/v6.10.0...v6.10.1) (2024-06-07)
### Bug Fixes
* adding 60 more colours to crayons table. Closes [#112](https://git.datacontroller.io/dc/dc/issues/112) ([3521579](https://git.datacontroller.io/dc/dc/commit/3521579dead089eebf62455686be3aee88bde687))
* terms and conditions colours, editor on smaller screens show only icons ([e32d44b](https://git.datacontroller.io/dc/dc/commit/e32d44b1bcdfeea43d19b21ec0ddf4af1ce3992a))
# [6.10.0](https://git.datacontroller.io/dc/dc/compare/v6.9.0...v6.10.0) (2024-06-07)

1225
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -164,22 +164,28 @@
<div
class="card-header clr-row buttonBar headerBar clr-flex-md-row clr-justify-content-center clr-justify-content-lg-end"
>
<div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 backBtn">
<span class="btn btn-sm btn-icon btn-dimmed" [routerLink]="['/home']">
<div
*ngIf="tableTrue"
class="clr-col-12 clr-col-md-3 clr-col-lg-4 backBtn"
>
<span
class="btn icon-collapse btn-sm btn-icon btn-dimmed"
[routerLink]="['/home']"
>
<clr-icon shape="caret" dir="left" size="20"></clr-icon>
Back to table selection
<span class="text">Back to table selection</span>
</span>
<span
(click)="viewboxManager()"
class="btn btn-sm btn-icon btn-dimmed viewbox-open"
class="btn icon-collapse btn-sm btn-icon btn-dimmed viewbox-open"
>
<clr-icon shape="view-cards" size="20"></clr-icon>
Viewboxes
<span class="text">Viewboxes</span>
</span>
</div>
<div
class="clr-col-12 clr-col-lg-4 d-flex flex-column align-items-center"
class="clr-col-12 clr-col-md-5 clr-col-lg-4 d-flex flex-column align-items-center"
[class.clr-col-lg-12]="!tableTrue"
>
<h4
@ -234,34 +240,37 @@
</ng-container>
</h4>
</div>
<div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 btnCtrl">
<div
*ngIf="tableTrue"
class="clr-col-12 clr-col-md-4 clr-col-lg-4 btnCtrl"
>
<ng-container *ngIf="hotTable.readOnly && !uploadPreview">
<button
type="button"
class="btnView btn btn-sm btn-icon btn-block btn-dimmed"
class="btnView btn icon-collapse btn-sm btn-icon btn-block btn-dimmed"
(click)="openQb()"
>
<clr-icon shape="filter"></clr-icon>
<span>Filter</span>
<span class="text">Filter</span>
</button>
<button
type="button"
class="btn btn-sm btn-primary btn-block"
class="btn icon-collapse btn-sm btn-primary btn-block"
(click)="editTable()"
>
<clr-icon shape="note"></clr-icon>
<span>Edit</span>
<span class="text">Edit</span>
</button>
<button
*ngIf="!columnLevelSecurityFlag"
(click)="onShowUploadModal()"
type="button"
class="btn btn-sm btn-success btn-block mr-0"
class="btn icon-collapse btn-sm btn-success btn-block mr-0"
>
<clr-icon shape="upload"></clr-icon>
<span>Upload</span>
<span class="text">Upload</span>
</button>
</ng-container>

View File

@ -223,6 +223,16 @@ hot-table {
font-size: inherit !important;
}
// When width is smaller remove the text from the buttons
// keep only the icons
@media (max-width: 992px) {
.icon-collapse {
.text {
display: none;
}
}
}
// FIXME
// Let's leave it here for a reference if there
// is an issue with viewboxes/filter modal overlaying

View File

@ -19,8 +19,6 @@
.card-block {
flex: 1;
overflow: auto;
background-color: #f4f4f4;
}
}

457
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "dcfrontend",
"version": "6.10.0",
"version": "6.10.1",
"description": "Data Controller",
"devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0",

1389
sas/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -178,6 +178,66 @@ gray,#808080
black,#00000
yellow,#ffe119
white,#ffffff
bazaar,#98777b
beaver,#9f8170
bisque,#ffe4c4
blond,#faf0be
blush,#de5d83
bole,#79443b
bone,#e3dac9
brass,#b5a642
bronze,#cd7f32
bubbles,#e7feff
buff,#f0dc82
camel,#c19a6b
canary,#ffff99
capri,#00bfff
cardinal,#c41e3a
carmine,#ff0040
celadon,#ace1af
celeste,#b2ffff
cerise,#de3163
cerulean,#007ba7
cherry,#de3163
chestnut,#cd5c5c
cinnabar,#e34234
cinnamon,#d2691e
citrine,#e4d00a
cobalt,#0047ab
coffee,#6f4e37
copper,#b87333
coral,#ff7f50
corn,#fbec5d
cornsilk,#fff8dc
cream,#fffdd0
crimson,#dc143c
daffodil,#ffff31
denim,#1560bd
desert,#c19a6b
drab,#967117
ecru,#c2b280
eggplant,#614051
eggshell,#f0ead6
emerald,#50c878
fallow,#c19a6b
fawn,#e5aa70
fern,#71bc78
flame,#e25822
flax,#eedc82
folly,#ff004f
fuchsia,#ff00ff
fulvous,#e48400
gamboge,#e49b0f
ginger,#b06500
glaucous,#6082b6
glitter,#e6e8fa
gold,#ffd700
grullo,#a99a86
icterine,#fcf75e
indigo,#4b0082
iris,#5a4fcf
ivory,#fffff0
jade,#00a86b
;;;;
run;