Skip to content

Commit e9d0ba4

Browse files
author
alexander janet
committed
fix(merge): resolv conflict.
2 parents 237f2d4 + 09afbfd commit e9d0ba4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1630
-829
lines changed

‎.babelrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.npmignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@ sonar-project.properties
33
.gitlab-ci.yml
44
internals
55
.babelrc
6+
babel.ext.json
7+
babel.config.json
68
.editorconfig
79
.eslintignore
810
bundle-stats.html
911
CODE_OF_CONDUCT.md
12+
CONTRIBUTING.md
13+
CHANGELOG.md
14+
README.md
1015
declination.json
1116
rollup.config.js
1217
/styleguide.config.js

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dist: trusty
55
# Blocklist
66
branches:
77
except:
8-
- gh-pages # will be deployed to, no need to build it
8+
- gh-pages
99

1010
cache:
1111
directories:
@@ -53,11 +53,11 @@ jobs:
5353
organization: $(echo $TRAVIS_REPO_SLUG | awk -F '/' '{print $1}')
5454
script:
5555
- npm run test
56-
- sonar-scanner -Dsonar.projectVersion=${SONAR_VERSION}
56+
- if [[ "$TRAVIS_BRANCH" != greenkeeper* ]]; then sonar-scanner -Dsonar.projectVersion=${SONAR_VERSION}; fi
5757

5858
# Job: Release
5959
- stage: release
60-
if: branch = master
60+
if: branch = master AND type = push AND fork = false
6161
node_js:
6262
- 'lts/*'
6363
skip_cleanup: true
@@ -66,7 +66,7 @@ jobs:
6666

6767
# Job: Page
6868
- stage: deploy
69-
if: branch = master
69+
if: branch = master AND type = push AND fork = false
7070
node_js:
7171
- 'lts/*'
7272
script:

‎CHANGELOG.md

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,97 @@
1+
## [2.0.5](https://github.com/bootstrap-styled/css-mixins/compare/v2.0.4...v2.0.5) (2019-01-03)
2+
3+
4+
### Bug Fixes
5+
6+
* **button:** using background instead of background for linear-gradient used within buttons ([fde55e6](https://github.com/bootstrap-styled/css-mixins/commit/fde55e6))
7+
8+
## [2.0.4](https://github.com/bootstrap-styled/css-mixins/compare/v2.0.3...v2.0.4) (2019-01-03)
9+
10+
11+
### Bug Fixes
12+
13+
* **button:** fixed linear-gradient values ([c0b640c](https://github.com/bootstrap-styled/css-mixins/commit/c0b640c))
14+
* **dependencies:** upgrade all dependencies ([8e58fb9](https://github.com/bootstrap-styled/css-mixins/commit/8e58fb9))
15+
16+
## [2.0.3](https://github.com/bootstrap-styled/css-mixins/compare/v2.0.2...v2.0.3) (2018-12-21)
17+
18+
19+
### Bug Fixes
20+
21+
* **grid:** fix grid having wrong css for col-* ([b6b0f94](https://github.com/bootstrap-styled/css-mixins/commit/b6b0f94))
22+
23+
## [2.0.2](https://github.com/bootstrap-styled/css-mixins/compare/v2.0.1...v2.0.2) (2018-12-21)
24+
25+
26+
### Bug Fixes
27+
28+
* **hover:** added .active, .focus class to hover mixins. Improve many test without immutable ([2344363](https://github.com/bootstrap-styled/css-mixins/commit/2344363))
29+
30+
## [2.0.1](https://github.com/bootstrap-styled/css-mixins/compare/v2.0.0...v2.0.1) (2018-12-20)
31+
32+
33+
### Bug Fixes
34+
35+
* **grid:** fix grid framework ([4968348](https://github.com/bootstrap-styled/css-mixins/commit/4968348))
36+
37+
# [2.0.0](https://github.com/bootstrap-styled/css-mixins/compare/v1.3.3...v2.0.0) (2018-12-20)
38+
39+
40+
### Bug Fixes
41+
42+
* **grid:** Update grid breakpoint to reflect v4.1.3 of bootstrap v4 ([37ae5c9](https://github.com/bootstrap-styled/css-mixins/commit/37ae5c9)), closes [#16](https://github.com/bootstrap-styled/css-mixins/issues/16)
43+
* **grid:** Update grid breakpoint to reflect v4.1.3 of bootstrap v4 ([830912f](https://github.com/bootstrap-styled/css-mixins/commit/830912f)), closes [#16](https://github.com/bootstrap-styled/css-mixins/issues/16)
44+
45+
46+
### BREAKING CHANGES
47+
48+
* **grid:** `$grid-gutter-widths` was replaced with `$grid-gutter-width`. `pull` and `push`
49+
modified have been modified with `order-$infix-$i` and `order-$infix-last` according to
50+
https://getbootstrap.com/docs/4.1/layout/grid/#order-classes
51+
52+
## [1.3.3](https://github.com/bootstrap-styled/css-mixins/compare/v1.3.2...v1.3.3) (2018-12-18)
53+
54+
55+
### Bug Fixes
56+
57+
* **makeContainer:** respect the makeContainer https://github.com/twbs/bootstrap/blob/502b6c8ed6088fa99192f3068b22457fb57af67d/scss/mixins/_grid.scss#L8 and does not add position: relative to <Col /> by default ([7a61d83](https://github.com/bootstrap-styled/css-mixins/commit/7a61d83)), closes [/github.com/twbs/bootstrap/blob/502b6c8ed6088fa99192f3068b22457fb57af67d/scss/mixins/_grid.scss#L8](https://github.com//github.com/twbs/bootstrap/blob/502b6c8ed6088fa99192f3068b22457fb57af67d/scss/mixins/_grid.scss/issues/L8)
58+
59+
## [1.3.2](https://github.com/bootstrap-styled/css-mixins/compare/v1.3.1...v1.3.2) (2018-12-18)
60+
61+
62+
### Bug Fixes
63+
64+
* **button:** fix some css from https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_buttons.scss#L17 for https://github.com/bootstrap-styled/bootstrap-styled/issues/50 ([fae688f](https://github.com/bootstrap-styled/css-mixins/commit/fae688f)), closes [/github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_buttons.scss#L17](https://github.com//github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_buttons.scss/issues/L17)
65+
66+
## [1.3.1](https://github.com/bootstrap-styled/css-mixins/compare/v1.3.0...v1.3.1) (2018-12-16)
67+
68+
69+
### Bug Fixes
70+
71+
* **greenkeeper:** fix sonar running on greenkeeper test ([ce21fda](https://github.com/bootstrap-styled/css-mixins/commit/ce21fda))
72+
73+
# [1.3.0](https://github.com/bootstrap-styled/css-mixins/compare/v1.2.0...v1.3.0) (2018-12-16)
74+
75+
76+
### Features
77+
78+
* **rollup:** updated rollup and added greenkeeper ([6d513fb](https://github.com/bootstrap-styled/css-mixins/commit/6d513fb))
79+
80+
# [1.2.0](https://github.com/bootstrap-styled/css-mixins/compare/v1.1.2...v1.2.0) (2018-12-07)
81+
82+
83+
### Features
84+
85+
* **babel:** upgrade to babel 7, upgrade many dependencies, using [@bootstrap-styled](https://github.com/bootstrap-styled)/color ([a16fabe](https://github.com/bootstrap-styled/css-mixins/commit/a16fabe))
86+
87+
## [1.1.2](https://github.com/bootstrap-styled/css-mixins/compare/v1.1.1...v1.1.2) (2018-12-05)
88+
89+
90+
### Bug Fixes
91+
92+
* **documentation:** added new doc dependencies and improved documentation. ([aae9ee3](https://github.com/bootstrap-styled/css-mixins/commit/aae9ee3))
93+
* **documentation:** corrected typo in introduction ribbon. ([8a14b7c](https://github.com/bootstrap-styled/css-mixins/commit/8a14b7c))
94+
195
## [1.1.1](https://github.com/bootstrap-styled/css-mixins/compare/v1.1.0...v1.1.1) (2018-12-03)
296

397

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
[![Build Status](https://travis-ci.org/bootstrap-styled/css-mixins.svg?branch=master)](https://travis-ci.org/bootstrap-styled/css-mixins) [![npm Version](https://img.shields.io/npm/v/@bootstrap-styled/css-mixins.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-mixins) [![License](https://img.shields.io/npm/l/@bootstrap-styled/css-mixins.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-mixins) [![NPM monthly downloads](https://img.shields.io/npm/dm/@bootstrap-styled/css-mixins.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/css-mixins) [![NPM total downloads](https://img.shields.io/npm/dt/@bootstrap-styled/css-mixins.svg?style=flat)](https://npmjs.org/package/@bootstrap-styled/css-mixins) [![npm Version](https://img.shields.io/node/v/@bootstrap-styled/css-mixins.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-mixins) [![Module formats](https://img.shields.io/badge/module%20formats-umd%2C%20cjs%2C%20esm-green.svg?style=flat)](https://www.npmjs.com/package/@bootstrap-styled/css-mixins)
44
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.css-mixins&metric=coverage)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.css-mixins) [![Quality gate status](https://sonarcloud.io/api/project_badges/measure?project=com.github.bootstrap-styled.css-mixins&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.github.bootstrap-styled.css-mixins)
5+
[![gitter](https://badges.gitter.im/bootstrap-styled/bootstrap-styled.svg)](https://gitter.im/bootstrap-styled)
6+
[![Greenkeeper badge](https://badges.greenkeeper.io/bootstrap-styled/css-mixins.svg)](https://greenkeeper.io/)
57

68
Bootstrap mixins and utilities in javascript for bootstrap-styled.
79

8-
910
## Table of Contents
1011

1112
- [Documentation](#documentation)

‎babel.config.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
module.exports = {
2+
only: [
3+
'src',
4+
'styleguide',
5+
],
6+
presets: [
7+
[
8+
'@babel/preset-env',
9+
{
10+
modules: false,
11+
},
12+
],
13+
],
14+
plugins: [
15+
'@babel/plugin-syntax-dynamic-import',
16+
'@babel/plugin-syntax-import-meta',
17+
'@babel/plugin-proposal-class-properties',
18+
'@babel/plugin-proposal-json-strings',
19+
[
20+
'@babel/plugin-proposal-decorators',
21+
{
22+
legacy: true,
23+
},
24+
],
25+
],
26+
env: {
27+
production: {
28+
plugins: [
29+
'add-module-exports',
30+
'@babel/plugin-transform-modules-commonjs',
31+
],
32+
},
33+
test: {
34+
plugins: [
35+
'@babel/plugin-transform-modules-commonjs',
36+
'dynamic-import-node',
37+
],
38+
},
39+
},
40+
};

‎babel.ext.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": [],
3+
"plugins": [
4+
"babel-plugin-array-includes"
5+
]
6+
}

‎docs/componentSpecific/a.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Basic css for Anchor component.
1010
- `$linkDecoration` **[string][1]** (optional, default `defaultProps['$link-decoration']`)
1111
- `$linkHoverColor` **[string][1]** (optional, default `defaultProps['$link-hover-color']`)
1212
- `$linkHoverDecoration` **[string][1]** (optional, default `defaultProps['$link-hover-decoration']`)
13-
- `$enableHoverMediaQuery` **[string][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
13+
- `$enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
1414

1515
Returns **[string][1]**
1616

‎docs/componentSpecific/list-group.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,48 @@ Basic css helper for different colored ListGroupItem components.
66

77
### Parameters
88

9-
- `enableHoverMediaQuery` **bool** (optional, default `defaultProps['$enable-hover-media-query']`)
10-
- `state` **[string][1]**
11-
- `background` **[string][1]**
12-
- `listColor` **[string][1]**
9+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
10+
- `state` **[string][2]**
11+
- `background` **[string][2]**
12+
- `listColor` **[string][2]**
1313

14-
Returns **[string][1]**
14+
Returns **[string][2]**
1515

1616
## hover
1717

1818
### Parameters
1919

20-
- `content` **[string][1]**
20+
- `content` **[string][2]**
2121

22-
Returns **[string][1]**
22+
Returns **[string][2]**
2323

2424
## hoverFocus
2525

2626
### Parameters
2727

28-
- `enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
29-
- `content` **[string][1]**
28+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
29+
- `content` **[string][2]**
3030

31-
Returns **[string][1]**
31+
Returns **[string][2]**
3232

3333
## plainHoverFocus
3434

3535
### Parameters
3636

37-
- `enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
38-
- `content` **[string][1]**
37+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
38+
- `content` **[string][2]**
3939

40-
Returns **[string][1]**
40+
Returns **[string][2]**
4141

4242
## hoverFocusActive
4343

4444
### Parameters
4545

46-
- `enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
47-
- `content` **[string][1]**
46+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
47+
- `content` **[string][2]**
4848

49-
Returns **[string][1]**
49+
Returns **[string][2]**
5050

51-
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
51+
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
5252

53-
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
53+
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String

‎docs/cssHelpers/background-variant.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,47 +6,47 @@ Css helper for component backgrounds.
66

77
### Parameters
88

9-
- `enableHoverMediaQuery` **bool** Toggles hovering coloring if anchor is present. (optional, default `defaultProps['$enable-hover-media-query']`)
10-
- `selector` **[string][1]**
11-
- `bgColor` **[string][1]**
9+
- `enableHoverMediaQuery` **[boolean][1]** Toggles hovering coloring if anchor is present. (optional, default `defaultProps['$enable-hover-media-query']`)
10+
- `selector` **[string][2]**
11+
- `bgColor` **[string][2]**
1212

13-
Returns **[string][1]**
13+
Returns **[string][2]**
1414

1515
## hover
1616

1717
### Parameters
1818

19-
- `content` **[string][1]**
19+
- `content` **[string][2]**
2020

21-
Returns **[string][1]**
21+
Returns **[string][2]**
2222

2323
## hoverFocus
2424

2525
### Parameters
2626

27-
- `enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
28-
- `content` **[string][1]**
27+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
28+
- `content` **[string][2]**
2929

30-
Returns **[string][1]**
30+
Returns **[string][2]**
3131

3232
## plainHoverFocus
3333

3434
### Parameters
3535

36-
- `enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
37-
- `content` **[string][1]**
36+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
37+
- `content` **[string][2]**
3838

39-
Returns **[string][1]**
39+
Returns **[string][2]**
4040

4141
## hoverFocusActive
4242

4343
### Parameters
4444

45-
- `enableHoverMediaQuery` **[boolean][2]** (optional, default `defaultProps['$enable-hover-media-query']`)
46-
- `content` **[string][1]**
45+
- `enableHoverMediaQuery` **[boolean][1]** (optional, default `defaultProps['$enable-hover-media-query']`)
46+
- `content` **[string][2]**
4747

48-
Returns **[string][1]**
48+
Returns **[string][2]**
4949

50-
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
50+
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
5151

52-
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
52+
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String

0 commit comments

Comments
 (0)