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

Commit

Permalink
Merge branch 'release/v0.5.7' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscox committed Jan 9, 2017
2 parents 707fdd2 + a3d6fe7 commit 4d2ccaa
Show file tree
Hide file tree
Showing 51 changed files with 2,966 additions and 503 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# http://editorconfig.org

root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
insert_final_newline = false
trim_trailing_whitespace = false
6 changes: 6 additions & 0 deletions .lesshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"fileExtensions": [".less", ".css"],
"idSelector": false,
"importantRule": false,
"zeroUnit": false
}
30 changes: 29 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
## 0.5.7

* [Updates webpack configuration.](https://github.com/material-foundation/material-remixer-js/commit/fffca3cf29960defe0b280cbe60f37308dc1aaf5)
* [Adds variable `constraintType` and updates `dataType`.](https://github.com/material-foundation/material-remixer-js/commit/b4be6daf176cf0f36a6fa9e32e94edbd6703d70a)
* [Renames possibleValues to limitedToValues.](https://github.com/material-foundation/material-remixer-js/commit/c795fd8533f4ae5f85a1b1b857a70dfc59e6890f)
* [Adds variable `controlType` property.](https://github.com/material-foundation/material-remixer-js/commit/83e326d8fbb947abfd59f5421b2ac0d43713659c)
* [Adds clone tests and updates `dataType` tests for variables.](https://github.com/material-foundation/material-remixer-js/commit/8949d8d33d25f41ad45c70c7e1b8289ebe7664fa)
* [Converts colors to rgba during serialization.](https://github.com/material-foundation/material-remixer-js/commit/40f673f5057776681e0fdee1db903cf789b6de2d)

## 0.5.6

* [Adds editorconfig file.](https://github.com/material-foundation/material-remixer-js/commit/6925701f3a7c05cc2b0ac174331a1fd1d8539dd7)
* [Adds tests for UI control classes.](https://github.com/material-foundation/material-remixer-js/commit/45b343608515871053382dfa6d0a8876d82374a5)

## 0.5.5

* [Renames to material-remxer-js.](https://github.com/material-foundation/material-remixer-js/commit/6bcebcdbc2bed6b8a8bac62a32f4d6f2fe8f9d93)
* Adds codecov.

## 0.5.4

* [Adds `lesshint` CSS/LESS linter.](https://github.com/material-foundation/material-remixer-js/commit/c86ffdec4f8a3796abd94b18d095e4f00b874cea)

## 0.5.3

* [Updates per tslint core rules.](https://github.com/material-foundation/material-remixer-js/commit/94e39ac7ae54d9d2549281558cf5160861b7386b)
* [Adds additional tests for `Remixer` and `LocalStorage`](https://github.com/material-foundation/material-remixer-js/commit/3925ac91914cf1ea85c34f4aa2fd284c71c9aac3).

## 0.5.2

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

## 0.5.1

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![remixer](https://cdn.rawgit.com/material-foundation/material-remixer/master/docs/assets/lockup_remixer_icon_horizontal_dark_small.svg)
![remixer](https://cdn.rawgit.com/material-foundation/material-remixer-js/develop/docs/assets/lockup_remixer_for_web.svg)

[![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)
[![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)

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.

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

## Contributing

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).
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).

## License

© Google, 2016. Licensed under an [Apache-2](https://github.com/material-foundation/material-remixer-web/blob/develop/LICENSE) license.
© Google, 2016. Licensed under an [Apache-2](https://github.com/material-foundation/material-remixer-js/blob/develop/LICENSE) license.
80 changes: 80 additions & 0 deletions docs/assets/lockup_remixer_for_web.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<script src="./node_modules/material-design-lite/material.min.js"></script>

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

</head>

Expand Down
5 changes: 3 additions & 2 deletions examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
"author": "The Material Remixer Authors (see AUTHORS)",
"license": "Apache-2.0",
"scripts": {
"start": "$( yarn bin )/http-server -o"
"start": "webpack-dev-server --open"
},
"devDependencies": {
"http-server": "^0.9.0"
"webpack": "^2.2.0-rc.3",
"webpack-dev-server": "^2.2.0-rc.0"
},
"dependencies": {
"material-design-lite": "^1.2.1",
Expand Down
10 changes: 6 additions & 4 deletions examples/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
* under the License.
*/

.page-content { padding: 40px; }
.page-content {
padding: 40px;
}

#box {
width: 200px;
height: 200px;
background-color: lightGray;
background-color: lightGray;
height: 200px;
width: 200px;
}
33 changes: 33 additions & 0 deletions examples/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/** @license
* Copyright 2016 Google Inc. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/

'use strict';

module.exports = {
entry: {
remixer: './node_modules/material-remixer/dist/remixer.js',
overlay: './node_modules/material-remixer/dist/overlay.js',
},
output: {
publicPath: '/assets/',
filename: '[name].js',
libraryTarget: 'umd',
umdNamedDefine: true
},
performance: {
hints: false
},
};
Loading

0 comments on commit 4d2ccaa

Please sign in to comment.