Skip to content

Commit

Permalink
Merge pull request #79 from coliff/v4.3.1
Browse files Browse the repository at this point in the history
v4.3.1 Update
  • Loading branch information
coliff committed Feb 18, 2019
2 parents e897092 + 42cdd93 commit 57aa730
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 106 deletions.
111 changes: 56 additions & 55 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,56 +1,57 @@
{
"rules": {
"at-rule-empty-line-before": null,
"at-rule-name-space-after": "always",
"at-rule-no-vendor-prefix": true,
"at-rule-semicolon-space-before": "never",
"block-closing-brace-empty-line-before": null,
"block-closing-brace-newline-after": null,
"block-opening-brace-space-before": null,
"color-named": "never",
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-newline-before": "never-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-empty-line-before": null,
"font-family-name-quotes": "always-where-recommended",
"font-weight-notation": "numeric",
"function-blacklist": ["linear-gradient"],
"function-url-no-scheme-relative": true,
"function-url-quotes": "always",
"length-zero-no-unit": true,
"max-empty-lines": 2,
"max-line-length": null,
"media-feature-name-no-vendor-prefix": true,
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "never",
"no-descending-specificity": null,
"media-feature-name-no-unknown": [true, {
"ignoreMediaFeatureNames": ["prefers-reduced-motion"]
}],
"property-blacklist": ["align-self", "flex", "flex-wrap", "order"],
"rule-empty-line-before": null,
"selector-attribute-quotes": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-newline-before": "never-multi-line",
"selector-list-comma-space-after": "always-single-line",
"selector-list-comma-space-before": "never-single-line",
"selector-pseudo-class-blacklist": ["valid", "invalid", "required"],
"selector-max-attribute": 2,
"selector-max-class": 4,
"selector-max-combinators": 4,
"selector-max-compound-selectors": 4,
"selector-max-empty-lines": 1,
"selector-max-id": 0,
"selector-max-specificity": null,
"selector-max-type": 2,
"selector-max-universal": 1,
"selector-no-vendor-prefix": true,
"string-quotes": "double",
"value-keyword-case": "lower",
"value-list-comma-newline-after": "never-multi-line",
"value-list-comma-newline-before": "never-multi-line",
"value-list-comma-space-after": "always",
"value-no-vendor-prefix": true
}
}
"rules":
{
"at-rule-empty-line-before": null,
"at-rule-name-space-after": "always",
"at-rule-no-vendor-prefix": true,
"at-rule-semicolon-space-before": "never",
"block-closing-brace-empty-line-before": null,
"block-closing-brace-newline-after": null,
"block-opening-brace-space-before": null,
"color-named": "never",
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-newline-before": "never-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-empty-line-before": null,
"font-family-name-quotes": "always-where-recommended",
"font-weight-notation": "numeric",
"function-blacklist": ["linear-gradient"],
"function-url-no-scheme-relative": true,
"function-url-quotes": "always",
"length-zero-no-unit": true,
"max-empty-lines": 2,
"max-line-length": null,
"media-feature-name-no-vendor-prefix": true,
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "never",
"no-descending-specificity": null,
"media-feature-name-no-unknown":
[true, { "ignoreMediaFeatureNames": ["prefers-reduced-motion"] }],
"property-blacklist": ["align-self", "flex", "flex-wrap", "order"],
"rule-empty-line-before": null,
"selector-attribute-quotes": "always",
"selector-class-pattern": "^[a-z][a-z0-9\\-]*[a-z0-9]$",
"selector-list-comma-newline-after": "always",
"selector-list-comma-newline-before": "never-multi-line",
"selector-list-comma-space-after": "always-single-line",
"selector-list-comma-space-before": "never-single-line",
"selector-pseudo-class-blacklist": ["valid", "invalid", "required"],
"selector-max-attribute": 2,
"selector-max-class": 4,
"selector-max-combinators": 4,
"selector-max-compound-selectors": 4,
"selector-max-empty-lines": 1,
"selector-max-id": 0,
"selector-max-specificity": null,
"selector-max-type": 2,
"selector-max-universal": 1,
"selector-no-vendor-prefix": true,
"string-quotes": "double",
"value-keyword-case": "lower",
"value-list-comma-newline-after": "never-multi-line",
"value-list-comma-newline-before": "never-multi-line",
"value-list-comma-space-after": "always",
"value-no-vendor-prefix": true,
},
}
2 changes: 0 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
"css.lint.unknownProperties": "ignore",
"css.lint.vendorPrefix": "ignore",
"css.lint.zeroUnits": "error",
"html.suggest.angular1": false,
"html.suggest.ionic": false,
"php.suggest.basic": false
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ To fix the dropdown menus and modals you can add the following to the footer:
```html
<!--[if gte IE 9]><!-->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
<!--<![endif]-->
<!--[if IE 9]>
<script src="https://cdn.jsdelivr.net/gh/coliff/bootstrap-ie8/js/bootstrap-ie9.min.js"></script>
<![endif]-->
<!--[if lte IE 8]>
<script src="https://code.jquery.com/jquery-1.12.4.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/coliff/bootstrap-ie8/js/bootstrap-ie8.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.js"></script>
<![endif]-->
```

Expand Down
6 changes: 4 additions & 2 deletions css/bootstrap-ie8.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Bootstrap 4 for IE8 - v4.2.1 */
/*! Bootstrap 4 for IE8 - v4.3.1 */
/*! https://github.com/coliff/bootstrap-ie8/ */

* {
Expand Down Expand Up @@ -1200,7 +1200,9 @@ fieldset[disabled] .btn {
.col-xl-10,
.col-xl-11,
.col-xl-12,
.nav-link {
.nav-link,
.list-group-horizontal,
.list-group-horizontal .list-group-item {
float: left;
}

Expand Down
7 changes: 5 additions & 2 deletions css/bootstrap-ie9.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Bootstrap 4 for IE8 - v4.2.1 */
/*! Bootstrap 4 for IE8 - v4.3.1 */
/*! https://github.com/coliff/bootstrap-ie8 */

.card-group .card,
Expand Down Expand Up @@ -62,7 +62,9 @@
.col-xl-10,
.col-xl-11,
.col-xl-12,
.nav-link {
.nav-link,
.list-group-horizontal,
.list-group-horizontal .list-group-item {
float: left;
}
.row,
Expand All @@ -76,6 +78,7 @@ aside,
.navbar-collapse {
display: block;
}

.modal.fade .modal-dialog {
-ms-transform: translate(0, -25%);
}
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-ie8.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Bootstrap 4 for IE8 - v4.2.1 */
/* Bootstrap 4 for IE8 - v4.3.1 */
/* https://github.com/coliff/bootstrap-ie8 */

// create the nodeType constants if the Node object is not defined
Expand Down
2 changes: 1 addition & 1 deletion js/bootstrap-ie9.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Bootstrap 4 for IE9 - v4.2.1 */
/* Bootstrap 4 for IE9 - v4.3.1 */
/* https://github.com/coliff/bootstrap-ie8 */

// adds classList support (as Array) to Element.prototype for IE8-9
Expand Down
Loading

0 comments on commit 57aa730

Please sign in to comment.