adding of new icon to font-evosome and creating new css style for lay…

…ered icons

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java

@@ -176,7 +176,10 @@ public class GuiStyleConstants {
 	public static final String CLASS_CREATE_FOCUS = "fa fa-user-plus";
 
 	public static final String EVO_CROW_ICON = "fe fe-crown-object";
+	public static final String EVO_RIGHT_TOP_ARROW_ICON = "fe fe-arrow";
 	public static final String EVO_ASSIGNMENT_ICON = "fe fe-assignment";
+	public static final String EVO_ASSIGNMENT_ICON_A_PIECE = "fe fe-assign_horizontal_A_piece";
+	public static final String EVO_ASSIGNMENT_ICON_B_PIECE = "fe fe-assign_horizontal_B_piece";
 	public static final String EVO_OFFICER_CAP_ICON = "fe fe-officer-cap-object";
 	public static final String EVO_ASSIGNMENT_STRAIGHT_THICKER_ICON = "fe fe-assignment-straight-thicker-object";
 	public static final String EVO_ASSIGNMENT_STRAIGHT_ICON = "fe fe-assignment-straight-object";
@@ -191,4 +194,8 @@ public class GuiStyleConstants {
 	public static final String EVO_ROLE_TOP_HAT_ICON = "fe fe-role-top-hat";
 	public static final String EVO_ASSIGNMENT_THICKER_ICON = "fe assignment-thicker";
 
+	public static final String GREEN_COLOR = "color-green";
+	public static final String YELLOW_COLOR = "color-yellow";
+	public static final String RED_COLOR = "color-red";
+
 }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CenterIconCssStyle.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010-2018 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.evolveum.midpoint.gui.impl.component.icon;
+
+/**
+ * @author skublik
+ */
+public class CenterIconCssStyle implements LayeredIconCssStyle {
+
+	@Override
+	public String getBasicCssClass() {
+		return "icon-basic-transparent";
+	}
+
+	@Override
+	public String getBasicLayerCssClass() {
+		return "icon-basic-layer";
+	}
+
+	@Override
+	public String getLayerCssClass() {
+		return "center-layer";
+	}
+
+	@Override
+	public String getStrokeLayerCssClass() {
+		return "center-icon-stroke-layer";
+	}
+
+}

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CompositedIcon.java

@@ -16,6 +16,7 @@
 
 package com.evolveum.midpoint.gui.impl.component.icon;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -26,7 +27,9 @@
 /**
  * @author skublik
  */
-public class CompositedIcon {
+public class CompositedIcon implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	private String basicIcon;
 	private List<String> layerIcons;

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/CompositedIconBuilder.java

@@ -23,6 +23,8 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+
 /**
  * @author skublik
  */
@@ -54,7 +56,7 @@ public CompositedIconBuilder setBasicIcon(String icon, IconCssStyle style) {
 	}
 
 	public CompositedIconBuilder setBasicIcon(String icon, IconCssStyle style, String additionalCssClass) {
-		validateInput(icon, style);
+		additionalCssClass = additionalCssClass + " " + validateInput(icon, style, true);
 		setBasicIcon(icon, style.getBasicCssClass() + " " + additionalCssClass);
 		return this;
 	}
@@ -64,7 +66,7 @@ public CompositedIconBuilder setBasicIcon(String icon, LayeredIconCssStyle style
 	}
 
 	public CompositedIconBuilder setBasicIcon(String icon, LayeredIconCssStyle style, String additionalCssClass) {
-		validateInput(icon, style);
+		additionalCssClass = additionalCssClass + " " + validateInput(icon, style, true);
 		setBasicIcon(icon, style.getBasicCssClass());
 		StringBuilder sb = new StringBuilder(icon);
 		sb.append(" ").append(style.getBasicLayerCssClass());
@@ -80,7 +82,7 @@ public CompositedIconBuilder appendLayerIcon(String icon, CompositedIconCssStyle
 	}
 
 	public CompositedIconBuilder appendLayerIcon(String icon, CompositedIconCssStyle style, String additionalCssClass) {
-		validateInput(icon, style);
+		additionalCssClass = additionalCssClass + " " + validateInput(icon, style, false);
 		StringBuilder sb = new StringBuilder(icon);
 		sb.append(" ");
 		if(layerIcons.isEmpty()) {
@@ -100,7 +102,7 @@ public CompositedIconBuilder appendLayerIcon(String icon, LayeredIconCssStyle st
 	}
 
 	public CompositedIconBuilder appendLayerIcon(String icon, LayeredIconCssStyle style, String additionalCssClass) {
-		validateInput(icon, style);
+		additionalCssClass = additionalCssClass + " " + validateInput(icon, style, false);
 		StringBuilder sb = new StringBuilder(icon);
 		sb.append(" ").append(style.getLayerCssClass());
 		if(StringUtils.isNotEmpty(additionalCssClass)) {
@@ -118,7 +120,7 @@ public CompositedIconBuilder appendLayerIcon(String icon, IconCssStyle style) {
 	}
 
 	public CompositedIconBuilder appendLayerIcon(String icon, IconCssStyle style, String additionalCssClass) {
-		validateInput(icon, style);
+		additionalCssClass = additionalCssClass + " " + validateInput(icon, style, false);
 		StringBuilder sb = new StringBuilder(icon);
 		sb.append(" ").append(style.getLayerCssClass());
 		if(StringUtils.isNotEmpty(additionalCssClass)) {
@@ -128,8 +130,13 @@ public CompositedIconBuilder appendLayerIcon(String icon, IconCssStyle style, St
 		return this;
 	}
 
-	private void validateInput(String icon, IconCssStyle style) {
+	private String validateInput(String icon, IconCssStyle style, Boolean isBasic) {
 		Validate.notNull(icon, "no icon class");
 		Validate.notNull(style, "no icon style");
+
+		if(isBasic && icon.equals(GuiStyleConstants.EVO_CROW_ICON) && style instanceof LayeredIconCssStyle) {
+			return "font-size-130-per";
+		}
+		return "";
 	}
 }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/icon/IconCssStyle.java

@@ -23,6 +23,7 @@ public interface IconCssStyle {
 
 	public static final BottomLeftIconCssStyle BOTTOM_LEFT_STYLE = new BottomLeftIconCssStyle();
 	public static final BottomRightIconCssStyle BOTTOM_RIGHT_STYLE = new BottomRightIconCssStyle();
+	public static final CenterIconCssStyle CENTER_STYLE = new CenterIconCssStyle();
 	public static final InRowIconCssStyle IN_ROW_STYLE = new InRowIconCssStyle();
 
 	public String getBasicCssClass();

gui/admin-gui/src/main/resources/static/css/font-evosome.css

@@ -18,6 +18,15 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.fe-assign_horizontal_B_piece:before {
+  content: "\e90c";
+}
+.fe-assign_horizontal_A_piece:before {
+  content: "\e90d";
+}
+.fe-arrow:before {
+  content: "\e90e";
+}
 .fe-officer-cap-object:before {
   content: "\e90b";
 }
@@ -63,5 +72,3 @@
 .fe-assignment-thicker:before {
   content: "\e909";
 }
-
-

gui/admin-gui/src/main/resources/static/less/midpoint/icon-style.less

@@ -14,39 +14,65 @@
  * limitations under the License.
  */
 
+ //COLORS
+//--------------------------------------------------------
+//Primary
+@light-blue: #3c8dbc;
+//Danger
+@red: #dd4b39;
+//Success
+@green: #00a65a;
+//Info
+@aqua: #00c0ef;
+//Warning
+@yellow: #f39c12;
+@blue: #0073b7;
+@navy: #001F3F;
+@teal: #39CCCC;
+@olive: #3D9970;
+@lime: #01FF70;
+@orange: #FF851B;
+@fuchsia: #F012BE;
+@purple: #605ca8;
+@maroon: #D81B60;
+@black: #111;
+@gray-lte: #d2d6de;
+@default: #f4f4f4;
+
+
  i.icon-stroke-layer {
- 	-webkit-text-stroke: 3px white;
- 	-moz-text-stroke: 3px white;
+ 	-webkit-text-stroke: 2px white;
+ 	-moz-text-stroke: 2px white;
  }
 
  .btn-success > i.icon-stroke-layer {
- 	-webkit-text-stroke-color: #00a65a;
- 	-moz-text-stroke-color: #00a65a;
+ 	-webkit-text-stroke-color: @green;
+ 	-moz-text-stroke-color: @green;
  }
 
  .btn-default > i.icon-stroke-layer {
- 	-webkit-text-stroke-color: #f4f4f4;
- 	-moz-text-stroke-color: #f4f4f4;
+ 	-webkit-text-stroke-color: @default;
+ 	-moz-text-stroke-color: @default;
  }
 
  .btn-primary > i.icon-stroke-layer {
- 	-webkit-text-stroke-color: #3c8dbc;
- 	-moz-text-stroke-color: #3c8dbc;
+ 	-webkit-text-stroke-color: @light-blue;
+ 	-moz-text-stroke-color: @light-blue;
  }
 
  .btn-info > i.icon-stroke-layer {
- 	-webkit-text-stroke-color: #00c0ef;
- 	-moz-text-stroke-color: #00c0ef;
+ 	-webkit-text-stroke-color: @aqua;
+ 	-moz-text-stroke-color: @aqua;
  }
 
  .btn-warning > i.icon-stroke-layer {
- 	-webkit-text-stroke-color: #f39c12;
- 	-moz-text-stroke-color: #f39c12;
+ 	-webkit-text-stroke-color: @yellow;
+ 	-moz-text-stroke-color: @yellow;
  }
 
  .btn-danger > i.icon-stroke-layer {
- 	-webkit-text-stroke-color: #dd4b39;
- 	-moz-text-stroke-color: #dd4b39;
+ 	-webkit-text-stroke-color: @red;
+ 	-moz-text-stroke-color: @red;
  }
 
  @media all and (-ms-high-contrast: none), (-ms-high-contrast: active){
@@ -112,8 +138,9 @@
  }
 
  i.icon-basic-layer {
- 	font-size: 210%;
+ 	font-size: 200% !important;
  	position: absolute;
+ 	top: 6%;
  	left: 0;
  	right: 0;
  }
@@ -134,4 +161,35 @@
   	position: absolute;
   	left: 10%;
   	bottom: 5%;
- }
+ }
+
+ i.center-layer {
+  	font-size: 70% !important;
+  	position: absolute;
+  	top: 45%;
+  	right: 0;
+  	left: 0;
+ }
+
+ i.center-icon-stroke-layer {
+ 	-webkit-text-stroke: 1px white;
+ 	-moz-text-stroke: 1px white;
+ }
+
+ i.font-size-130-per{
+ 	font-size: 130% !important;
+ 	top: 24%;
+ }
+
+ .color-green{
+ 	color: @green !important;
+ }
+
+ .color-yellow{
+ 	color: @yellow !important;
+ }
+
+ .color-red{
+ 	color: @red !important;
+ }
+