Skip to content
This repository was archived by the owner on Jun 3, 2022. It is now read-only.

Commit 4d2ccaa

Browse files
chriscoxchriscox
committed
Merge branch 'release/v0.5.7' into stable
2 parents 707fdd2 + a3d6fe7 commit 4d2ccaa

Some content is hidden

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

51 files changed

+2966
-503
lines changed

‎.editorconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
charset = utf-8
7+
indent_style = space
8+
indent_size = 2
9+
end_of_line = lf
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
[*.md]
14+
insert_final_newline = false
15+
trim_trailing_whitespace = false

‎.lesshintrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"fileExtensions": [".less", ".css"],
3+
"idSelector": false,
4+
"importantRule": false,
5+
"zeroUnit": false
6+
}

‎CHANGELOG.md‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
1+
## 0.5.7
2+
3+
* [Updates webpack configuration.](https://github.com/material-foundation/material-remixer-js/commit/fffca3cf29960defe0b280cbe60f37308dc1aaf5)
4+
* [Adds variable `constraintType` and updates `dataType`.](https://github.com/material-foundation/material-remixer-js/commit/b4be6daf176cf0f36a6fa9e32e94edbd6703d70a)
5+
* [Renames possibleValues to limitedToValues.](https://github.com/material-foundation/material-remixer-js/commit/c795fd8533f4ae5f85a1b1b857a70dfc59e6890f)
6+
* [Adds variable `controlType` property.](https://github.com/material-foundation/material-remixer-js/commit/83e326d8fbb947abfd59f5421b2ac0d43713659c)
7+
* [Adds clone tests and updates `dataType` tests for variables.](https://github.com/material-foundation/material-remixer-js/commit/8949d8d33d25f41ad45c70c7e1b8289ebe7664fa)
8+
* [Converts colors to rgba during serialization.](https://github.com/material-foundation/material-remixer-js/commit/40f673f5057776681e0fdee1db903cf789b6de2d)
9+
10+
## 0.5.6
11+
12+
* [Adds editorconfig file.](https://github.com/material-foundation/material-remixer-js/commit/6925701f3a7c05cc2b0ac174331a1fd1d8539dd7)
13+
* [Adds tests for UI control classes.](https://github.com/material-foundation/material-remixer-js/commit/45b343608515871053382dfa6d0a8876d82374a5)
14+
15+
## 0.5.5
16+
17+
* [Renames to material-remxer-js.](https://github.com/material-foundation/material-remixer-js/commit/6bcebcdbc2bed6b8a8bac62a32f4d6f2fe8f9d93)
18+
* Adds codecov.
19+
20+
## 0.5.4
21+
22+
* [Adds `lesshint` CSS/LESS linter.](https://github.com/material-foundation/material-remixer-js/commit/c86ffdec4f8a3796abd94b18d095e4f00b874cea)
23+
24+
## 0.5.3
25+
26+
* [Updates per tslint core rules.](https://github.com/material-foundation/material-remixer-js/commit/94e39ac7ae54d9d2549281558cf5160861b7386b)
27+
* [Adds additional tests for `Remixer` and `LocalStorage`](https://github.com/material-foundation/material-remixer-js/commit/3925ac91914cf1ea85c34f4aa2fd284c71c9aac3).
28+
129
## 0.5.2
230

3-
Replaces gulp with NPM scripts.
31+
* [Replaces gulp with NPM scripts.](https://github.com/material-foundation/material-remixer-js/commit/e3f97595016236cb24a60071ad8d41819590b52a)
432

533
## 0.5.1
634

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
![remixer](https://cdn.rawgit.com/material-foundation/material-remixer/master/docs/assets/lockup_remixer_icon_horizontal_dark_small.svg)
1+
![remixer](https://cdn.rawgit.com/material-foundation/material-remixer-js/develop/docs/assets/lockup_remixer_for_web.svg)
22

3-
[![Build Status](https://travis-ci.org/material-foundation/material-remixer-web.svg?branch=develop)](https://travis-ci.org/material-foundation/material-remixer-web) [![codecov](https://codecov.io/gh/material-foundation/material-remixer-web/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-foundation/material-remixer-web) [![npm version](https://badge.fury.io/js/material-remixer.svg)](https://badge.fury.io/js/material-remixer)
3+
[![Build Status](https://travis-ci.org/material-foundation/material-remixer-js.svg?branch=develop)](https://travis-ci.org/material-foundation/material-remixer-js) [![codecov](https://codecov.io/gh/material-foundation/material-remixer-js/branch/develop/graph/badge.svg)](https://codecov.io/gh/material-foundation/material-remixer-js) [![npm version](https://badge.fury.io/js/material-remixer.svg)](https://badge.fury.io/js/material-remixer)
44

55
Remixer helps teams use and refine design specs by providing an abstraction for these values that is accessible and configurable from both inside and outside the app itself.
66

@@ -64,8 +64,8 @@ Yes, the [material-foundation](https://github.com/material-foundation) organizat
6464

6565
## Contributing
6666

67-
We gladly welcome contributions! If you have found a bug, have questions, or wish to contribute, please follow our [Contributing Guidelines](https://github.com/material-foundation/material-remixer-web/blob/develop/CONTRIBUTING.md).
67+
We gladly welcome contributions! If you have found a bug, have questions, or wish to contribute, please follow our [Contributing Guidelines](https://github.com/material-foundation/material-remixer-js/blob/develop/CONTRIBUTING.md).
6868

6969
## License
7070

71-
© Google, 2016. Licensed under an [Apache-2](https://github.com/material-foundation/material-remixer-web/blob/develop/LICENSE) license.
71+
© Google, 2016. Licensed under an [Apache-2](https://github.com/material-foundation/material-remixer-js/blob/develop/LICENSE) license.

‎docs/assets/lockup_remixer_for_web.svg‎

Lines changed: 80 additions & 0 deletions
Loading

‎examples/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<script src="./node_modules/material-design-lite/material.min.js"></script>
2727

2828
<!-- Remixer -->
29-
<script src="./node_modules/material-remixer/dist/remixer.js"></script>
29+
<script src="/assets/remixer.js"></script>
3030

3131
</head>
3232

‎examples/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
"author": "The Material Remixer Authors (see AUTHORS)",
66
"license": "Apache-2.0",
77
"scripts": {
8-
"start": "$( yarn bin )/http-server -o"
8+
"start": "webpack-dev-server --open"
99
},
1010
"devDependencies": {
11-
"http-server": "^0.9.0"
11+
"webpack": "^2.2.0-rc.3",
12+
"webpack-dev-server": "^2.2.0-rc.0"
1213
},
1314
"dependencies": {
1415
"material-design-lite": "^1.2.1",

‎examples/styles.css‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
* under the License.
1515
*/
1616

17-
.page-content { padding: 40px; }
17+
.page-content {
18+
padding: 40px;
19+
}
1820

1921
#box {
20-
width: 200px;
21-
height: 200px;
22-
background-color: lightGray;
22+
background-color: lightGray;
23+
height: 200px;
24+
width: 200px;
2325
}

‎examples/webpack.config.js‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/** @license
2+
* Copyright 2016 Google Inc. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy
6+
* of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations
14+
* under the License.
15+
*/
16+
17+
'use strict';
18+
19+
module.exports = {
20+
entry: {
21+
remixer: './node_modules/material-remixer/dist/remixer.js',
22+
overlay: './node_modules/material-remixer/dist/overlay.js',
23+
},
24+
output: {
25+
publicPath: '/assets/',
26+
filename: '[name].js',
27+
libraryTarget: 'umd',
28+
umdNamedDefine: true
29+
},
30+
performance: {
31+
hints: false
32+
},
33+
};

0 commit comments

Comments
 (0)