Merge pull request #24 from bootstrap-styled/dev

Dev

Author: kopax

.travis.yml

@@ -7,10 +7,6 @@ branches:
   except:
   - gh-pages # will be deployed to, no need to build it
 
-cache:
-  directories:
-  - node_modules
-
 before_install:
 - npm install -g npm
 # const
@@ -57,7 +53,7 @@ jobs:
 
   # Job: Release
   - stage: release
-    if: branch = master
+    if: branch = master AND type = push AND fork = false
     node_js:
     - 'lts/*'
     skip_cleanup: true
@@ -66,7 +62,7 @@ jobs:
 
   # Job: Page
   - stage: deploy
-    if: branch = master
+    if: branch = master AND type = push AND fork = false
     node_js:
     - 'lts/*'
     script:

package.json

@@ -223,11 +223,11 @@
     "lint-staged"
   ],
   "dependencies": {
-    "bootstrap-styled": "^2.0.3",
-    "@bootstrap-styled/v4": "^1.2.2",
+    "bootstrap-styled": "^2.1.0",
+    "@bootstrap-styled/v4": "^1.2.6",
     "@bootstrap-styled/css-mixins": "^1.1.0",
     "@bootstrap-styled/css-utils": "^1.1.0",
-    "@bootstrap-styled/provider": "^1.2.0",
+    "@bootstrap-styled/provider": "^1.3.0",
     "@bootstrap-styled/utils": "1.6.1",
     "classnames": "^2.2.5",
     "lodash.omit": "^4.5.0",

src/NavigationBar/tests/theme.test.js

@@ -15,7 +15,7 @@ describe('makeTheme', () => {
   });
   it('should create scope', () => {
     const customTheme = {
-      '$zindex-overlay': '2050',
+      navigationBar: { '$zindex-overlay': '2050' },
     };
     expect(typeof makeTheme(customTheme).navigationBar).toEqual('object');
   });

src/NavigationBar/theme.js

@@ -1,16 +1,15 @@
-import { makeScopedTheme, toMakeScopedTheme } from 'bootstrap-styled/lib/utils';
+import { makeScopedTheme, toMakeTheme } from 'bootstrap-styled/lib/utils';
 
-
-const theme = makeScopedTheme({
+const theme = makeScopedTheme('navigationBar', {
   '$zindex-overlay': '2050',
   '$menu-offset-width': '220px',
   '$menu-offset-nav-bg-color': 'white',
   '$menu-offset-nav-box-shadow': 'rgba(0, 0, 0, 0.156863) 0px 3px 10px, rgba(0, 0, 0, 0.227451) 0px 3px 10px',
   '$menu-offset-nav-transition': '.3s ease',
   '$overlay-bg': 'rgba(0, 0, 0, 0.3)',
 
-}, 'navigationBar');
+});
 
-export const makeTheme = toMakeScopedTheme(theme);
+export const makeTheme = toMakeTheme(theme);
 
 export default theme;

src/NavigationStyleguide/tests/theme.test.js

@@ -11,13 +11,7 @@ describe('makeTheme', () => {
   });
   it('should create custom theme', () => {
     const customTheme = {
-      '$nav-styleguide-height': '50%',
-    };
-    expect(makeThemeNavigation(customTheme).navigationStyleguide['$nav-styleguide-height']).toEqual('50%');
-  });
-  it('should create custom theme', () => {
-    const customTheme = {
-      '$nav-styleguide-height': '50%',
+      navigationStyleguide: { '$nav-styleguide-height': '50%' },
     };
     expect(makeThemeNavigation(customTheme).navigationStyleguide['$nav-styleguide-color']).toEqual('#444444');
     expect(makeThemeNavigation(customTheme).navigationStyleguide['$nav-styleguide-height']).toEqual('50%');

src/NavigationStyleguide/theme.js

@@ -1,6 +1,6 @@
-import { makeScopedTheme, toMakeScopedTheme } from 'bootstrap-styled/lib/utils';
+import { makeScopedTheme, toMakeTheme } from 'bootstrap-styled/lib/utils';
 
-const theme = makeScopedTheme({
+const theme = makeScopedTheme('navigationStyleguide', {
   '$nav-styleguide-height': '100%',
   '$nav-styleguide-color': '#444444',
   '$nav-styleguide-hover-color': '#898989',
@@ -30,8 +30,8 @@ const theme = makeScopedTheme({
     sm: 'center',
     md: 'left',
   },
-}, 'navigationStyleguide');
+});
 
-export const makeTheme = toMakeScopedTheme(theme);
+export const makeTheme = toMakeTheme(theme);
 
 export default theme;