Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
skublik committed Jun 2, 2022
2 parents 0ce90c3 + 409e93c commit 9c66071
Show file tree
Hide file tree
Showing 24 changed files with 621 additions and 294 deletions.
76 changes: 29 additions & 47 deletions gui/admin-gui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion gui/admin-gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"style-loader": "^3.3.1",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-merge": "^5.8.0"
"webpack-merge": "^5.8.0",
"tempusdominus-bootstrap-4": "^5.39.2"
}
}
8 changes: 8 additions & 0 deletions gui/admin-gui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,14 @@
<groupId>com.github.openjson</groupId>
<artifactId>openjson</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>


<!-- Messaging -->
Expand Down
67 changes: 67 additions & 0 deletions gui/admin-gui/src/frontend/scss/_tables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* Copyright (c) 2022 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
*/

/*
* All styles related to tables, columns (e.g. check, icon columns and others)
*/

// todo move styles from midpoint.scss

//table context menu border fix
th.cog, td.cog {
& ul.dropdown-menu.pull-right {
border-color: #337ab7;
}
}
//end table context menu border fix



// Tables where the first column is the name of the property/attribute
// (e.g. audit log item details)
// see MID-4300

td.prop-name {
min-width: 90px;
font-weight: bold;
}

th.icon {
// The content of this column is just a single icon.
// WARNING: this means both the header and the table data
// have just a single icon. No text.
// See com.evolveum.midpoint.web.component.data.column.IconColumn
width: 30px;
}

th.mid-width-column, td.mid-width-column {
width: 180px;
}

th.min-width-column, td.min-width-column {
width: 70px;
}

th.max-width-column, td.max-width-column {
width: 350px;
}

th.shrink {
// We want this column to fit as tightly as possible.
// E.g. for columns that have textual label but
// the content is just an icon or something much smaller
// than the header.
width: -moz-min-content;
}

th.countLabel{
// The content of this column is just some integer value.
// WARNING: this means both the header and the table data
// have just some integer value.
// See com.evolveum.midpoint.web.page.admin.certification.PageCertDecisions
width: 70px;
}
66 changes: 66 additions & 0 deletions gui/admin-gui/src/frontend/scss/_tiles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright (c) 2022 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
*/

/*
* Contains all styles for all kinds of tile panels
*/

@mixin selectable-tile {
border: 2px solid $white;
border-radius: $border-radius;
background-color: $white;
cursor: pointer;

&:hover,
&.active {
border: 2px solid $primary;
border-radius: $border-radius;
}
}

@mixin selectable-tile-dark-mode {
border-color: $secondary-alt;
background-color: lighten($dark, 7.5%) !important;
color: $white !important;

&:hover,
&.active {
border-color: $primary-alt;
}
}

.tile-panel {
width: 250px;
height: 250px;

@include selectable-tile();
}

@include dark-mode () {
.tile-panel {
@include selectable-tile-dark-mode();
}
}

.catalog-tile-panel {
width: 317px;
height: 376px;
@include selectable-tile();

& > .logo {
width: 84px;
height: 84px;
border-radius: 108px;
background-color: rgba(60, 141, 188, 0.1);
}
}

@include dark-mode () {
.catalog-tile-panel {
@include selectable-tile-dark-mode();
}
}
4 changes: 4 additions & 0 deletions gui/admin-gui/src/frontend/scss/bs-stepper-custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@
.bs-stepper-label {
color: $secondary;
}

.bs-stepper .step-trigger:hover {
background-color: inherit;
}

0 comments on commit 9c66071

Please sign in to comment.