Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/jsLibraryMappings.xml

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

15 changes: 15 additions & 0 deletions .idea/libraries/bootstrap_dialog_node_modules.xml

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

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"README.md"
],
"dependencies": {
"bootstrap": ">= 3.1.0",
"bootstrap": ">= 3.1.0 || >= 4.0.0-alpha.3",
"jquery": ">= 1.9.0"
}
}
2 changes: 1 addition & 1 deletion dist/css/bootstrap-dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions dist/js/bootstrap-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap-dialog.min.js

Large diffs are not rendered by default.

25 changes: 12 additions & 13 deletions dist/less/bootstrap-dialog.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -954,12 +956,9 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
&,
&:hover,
&:focus,
&.focus,
&:active,
&.active {
&.focus {
background-color: @background;
border-color: @border;
}
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion src/css/bootstrap-dialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/js/bootstrap-dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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';
Expand Down