Skip to content

Commit

Permalink
* Replaced .mui-textfield--invalid with .mui--is-invalid
Browse files Browse the repository at this point in the history
* Replaced .mui--text-black-{XX}, .mui--text-white-{XX} color helpers with:
  * .mui--text-dark
  * .mui--text-dark-secondary
  * .mui--text-dark-hint
  * .mui--text-light
  * .mui--text-light-secondary
  * .mui--text-light-hint
  * .mui--text-accent
  * .mui--text-accent-secondary
  * .mui--text-accent-hint
* Major modifications to React library
  • Loading branch information
amorey committed Jan 19, 2016
1 parent a4db8df commit b6c7d54
Show file tree
Hide file tree
Showing 198 changed files with 63,916 additions and 4,954 deletions.
4 changes: 4 additions & 0 deletions .babelrc
@@ -0,0 +1,4 @@
{
presets: ['es2015', 'stage-0', 'react'],
plugins: ['add-module-exports']
}
13 changes: 11 additions & 2 deletions .travis.yml
@@ -1,4 +1,13 @@
env:
- CXX=g++-4.8
language: node_js
node_js:
- "0.12"

- "5.3.0"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- g++-4.8
script: npm test
15 changes: 15 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,20 @@
# MUI Changelog

## 0.3.0-rc1 (IN PROGRESS)

* Replaced .mui-textfield--invalid with .mui--is-invalid
* Replaced .mui--text-black-{XX}, .mui--text-white-{XX} color helpers with:
* .mui--text-dark
* .mui--text-dark-secondary
* .mui--text-dark-hint
* .mui--text-light
* .mui--text-light-secondary
* .mui--text-light-hint
* .mui--text-accent
* .mui--text-accent-secondary
* .mui--text-accent-hint
* Major modifications to React library

## 0.2.10 - January 12, 2015

* Fixed bug causing mui.overlay('off') to throw error when called before
Expand Down
46 changes: 32 additions & 14 deletions README.md
Expand Up @@ -23,6 +23,14 @@ Or for development you can use the latest:
<script src="//cdn.muicss.com/mui-latest/js/mui.min.js"></script>
```

**Install with NPM:**

```shell
$ npm install --save-dev muicss
```

Read more: https://www.npmjs.com/package/muicss

**Install with Bower:**

```shell
Expand Down Expand Up @@ -75,7 +83,7 @@ MUI is tested and works in:
1. Build examples

```bash
$ ./node_modules/.bin/gulp build-examples
$ ./node_modules/.bin/gulp examples:build
```

To view the examples you can use any static file server. To use the nodejs `http-server` module:
Expand All @@ -87,41 +95,35 @@ MUI is tested and works in:

Then visit http://localhost:3000/examples

1. Watch changes and re-build

```bash
$ ./node_modules/.bin/gulp watch
```

## Run tests

### Unit tests

To run the unit tests from the command line, run 'mocha':
To run the unit tests from the command line, run 'npm test':

```bash
$ ./node_modules/.bin/mocha
$ npm test
```

### E2E tests

To run the E2E tests first compile the unit test files into a version that runs in the browser:

```bash
$ ./node_modules/.bin/gulp build-e2e-tests
$ ./node_modules/.bin/gulp e2e-tests:build
```

Then visit http://localhost:3000/e2e-tests

## Create a production build
## Build Packages

To create a production build of the app, run `gulp build-dist`:
### CDN

```bash
$ ./node_modules/.bin/gulp build-dist
$ ./node_modules/.bin/gulp cdn:build
```

The build will be located in the `dist` directory:
The build will be located in the `packages/cdn/dist` directory:

<pre>
dist/
Expand All @@ -145,3 +147,19 @@ dist/
├── mui-combined.js
└── mui-react-combined.js
</pre>

### NPM

```bash
$ ./node_modules/.bin/gulp npm:build
```

The NPM package is located in the `packages/npm` directory.

### Meteor

```bash
$ ./node_modules/.bin/gulp meteor:build
```

The Meteor package is located in the `packages/meteor` directory.
10 changes: 7 additions & 3 deletions RELEASE.md
@@ -1,9 +1,9 @@
# Release Instructions

1. Build distribution
1. Build packages

```bash
$ ./node_modules/.bin/gulp build-dist
$ ./node_modules/.bin/gulp
```

1. Add release notes to CHANGELOG.md
Expand All @@ -12,7 +12,9 @@

1. Change version number in bower.json

1. Change version number in package.js
1. Change version number in packages/meteor/package.js

1. Change version number in packages/npm/package.json

1. Change version number in README.md

Expand All @@ -29,11 +31,13 @@
1. Push changes to NPM

```bash
$ cd packages/npm
$ npm publish
```

1. Update package on Meteor repository

```bash
$ cd packages/npm
$ meteor publish
```
2 changes: 2 additions & 0 deletions bower.json
Expand Up @@ -27,11 +27,13 @@
},
"ignore": [
"**/.*",
"build-targets",
"e2e-tests",
"examples",
"gulpfile.js",
"node_modules",
"package.json",
"packages",
"test"
]
}
4 changes: 2 additions & 2 deletions src/js/mui-combined.js → build-targets/cdn-js-combined.js
Expand Up @@ -7,11 +7,11 @@
if (win._muiCombinedLoadedJS) return;
else win._muiCombinedLoadedJS = true;

var util = require('./lib/util.js');
var util = require('src/js/lib/util');

// load css
util.loadStyle(require('mui.min.css'));

// load js
require('./mui.js');
require('./cdn-js');
})(window);
15 changes: 7 additions & 8 deletions src/js/mui.js → build-targets/cdn-js.js
Expand Up @@ -11,14 +11,13 @@
else win._muiLoadedJS = true;

// load dependencies
var jqLite = require('./lib/jqLite.js'),
util = require('./lib/util.js'),
textfield = require('./forms/textfield.js'),
select = require('./forms/select.js'),
ripple = require('./ripple.js'),
dropdowns = require('./dropdowns.js'),
tabs = require('./tabs.js'),
overlay = require('./overlay.js');
var jqLite = require('src/js/lib/jqLite'),
textfield = require('src/js/forms/textfield'),
select = require('src/js/forms/select'),
ripple = require('src/js/ripple'),
dropdowns = require('src/js/dropdowns'),
tabs = require('src/js/tabs'),
overlay = require('src/js/overlay');

// expose api
win.mui = {
Expand Down
Expand Up @@ -7,11 +7,11 @@
if (win._muiReactCombinedLoaded) return;
else win._muiReactCombinedLoaded = true;

var util = require('../js/lib/util.js');
var util = require('src/js/lib/util');

// load css
util.loadStyle(require('mui.min.css'));

// load js
require('./mui.js');
})(window);
require('./cdn-react');
})(window);
34 changes: 34 additions & 0 deletions build-targets/cdn-react.js
@@ -0,0 +1,34 @@
/**
* MUI React main module
* @module react/main
*/

(function(win) {
// return if library has been loaded already
if (win._muiReactLoaded) return;
else win._muiReactLoaded = true;

var mui = win.mui = win.mui || [],
react = mui.react = {},
lib;

react.Appbar = require('src/react/appbar');
react.Button = require('src/react/button');
react.Caret = require('src/react/caret');
react.Checkbox = require('src/react/checkbox');
react.Col = require('src/react/col');
react.Container = require('src/react/container');
react.Divider = require('src/react/divider');
react.Dropdown = require('src/react/dropdown'),
react.DropdownItem = require('src/react/dropdown-item'),
react.Form = require('src/react/form');
react.Panel = require('src/react/panel');
react.Radio = require('src/react/radio');
react.Row = require('src/react/row');
react.Select = require('src/react/select');
react.SelectItem = require('src/react/select-item');
react.Tab = require('src/react/tab');
react.Tabs = require('src/react/tabs');
react.TextInput = require('src/react/text-input');
react.TextareaInput = require('src/react/textarea-input');
})(window);
Expand Up @@ -14,8 +14,8 @@
}

// imports
var buttons = require('./buttons.js'),
forms = require('./forms.js');
var buttons = require('src/webcomponents/buttons'),
forms = require('src/webcomponents/forms');

// init
buttons.registerElements();
Expand Down
12 changes: 12 additions & 0 deletions build-targets/e2e-tests.js
@@ -0,0 +1,12 @@
(function() {
require('../test/cssjs-tests/test-jqlite');
require('../test/cssjs-tests/test-util');
require('../test/react-tests/test-appbar');
require('../test/react-tests/test-button');
require('../test/react-tests/test-caret');
require('../test/react-tests/test-checkbox');
require('../test/react-tests/test-container');
require('../test/react-tests/test-divider');
require('../test/react-tests/test-dropdown');
require('../test/react-tests/test-panel');
})();
2 changes: 0 additions & 2 deletions dist/extra/mui-combined.js

This file was deleted.

2 changes: 0 additions & 2 deletions dist/extra/mui-react-combined.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/js/mui.min.js

This file was deleted.

0 comments on commit b6c7d54

Please sign in to comment.