Merge pull request #1 from EugenMayer/bootstrap4-dev

Update to Alpha 6 for Modal Support

Author: GedMarc

.idea/jsLibraryMappings.xml

@@ -31,7 +31,7 @@
         "README.md"
     ],
     "dependencies": {
-        "bootstrap": ">= 3.1.0",
+        "bootstrap": ">= 3.1.0 || >= 4.0.0-alpha.3",
         "jquery": ">= 1.9.0"
     }
 }

.idea/libraries/bootstrap_dialog_node_modules.xml

@@ -33,7 +33,7 @@
   filter: alpha(opacity=100);
 }
 .bootstrap-dialog.type-default .modal-header {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .bootstrap-dialog.type-default .bootstrap-dialog-title {
   color: #333;

bower.json

@@ -40,7 +40,7 @@
      * ================================================ */
     var Modal = $.fn.modal.Constructor;
     var BootstrapDialogModal = function(element, options) {
-        if (/4\.0\.\d+/.test($.fn.modal.Constructor.VERSION)) {
+        if (/4\.0\.\d+(-(alpha|beta|rc)\.\d+)?/.test($.fn.modal.Constructor.VERSION)) {
             return new Modal(element, options);
         } else {
             Modal.call(this, element, options);
@@ -54,7 +54,7 @@
             version = 'v3.2';
         } else if (/3\.3\.[1,2]/.test($.fn.modal.Constructor.VERSION)) {
             version = 'v3.3';  // v3.3.1, v3.3.2
-        } else if (/4\.0\.\d+/.test($.fn.modal.Constructor.VERSION)) {
+        } else if (/4\.0\.\d+(-(alpha|beta|rc)\.\d+)?/.test($.fn.modal.Constructor.VERSION)) {
             version = 'v4.0';
         } else {
             version = 'v3.3.4';

dist/css/bootstrap-dialog.css

@@ -111,7 +111,7 @@
 //** Global background color for active items (e.g., navs or dropdowns).
 @component-active-bg:       @brand-primary;
 
-//** Width of the `border` for generating carets that indicator dropdowns.
+//** Width of the `border` for generating carets that indicate dropdowns.
 @caret-width-base:          4px;
 //** Carets increase slightly in size for larger components.
 @caret-width-large:         5px;
@@ -863,6 +863,8 @@
 @page-header-border-color:    @gray-lighter;
 //** Width of horizontal description list titles
 @dl-horizontal-offset:        @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint:    @grid-float-breakpoint;
 //** Horizontal line color.
 @hr-border:                   @gray-lighter;
 
@@ -954,12 +956,9 @@
   &.disabled,
   &[disabled],
   fieldset[disabled] & {
-    &,
     &:hover,
     &:focus,
-    &.focus,
-    &:active,
-    &.active {
+    &.focus {
       background-color: @background;
           border-color: @border;
     }
@@ -1256,8 +1255,8 @@
 .container-fixed(@gutter: @grid-gutter-width) {
   margin-right: auto;
   margin-left: auto;
-  padding-left:  (@gutter / 2);
-  padding-right: (@gutter / 2);
+  padding-left:  floor((@gutter / 2));
+  padding-right: ceil((@gutter / 2));
   &:extend(.clearfix all);
 }
 
@@ -1379,7 +1378,7 @@
 //
 // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
 
-// Deprecated as of v3.0.1 (will be removed in v4)
+// Deprecated as of v3.0.1 (has been removed in v4)
 .hide-text() {
   font: ~"0/0" a;
   color: transparent;
@@ -1627,9 +1626,9 @@
 // WebKit-style focus
 
 .tab-focus() {
-  // Default
-  outline: thin dotted;
-  // WebKit
+  // WebKit-specific. Other browsers will keep their default outline style.
+  // (Initially tried to also force default via `outline: initial`,
+  // but that seems to erroneously remove the outline in Firefox altogether.)
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1685,7 +1684,7 @@
 // Vendor Prefixes
 //
 // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
-// Autoprefixer in our Gruntfile. They will be removed in v4.
+// Autoprefixer in our Gruntfile. They have been removed in v4.
 
 // - Animations
 // - Backface visibility
@@ -1738,7 +1737,7 @@
 // Prevent browsers from flickering when using CSS 3D transforms.
 // Default value is `visible`, but can be changed to `hidden`
 
-.backface-visibility(@visibility){
+.backface-visibility(@visibility) {
   -webkit-backface-visibility: @visibility;
      -moz-backface-visibility: @visibility;
           backface-visibility: @visibility;

dist/js/bootstrap-dialog.js

@@ -3,7 +3,6 @@
 "use strict";
 
 var gulp = require("gulp"),
-  eslint = require("gulp-eslint"),
   less = require("gulp-less"),
   minifyCSS = require("gulp-minify-css"),
   path = require("path"),

dist/js/bootstrap-dialog.min.js

@@ -33,7 +33,7 @@
   filter: alpha(opacity=100);
 }
 .bootstrap-dialog.type-default .modal-header {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 .bootstrap-dialog.type-default .bootstrap-dialog-title {
   color: #333;

dist/less/bootstrap-dialog.less

@@ -40,7 +40,7 @@
      * ================================================ */
     var Modal = $.fn.modal.Constructor;
     var BootstrapDialogModal = function(element, options) {
-        if (/4\.0\.\d+/.test($.fn.modal.Constructor.VERSION)) {
+        if (/4\.0\.\d+(-(alpha|beta|rc)\.\d+)?/.test($.fn.modal.Constructor.VERSION)) {
             return new Modal(element, options);
         } else {
             Modal.call(this, element, options);
@@ -54,7 +54,7 @@
             version = 'v3.2';
         } else if (/3\.3\.[1,2]/.test($.fn.modal.Constructor.VERSION)) {
             version = 'v3.3';  // v3.3.1, v3.3.2
-        } else if (/4\.0\.\d+/.test($.fn.modal.Constructor.VERSION)) {
+        } else if (/4\.0\.\d+(-(alpha|beta|rc)\.\d+)?/.test($.fn.modal.Constructor.VERSION)) {
             version = 'v4.0';
         } else {
             version = 'v3.3.4';