Merge branch 'master' of https://github.com/Evolveum/midpoint

gui/admin-gui/package.json

@@ -12,6 +12,7 @@
   "license": "Apache License 2.0 and European Union Public License",
   "devDependencies": {
     "@fontsource/source-sans-pro": "^4.5.9",
+    "@fortawesome/fontawesome-free": "^6.1.1",
     "ace-builds": "^1.4.14",
     "admin-lte": "3.2.0",
     "babel-loader": "^8.2.4",

gui/admin-gui/pom.xml

@@ -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 -->

gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss

@@ -0,0 +1,18 @@
+/*!
+ * 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.
+ */
+
+.user-panel {
+  border-bottom: 0 !important;
+}
+
+.btn-default {
+
+  &.active {
+    background-color: darken($button-default-background-color, 5%);
+    color: darken($button-default-color, 10%);
+  }
+}

gui/admin-gui/src/frontend/scss/_bootstrap-variables.scss

@@ -0,0 +1,18 @@
+/*!
+ * 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.
+ */
+
+// taken from adminlte and bootstrap, also based on figma
+$gray-700: #495057 !default;
+$lightblue: #3c8dbc !default;
+
+$midpoint-secondary: #818D98 !default;
+
+// override bootstrap defaults where necessary
+$primary: $lightblue;
+$secondary: $midpoint-secondary;
+
+$body-color: $gray-700;

gui/admin-gui/src/frontend/scss/midpoint-variables.scss → gui/admin-gui/src/frontend/scss/_midpoint-variables.scss

@@ -7,7 +7,12 @@
 
 @import "../../../node_modules/admin-lte/node_modules/bootstrap/scss/functions.scss";
 
+@import "bootstrap-variables";
+
 @import "../../../node_modules/admin-lte/build/scss/bootstrap-variables";
+
+@import "admin-lte-variables";
+
 @import "../../../node_modules/admin-lte/build/scss/variables";
 @import "../../../node_modules/admin-lte/build/scss/variables-alt";
 

gui/admin-gui/src/frontend/scss/_tables.scss

@@ -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;
+}

gui/admin-gui/src/frontend/scss/_tiles.scss

@@ -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();
+  }
+}

gui/admin-gui/src/frontend/scss/bs-stepper-custom.scss

@@ -8,3 +8,15 @@
 .active .bs-stepper-circle {
   background-color: $lightblue;
 }
+
+.bs-stepper-circle {
+  background-color: $secondary;
+}
+
+.bs-stepper-label {
+  color: $secondary;
+}
+
+.bs-stepper .step-trigger:hover {
+  background-color: inherit;
+}

gui/admin-gui/src/frontend/scss/details-menu.scss

@@ -50,7 +50,7 @@
       }
 
       > a > .fa-angle-left {
-        @include fa-icon-rotate(270deg, 3);
+        transform: rotate(270deg);
       }
     }
   }