admin-lte less files upgrade (files for our wro4j compilation)

Evolveum · Feb 22, 2017 · 0bccdae · 0bccdae
1 parent ef3ef8a
commit 0bccdae
Show file tree

Hide file tree

Showing 68 changed files with 1,400 additions and 890 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -1161,7 +1161,7 @@
 	        <dependency>
 	            <groupId>org.webjars</groupId>
 	            <artifactId>html5shiv</artifactId>
-	            <version>3.7.2</version>
+	            <version>3.7.3</version>
 	        </dependency>
 	        <dependency>
 	            <groupId>org.webjars</groupId>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -40,7 +40,7 @@
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <!--[if lt IE 9]>
-        <script src="../../../../../../webjars/html5shiv/3.7.2/html5shiv.min.js"></script>
+        <script src="../../../../../../webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
         <script src="../../../../../../webjars/respond/1.4.2/respond.min.js"></script>
         <![endif]-->
     </wicket:link>
@@ -145,7 +145,7 @@
     <wicket:link>
         <script src="../../../../../../webjars/adminlte/2.3.11/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
         <script src="../../../../../../webjars/adminlte/2.3.11/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-        <script src='../../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.min.js'></script>
+        <script src='../../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.js'></script>
         <script src="../../../../../../webjars/adminlte/2.3.11/dist/js/app.min.js" type="text/javascript"></script>
     </wicket:link>
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
@@ -36,7 +36,7 @@
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <!--[if lt IE 9]>
-        <script src="../../../../../webjars/html5shiv/3.7.2/html5shiv.min.js"></script>
+        <script src="../../../../../webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
         <script src="../../../../../webjars/respond/1.4.2/respond.min.js"></script>
         <![endif]-->
     </wicket:link>
@@ -57,7 +57,7 @@
     <wicket:link>
         <script src="../../../../../webjars/adminlte/2.3.11/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
         <script src="../../../../../webjars/adminlte/2.3.11/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-        <script src='../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.min.js'></script>
+        <script src='../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.js'></script>
         <script src="../../../../../webjars/adminlte/2.3.11/dist/js/app.min.js" type="text/javascript"></script>
     </wicket:link>
 

diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins.less
@@ -1,6 +1,5 @@
 // Mixins
 // --------------------------------------------------
-
 // Utilities
 @import "mixins/hide-text.less";
 @import "mixins/opacity.less";
@@ -11,10 +10,10 @@
 @import "mixins/responsive-visibility.less";
 @import "mixins/size.less";
 @import "mixins/tab-focus.less";
+@import "mixins/reset-text.less";
 @import "mixins/text-emphasis.less";
 @import "mixins/text-overflow.less";
 @import "mixins/vendor-prefixes.less";
-
 // Components
 @import "mixins/alerts.less";
 @import "mixins/buttons.less";
@@ -25,12 +24,10 @@
 @import "mixins/forms.less";
 @import "mixins/progress-bar.less";
 @import "mixins/table-row.less";
-
 // Skins
 @import "mixins/background-variant.less";
 @import "mixins/border-radius.less";
 @import "mixins/gradients.less";
-
 // Layout
 @import "mixins/clearfix.less";
 @import "mixins/center-block.less";

diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/background-variant.less
@@ -2,7 +2,8 @@
 
 .bg-variant(@color) {
   background-color: @color;
-  a&:hover {
+  a&:hover,
+  a&:focus {
     background-color: darken(@color, 10%);
   }
 }
diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/border-radius.less
@@ -2,17 +2,20 @@
 
 .border-top-radius(@radius) {
   border-top-right-radius: @radius;
-   border-top-left-radius: @radius;
+  border-top-left-radius: @radius;
 }
+
 .border-right-radius(@radius) {
   border-bottom-right-radius: @radius;
-     border-top-right-radius: @radius;
+  border-top-right-radius: @radius;
 }
+
 .border-bottom-radius(@radius) {
   border-bottom-right-radius: @radius;
-   border-bottom-left-radius: @radius;
+  border-bottom-left-radius: @radius;
 }
+
 .border-left-radius(@radius) {
   border-bottom-left-radius: @radius;
-     border-top-left-radius: @radius;
+  border-top-left-radius: @radius;
 }
diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/buttons.less
@@ -8,15 +8,31 @@
   background-color: @background;
   border-color: @border;
 
-  &:hover,
   &:focus,
-  &.focus,
+  &.focus {
+    color: @color;
+    background-color: darken(@background, 10%);
+    border-color: darken(@border, 25%);
+  }
+  &:hover {
+    color: @color;
+    background-color: darken(@background, 10%);
+    border-color: darken(@border, 12%);
+  }
   &:active,
   &.active,
   .open > .dropdown-toggle& {
     color: @color;
     background-color: darken(@background, 10%);
-        border-color: darken(@border, 12%);
+    border-color: darken(@border, 12%);
+
+    &:hover,
+    &:focus,
+    &.focus {
+      color: @color;
+      background-color: darken(@background, 17%);
+      border-color: darken(@border, 25%);
+    }
   }
   &:active,
   &.active,
@@ -33,7 +49,7 @@
     &:active,
     &.active {
       background-color: @background;
-          border-color: @border;
+      border-color: @border;
     }
   }
 

diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/forms.less
@@ -14,16 +14,16 @@
   &.radio label,
   &.checkbox label,
   &.radio-inline label,
-  &.checkbox-inline label  {
+  &.checkbox-inline label {
     color: @text-color;
   }
   // Set the border and box shadow on specific inputs to match
   .form-control {
     border-color: @border-color;
-    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    .box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075)); // Redeclare so transitions work
     &:focus {
       border-color: darken(@border-color, 10%);
-      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);
+      @shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten(@border-color, 20%);
       .box-shadow(@shadow);
     }
   }
@@ -39,7 +39,6 @@
   }
 }
 
-
 // Form control focus state
 //
 // Generate a customized focus state and for any input with the specified color,
@@ -79,7 +78,7 @@
   }
 
   textarea&,
-  select[multiple]& {
+  select[multiple] & {
     height: auto;
   }
 }
diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/gradients.less
@@ -11,19 +11,19 @@
     background-image: -o-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Opera 12
     background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
     background-repeat: repeat-x;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)", argb(@start-color), argb(@end-color))); // IE9 and down
   }
 
   // Vertical gradient, from top to bottom
   //
   // Creates two color stops, start and end, by specifying a color and position for each color stop.
   // Color stops are not available in IE9 and below.
   .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
-    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Safari 5.1-6, Chrome 10+
-    background-image: -o-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Opera 12
+    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+
+    background-image: -o-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Opera 12
     background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
     background-repeat: repeat-x;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)", argb(@start-color), argb(@end-color))); // IE9 and down
   }
 
   .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {
@@ -37,14 +37,14 @@
     background-image: -o-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
     background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);
     background-repeat: no-repeat;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)", argb(@start-color), argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
   }
   .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
     background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
     background-image: -o-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
     background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);
     background-repeat: no-repeat;
-    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)", argb(@start-color), argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
   }
   .radial(@inner-color: #555; @outer-color: #333) {
     background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);

diff --git a/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less b/gui/admin-gui/src/main/webapp/less/admin-lte/bootstrap-less/mixins/grid-framework.less
@@ -5,37 +5,43 @@
 
 .make-grid-columns() {
   // Common styles for all sizes of grid columns, widths 1-12
-  .col(@index) { // initial
+  .col(@index) {
+    // initial
     @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
     .col((@index + 1), @item);
   }
-  .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
+  .col(@index, @list) when (@index =< @grid-columns) {
+    // general; "=<" isn't a typo
     @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
     .col((@index + 1), ~"@{list}, @{item}");
   }
-  .col(@index, @list) when (@index > @grid-columns) { // terminal
+  .col(@index, @list) when (@index > @grid-columns) {
+    // terminal
     @{list} {
       position: relative;
       // Prevent columns from collapsing when empty
       min-height: 1px;
       // Inner gutter via padding
-      padding-left:  (@grid-gutter-width / 2);
+      padding-left: (@grid-gutter-width / 2);
       padding-right: (@grid-gutter-width / 2);
     }
   }
   .col(1); // kickstart it
 }
 
 .float-grid-columns(@class) {
-  .col(@index) { // initial
+  .col(@index) {
+    // initial
     @item: ~".col-@{class}-@{index}";
     .col((@index + 1), @item);
   }
-  .col(@index, @list) when (@index =< @grid-columns) { // general
+  .col(@index, @list) when (@index =< @grid-columns) {
+    // general
     @item: ~".col-@{class}-@{index}";
     .col((@index + 1), ~"@{list}, @{item}");
   }
-  .col(@index, @list) when (@index > @grid-columns) { // terminal
+  .col(@index, @list) when (@index > @grid-columns) {
+    // terminal
     @{list} {
       float: left;
     }
@@ -48,26 +54,31 @@
     width: percentage((@index / @grid-columns));
   }
 }
+
 .calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) {
   .col-@{class}-push-@{index} {
     left: percentage((@index / @grid-columns));
   }
 }
+
 .calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) {
   .col-@{class}-push-0 {
     left: auto;
   }
 }
+
 .calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) {
   .col-@{class}-pull-@{index} {
     right: percentage((@index / @grid-columns));
   }
 }
+
 .calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) {
   .col-@{class}-pull-0 {
     right: auto;
   }
 }
+
 .calc-grid-column(@index, @class, @type) when (@type = offset) {
   .col-@{class}-offset-@{index} {
     margin-left: percentage((@index / @grid-columns));