diff --git a/docs/gulp/config.js b/docs/gulp/config.js index 1414e5c5fcbdcd..db7551b3b81254 100644 --- a/docs/gulp/config.js +++ b/docs/gulp/config.js @@ -1,6 +1,6 @@ var dest = './build', src = './src' - dist = './dist'; + mui = '../src'; module.exports = { browserSync: { @@ -17,7 +17,7 @@ module.exports = { src: src + '/less/main.less', watch: [ src + '/less/**', - dist + '/less/**' + mui + '/less/**' ], dest: dest }, @@ -26,11 +26,11 @@ module.exports = { dest: dest }, fonts: { - src: dist + 'less/material-design-fonticons/fonts/**', + src: mui + 'less/material-design-fonticons/fonts/**', dest: dest + '/fonts/mdfonticon' }, muiFonts: { - src: dist + '/less/material-ui-icons/fonts/**', + src: mui + '/less/material-ui-icons/fonts/**', dest: dest + '/fonts' }, browserify: { diff --git a/docs/package.json b/docs/package.json index 36cd11ebd46ed1..6a589148d9fb2e 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,23 +4,17 @@ "description": "Documentation site for material-ui", "private": true, "browser": { - "mui": "./dist/index.js", - "hljs": "./src/app/vendor/highlight-js/highlight.pack.js", + "mui": "../src/index.js", "react": "react/addons" }, "browserify": { "transform": [ - "reactify", - "browserify-shim" + "reactify" ] }, - "browserify-shim": { - "hljs": "hljs" - }, "devDependencies": { "browser-sync": "^1.6.5", "browserify": "^6.2.0", - "browserify-shim": "^3.8.0", "gulp": "^3.8.10", "gulp-less": "^1.3.6", "gulp-notify": "^2.0.1", @@ -34,6 +28,7 @@ "watchify": "^2.1.1" }, "dependencies": { + "highlight.js": "^8.3.0", "jquery": "^2.1.1", "react": "^0.12.0", "react-router": "^0.10.2" diff --git a/docs/src/app/components/code-example/code-block.jsx b/docs/src/app/components/code-example/code-block.jsx index cdfc8e0ae04bfc..3dead4c95c5881 100644 --- a/docs/src/app/components/code-example/code-block.jsx +++ b/docs/src/app/components/code-example/code-block.jsx @@ -3,7 +3,7 @@ */ var React = require('react'), - hljs = require('hljs'); + hljs = require('highlight.js'); var CodeBlock = React.createClass({ @@ -25,4 +25,4 @@ var CodeBlock = React.createClass({ }); -module.exports = CodeBlock; \ No newline at end of file +module.exports = CodeBlock; diff --git a/docs/src/less/main.less b/docs/src/less/main.less index 80d80d7bd259f3..593d17fababfa1 100644 --- a/docs/src/less/main.less +++ b/docs/src/less/main.less @@ -1,6 +1,6 @@ /* material-ui */ -@import "../../dist/less/scaffolding.less"; -@import "../../dist/less/components.less"; +@import "../../../src/less/scaffolding.less"; +@import "../../../src/less/components.less"; /* hightlight.js for syntax highlighting */ //@import (less) "monokai_sublime.css"; diff --git a/index.js b/index.js deleted file mode 100644 index 359e10204d3f11..00000000000000 --- a/index.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./docs/dist/index.js'); diff --git a/package.json b/package.json index 3485af12b78140..f4f5766735a0f1 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "material-ui", "author": "Call-em-all Engineering Team", - "version": "0.2.1", + "version": "0.2.2", "description": "Material Design UI components built with React", - "main": "index.js", + "main": "./src/index", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, diff --git a/docs/dist/index.js b/src/index.js similarity index 100% rename from docs/dist/index.js rename to src/index.js diff --git a/docs/dist/js/app-bar.jsx b/src/js/app-bar.jsx similarity index 100% rename from docs/dist/js/app-bar.jsx rename to src/js/app-bar.jsx diff --git a/docs/dist/js/app-canvas.jsx b/src/js/app-canvas.jsx similarity index 100% rename from docs/dist/js/app-canvas.jsx rename to src/js/app-canvas.jsx diff --git a/docs/dist/js/checkbox.jsx b/src/js/checkbox.jsx similarity index 100% rename from docs/dist/js/checkbox.jsx rename to src/js/checkbox.jsx diff --git a/docs/dist/js/dialog.jsx b/src/js/dialog.jsx similarity index 100% rename from docs/dist/js/dialog.jsx rename to src/js/dialog.jsx diff --git a/docs/dist/js/drop-down-icon.jsx b/src/js/drop-down-icon.jsx similarity index 100% rename from docs/dist/js/drop-down-icon.jsx rename to src/js/drop-down-icon.jsx diff --git a/docs/dist/js/drop-down-menu.jsx b/src/js/drop-down-menu.jsx similarity index 100% rename from docs/dist/js/drop-down-menu.jsx rename to src/js/drop-down-menu.jsx diff --git a/docs/dist/js/icon.jsx b/src/js/icon.jsx similarity index 100% rename from docs/dist/js/icon.jsx rename to src/js/icon.jsx diff --git a/docs/dist/js/input.jsx b/src/js/input.jsx similarity index 100% rename from docs/dist/js/input.jsx rename to src/js/input.jsx diff --git a/docs/dist/js/left-nav.jsx b/src/js/left-nav.jsx similarity index 100% rename from docs/dist/js/left-nav.jsx rename to src/js/left-nav.jsx diff --git a/docs/dist/js/menu-item.jsx b/src/js/menu-item.jsx similarity index 100% rename from docs/dist/js/menu-item.jsx rename to src/js/menu-item.jsx diff --git a/docs/dist/js/menu.jsx b/src/js/menu.jsx similarity index 100% rename from docs/dist/js/menu.jsx rename to src/js/menu.jsx diff --git a/docs/dist/js/mixins/classable.js b/src/js/mixins/classable.js similarity index 100% rename from docs/dist/js/mixins/classable.js rename to src/js/mixins/classable.js diff --git a/docs/dist/js/mixins/click-awayable.js b/src/js/mixins/click-awayable.js similarity index 100% rename from docs/dist/js/mixins/click-awayable.js rename to src/js/mixins/click-awayable.js diff --git a/docs/dist/js/paper-button.jsx b/src/js/paper-button.jsx similarity index 100% rename from docs/dist/js/paper-button.jsx rename to src/js/paper-button.jsx diff --git a/docs/dist/js/paper.jsx b/src/js/paper.jsx similarity index 100% rename from docs/dist/js/paper.jsx rename to src/js/paper.jsx diff --git a/docs/dist/js/radio-button.jsx b/src/js/radio-button.jsx similarity index 100% rename from docs/dist/js/radio-button.jsx rename to src/js/radio-button.jsx diff --git a/docs/dist/js/ripple.jsx b/src/js/ripple.jsx similarity index 100% rename from docs/dist/js/ripple.jsx rename to src/js/ripple.jsx diff --git a/docs/dist/js/table-header.jsx b/src/js/table-header.jsx similarity index 100% rename from docs/dist/js/table-header.jsx rename to src/js/table-header.jsx diff --git a/docs/dist/js/table-rows-item.jsx b/src/js/table-rows-item.jsx similarity index 100% rename from docs/dist/js/table-rows-item.jsx rename to src/js/table-rows-item.jsx diff --git a/docs/dist/js/table-rows.jsx b/src/js/table-rows.jsx similarity index 100% rename from docs/dist/js/table-rows.jsx rename to src/js/table-rows.jsx diff --git a/docs/dist/js/toast.jsx b/src/js/toast.jsx similarity index 100% rename from docs/dist/js/toast.jsx rename to src/js/toast.jsx diff --git a/docs/dist/js/toggle.jsx b/src/js/toggle.jsx similarity index 100% rename from docs/dist/js/toggle.jsx rename to src/js/toggle.jsx diff --git a/docs/dist/js/toolbar-group.jsx b/src/js/toolbar-group.jsx similarity index 100% rename from docs/dist/js/toolbar-group.jsx rename to src/js/toolbar-group.jsx diff --git a/docs/dist/js/toolbar.jsx b/src/js/toolbar.jsx similarity index 100% rename from docs/dist/js/toolbar.jsx rename to src/js/toolbar.jsx diff --git a/docs/dist/js/utils/css-event.js b/src/js/utils/css-event.js similarity index 100% rename from docs/dist/js/utils/css-event.js rename to src/js/utils/css-event.js diff --git a/docs/dist/js/utils/key-line.js b/src/js/utils/key-line.js similarity index 100% rename from docs/dist/js/utils/key-line.js rename to src/js/utils/key-line.js diff --git a/docs/dist/less/components.less b/src/less/components.less similarity index 100% rename from docs/dist/less/components.less rename to src/less/components.less diff --git a/docs/dist/less/components/app-bar.less b/src/less/components/app-bar.less similarity index 100% rename from docs/dist/less/components/app-bar.less rename to src/less/components/app-bar.less diff --git a/docs/dist/less/components/card.less b/src/less/components/card.less similarity index 100% rename from docs/dist/less/components/card.less rename to src/less/components/card.less diff --git a/docs/dist/less/components/checkbox.less b/src/less/components/checkbox.less similarity index 100% rename from docs/dist/less/components/checkbox.less rename to src/less/components/checkbox.less diff --git a/docs/dist/less/components/components.less b/src/less/components/components.less similarity index 100% rename from docs/dist/less/components/components.less rename to src/less/components/components.less diff --git a/docs/dist/less/components/dialog.less b/src/less/components/dialog.less similarity index 100% rename from docs/dist/less/components/dialog.less rename to src/less/components/dialog.less diff --git a/docs/dist/less/components/drop-down-icon.less b/src/less/components/drop-down-icon.less similarity index 100% rename from docs/dist/less/components/drop-down-icon.less rename to src/less/components/drop-down-icon.less diff --git a/docs/dist/less/components/drop-down-menu.less b/src/less/components/drop-down-menu.less similarity index 100% rename from docs/dist/less/components/drop-down-menu.less rename to src/less/components/drop-down-menu.less diff --git a/docs/dist/less/components/icon.less b/src/less/components/icon.less similarity index 100% rename from docs/dist/less/components/icon.less rename to src/less/components/icon.less diff --git a/docs/dist/less/components/input.less b/src/less/components/input.less similarity index 100% rename from docs/dist/less/components/input.less rename to src/less/components/input.less diff --git a/docs/dist/less/components/left-nav.less b/src/less/components/left-nav.less similarity index 100% rename from docs/dist/less/components/left-nav.less rename to src/less/components/left-nav.less diff --git a/docs/dist/less/components/menu.less b/src/less/components/menu.less similarity index 100% rename from docs/dist/less/components/menu.less rename to src/less/components/menu.less diff --git a/docs/dist/less/components/paper-button.less b/src/less/components/paper-button.less similarity index 100% rename from docs/dist/less/components/paper-button.less rename to src/less/components/paper-button.less diff --git a/docs/dist/less/components/paper.less b/src/less/components/paper.less similarity index 100% rename from docs/dist/less/components/paper.less rename to src/less/components/paper.less diff --git a/docs/dist/less/components/radio-button.less b/src/less/components/radio-button.less similarity index 100% rename from docs/dist/less/components/radio-button.less rename to src/less/components/radio-button.less diff --git a/docs/dist/less/components/ripple.less b/src/less/components/ripple.less similarity index 100% rename from docs/dist/less/components/ripple.less rename to src/less/components/ripple.less diff --git a/docs/dist/less/components/subheader.less b/src/less/components/subheader.less similarity index 100% rename from docs/dist/less/components/subheader.less rename to src/less/components/subheader.less diff --git a/docs/dist/less/components/table.less b/src/less/components/table.less similarity index 100% rename from docs/dist/less/components/table.less rename to src/less/components/table.less diff --git a/docs/dist/less/components/toast.less b/src/less/components/toast.less similarity index 100% rename from docs/dist/less/components/toast.less rename to src/less/components/toast.less diff --git a/docs/dist/less/components/toggle.less b/src/less/components/toggle.less similarity index 100% rename from docs/dist/less/components/toggle.less rename to src/less/components/toggle.less diff --git a/docs/dist/less/components/toolbar.less b/src/less/components/toolbar.less similarity index 100% rename from docs/dist/less/components/toolbar.less rename to src/less/components/toolbar.less diff --git a/docs/dist/less/core/core.less b/src/less/core/core.less similarity index 100% rename from docs/dist/less/core/core.less rename to src/less/core/core.less diff --git a/docs/dist/less/core/keylines.less b/src/less/core/keylines.less similarity index 100% rename from docs/dist/less/core/keylines.less rename to src/less/core/keylines.less diff --git a/docs/dist/less/core/layouts.less b/src/less/core/layouts.less similarity index 100% rename from docs/dist/less/core/layouts.less rename to src/less/core/layouts.less diff --git a/docs/dist/less/core/scaffolding.less b/src/less/core/scaffolding.less similarity index 100% rename from docs/dist/less/core/scaffolding.less rename to src/less/core/scaffolding.less diff --git a/docs/dist/less/core/typography.less b/src/less/core/typography.less similarity index 100% rename from docs/dist/less/core/typography.less rename to src/less/core/typography.less diff --git a/docs/dist/less/material-design-fonticons/fonts/mdfonticon.eot b/src/less/material-design-fonticons/fonts/mdfonticon.eot similarity index 100% rename from docs/dist/less/material-design-fonticons/fonts/mdfonticon.eot rename to src/less/material-design-fonticons/fonts/mdfonticon.eot diff --git a/docs/dist/less/material-design-fonticons/fonts/mdfonticon.svg b/src/less/material-design-fonticons/fonts/mdfonticon.svg similarity index 100% rename from docs/dist/less/material-design-fonticons/fonts/mdfonticon.svg rename to src/less/material-design-fonticons/fonts/mdfonticon.svg diff --git a/docs/dist/less/material-design-fonticons/fonts/mdfonticon.ttf b/src/less/material-design-fonticons/fonts/mdfonticon.ttf similarity index 100% rename from docs/dist/less/material-design-fonticons/fonts/mdfonticon.ttf rename to src/less/material-design-fonticons/fonts/mdfonticon.ttf diff --git a/docs/dist/less/material-design-fonticons/fonts/mdfonticon.woff b/src/less/material-design-fonticons/fonts/mdfonticon.woff similarity index 100% rename from docs/dist/less/material-design-fonticons/fonts/mdfonticon.woff rename to src/less/material-design-fonticons/fonts/mdfonticon.woff diff --git a/docs/dist/less/material-design-fonticons/mdfi.css b/src/less/material-design-fonticons/mdfi.css similarity index 100% rename from docs/dist/less/material-design-fonticons/mdfi.css rename to src/less/material-design-fonticons/mdfi.css diff --git a/docs/dist/less/material-ui-icons/Read Me.txt b/src/less/material-ui-icons/Read Me.txt similarity index 100% rename from docs/dist/less/material-ui-icons/Read Me.txt rename to src/less/material-ui-icons/Read Me.txt diff --git a/docs/dist/less/material-ui-icons/demo-files/demo.css b/src/less/material-ui-icons/demo-files/demo.css similarity index 100% rename from docs/dist/less/material-ui-icons/demo-files/demo.css rename to src/less/material-ui-icons/demo-files/demo.css diff --git a/docs/dist/less/material-ui-icons/demo-files/demo.js b/src/less/material-ui-icons/demo-files/demo.js similarity index 100% rename from docs/dist/less/material-ui-icons/demo-files/demo.js rename to src/less/material-ui-icons/demo-files/demo.js diff --git a/docs/dist/less/material-ui-icons/demo.html b/src/less/material-ui-icons/demo.html similarity index 100% rename from docs/dist/less/material-ui-icons/demo.html rename to src/less/material-ui-icons/demo.html diff --git a/docs/dist/less/material-ui-icons/fonts/material-ui-icons.eot b/src/less/material-ui-icons/fonts/material-ui-icons.eot similarity index 100% rename from docs/dist/less/material-ui-icons/fonts/material-ui-icons.eot rename to src/less/material-ui-icons/fonts/material-ui-icons.eot diff --git a/docs/dist/less/material-ui-icons/fonts/material-ui-icons.svg b/src/less/material-ui-icons/fonts/material-ui-icons.svg similarity index 100% rename from docs/dist/less/material-ui-icons/fonts/material-ui-icons.svg rename to src/less/material-ui-icons/fonts/material-ui-icons.svg diff --git a/docs/dist/less/material-ui-icons/fonts/material-ui-icons.ttf b/src/less/material-ui-icons/fonts/material-ui-icons.ttf similarity index 100% rename from docs/dist/less/material-ui-icons/fonts/material-ui-icons.ttf rename to src/less/material-ui-icons/fonts/material-ui-icons.ttf diff --git a/docs/dist/less/material-ui-icons/fonts/material-ui-icons.woff b/src/less/material-ui-icons/fonts/material-ui-icons.woff similarity index 100% rename from docs/dist/less/material-ui-icons/fonts/material-ui-icons.woff rename to src/less/material-ui-icons/fonts/material-ui-icons.woff diff --git a/docs/dist/less/material-ui-icons/selection.json b/src/less/material-ui-icons/selection.json similarity index 100% rename from docs/dist/less/material-ui-icons/selection.json rename to src/less/material-ui-icons/selection.json diff --git a/docs/dist/less/material-ui-icons/style.css b/src/less/material-ui-icons/style.css similarity index 100% rename from docs/dist/less/material-ui-icons/style.css rename to src/less/material-ui-icons/style.css diff --git a/docs/dist/less/mixins/clearfix.less b/src/less/mixins/clearfix.less similarity index 100% rename from docs/dist/less/mixins/clearfix.less rename to src/less/mixins/clearfix.less diff --git a/docs/dist/less/mixins/lesshat.less b/src/less/mixins/lesshat.less similarity index 100% rename from docs/dist/less/mixins/lesshat.less rename to src/less/mixins/lesshat.less diff --git a/docs/dist/less/mixins/mixins.less b/src/less/mixins/mixins.less similarity index 100% rename from docs/dist/less/mixins/mixins.less rename to src/less/mixins/mixins.less diff --git a/docs/dist/less/mixins/ripple.less b/src/less/mixins/ripple.less similarity index 100% rename from docs/dist/less/mixins/ripple.less rename to src/less/mixins/ripple.less diff --git a/docs/dist/less/mixins/transitions.less b/src/less/mixins/transitions.less similarity index 100% rename from docs/dist/less/mixins/transitions.less rename to src/less/mixins/transitions.less diff --git a/docs/dist/less/resets/formalize.css b/src/less/resets/formalize.css similarity index 100% rename from docs/dist/less/resets/formalize.css rename to src/less/resets/formalize.css diff --git a/docs/dist/less/resets/ht5bp-main.css b/src/less/resets/ht5bp-main.css similarity index 100% rename from docs/dist/less/resets/ht5bp-main.css rename to src/less/resets/ht5bp-main.css diff --git a/docs/dist/less/resets/normalize.css b/src/less/resets/normalize.css similarity index 100% rename from docs/dist/less/resets/normalize.css rename to src/less/resets/normalize.css diff --git a/docs/dist/less/resets/typography-resets.less b/src/less/resets/typography-resets.less similarity index 100% rename from docs/dist/less/resets/typography-resets.less rename to src/less/resets/typography-resets.less diff --git a/docs/dist/less/scaffolding.less b/src/less/scaffolding.less similarity index 100% rename from docs/dist/less/scaffolding.less rename to src/less/scaffolding.less diff --git a/docs/dist/less/variables/colors.less b/src/less/variables/colors.less similarity index 100% rename from docs/dist/less/variables/colors.less rename to src/less/variables/colors.less diff --git a/docs/dist/less/variables/custom-variables.less b/src/less/variables/custom-variables.less similarity index 100% rename from docs/dist/less/variables/custom-variables.less rename to src/less/variables/custom-variables.less diff --git a/docs/dist/less/variables/spacing.less b/src/less/variables/spacing.less similarity index 100% rename from docs/dist/less/variables/spacing.less rename to src/less/variables/spacing.less