Skip to content

Commit 65d488c

Browse files
authored
Merge pull request #71 from open-tux/feature/upgrade-bulma
Upgrade to latest bulma version
2 parents 25743c5 + ec219d6 commit 65d488c

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

blueprints/ember-bulma/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
module.exports = {
33
description: 'Installs Bower and NPM dependencies',
44

5-
normalizeEntityName: function() {
5+
normalizeEntityName() {
66
// this prevents an error when the entityName is
77
// not specified (since that doesn't actually matter
88
// to us
99
},
1010

11-
afterInstall: function() {
11+
afterInstall() {
1212
// NOTE: Currently adding `eslint-plugin-ember-suave` to the consuming app/addon to bypass the following error. This shouldn't be a necessary step:
1313
// Error: Failed to load plugin ember-suave: Cannot find module 'eslint-plugin-ember-suave'
1414
return this.addPackagesToProject(
1515
[
16-
{ name: 'bulma', target: '0.1.2' },
16+
{ name: 'bulma', target: '^0.5.0' },
1717
{ name: 'ember-cli-sass', target: '~6.1.2' },
1818
{ name: 'eslint-plugin-ember-suave', target: '~1.0.0' }
1919
]

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ember-bulma",
33
"dependencies": {
4-
"font-awesome": "~4.5.0",
4+
"font-awesome": "~4.7.0",
55
"prism": "^1.4.1",
66
"highlightjs": "^9.4.0",
77
"code-highlight-linenums": "^0.2.0",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"devDependencies": {
3434
"babel-plugin-transform-decorators-legacy": "^1.3.4",
3535
"broccoli-asset-rev": "^2.4.5",
36-
"bulma": "0.1.2",
36+
"bulma": "^0.5.0",
3737
"ember-ajax": "^3.0.0",
3838
"ember-cli": "~2.14.1",
3939
"ember-cli-content-security-policy": "^0.6.0",

tests/dummy/app/styles/demo.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
$yellow: #fce473;
2+
$control: #b5b5b5;
23

34
.is-green {
45
color: #97cd76;

tests/dummy/config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function(environment) {
66
modulePrefix: 'dummy',
77
environment,
88
rootURL: '/',
9-
locationType: 'hash',
9+
locationType: 'auto',
1010
contentSecurityPolicy: {
1111
'img-src': "'self' data: emberjs.com assets-cdn.github.com",
1212
'style-src': "'self' maxcdn.bootstrapcdn.com",

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,9 +1465,9 @@ builtins@^1.0.3:
14651465
version "1.0.3"
14661466
resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
14671467

1468-
bulma@0.1.2:
1469-
version "0.1.2"
1470-
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.1.2.tgz#2012326d98314d4d3bd57220381b731b593a6d84"
1468+
bulma@^0.5.0:
1469+
version "0.5.0"
1470+
resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.5.0.tgz#09a7932c1c15aa7ef92840f7a50b1bfebbfd5461"
14711471

14721472
bytes@1:
14731473
version "1.0.0"

0 commit comments

Comments
 (0)