Change project structure to be less confusing - fixed #28

mui · Nov 11, 2014 · 4acff5d · 4acff5d
1 parent 8d8c942
commit 4acff5d
Show file tree

Hide file tree

Showing 87 changed files with 13 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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;
+module.exports = CodeBlock;
diff --git 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
diff --git 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 → src/index.js b/docs/dist/index.js → src/index.js
diff --git a/docs/dist/js/app-bar.jsx → src/js/app-bar.jsx b/docs/dist/js/app-bar.jsx → src/js/app-bar.jsx
diff --git a/docs/dist/js/app-canvas.jsx → src/js/app-canvas.jsx b/docs/dist/js/app-canvas.jsx → src/js/app-canvas.jsx
diff --git a/docs/dist/js/checkbox.jsx → src/js/checkbox.jsx b/docs/dist/js/checkbox.jsx → src/js/checkbox.jsx
diff --git a/docs/dist/js/dialog.jsx → src/js/dialog.jsx b/docs/dist/js/dialog.jsx → src/js/dialog.jsx
diff --git a/docs/dist/js/drop-down-icon.jsx → src/js/drop-down-icon.jsx b/docs/dist/js/drop-down-icon.jsx → src/js/drop-down-icon.jsx
diff --git a/docs/dist/js/drop-down-menu.jsx → src/js/drop-down-menu.jsx b/docs/dist/js/drop-down-menu.jsx → src/js/drop-down-menu.jsx
diff --git a/docs/dist/js/icon.jsx → src/js/icon.jsx b/docs/dist/js/icon.jsx → src/js/icon.jsx
diff --git a/docs/dist/js/input.jsx → src/js/input.jsx b/docs/dist/js/input.jsx → src/js/input.jsx
diff --git a/docs/dist/js/left-nav.jsx → src/js/left-nav.jsx b/docs/dist/js/left-nav.jsx → src/js/left-nav.jsx
diff --git a/docs/dist/js/menu-item.jsx → src/js/menu-item.jsx b/docs/dist/js/menu-item.jsx → src/js/menu-item.jsx
diff --git a/docs/dist/js/menu.jsx → src/js/menu.jsx b/docs/dist/js/menu.jsx → src/js/menu.jsx
diff --git a/docs/dist/js/mixins/classable.js → src/js/mixins/classable.js b/docs/dist/js/mixins/classable.js → src/js/mixins/classable.js
diff --git a/docs/dist/js/mixins/click-awayable.js → src/js/mixins/click-awayable.js b/docs/dist/js/mixins/click-awayable.js → src/js/mixins/click-awayable.js
diff --git a/docs/dist/js/paper-button.jsx → src/js/paper-button.jsx b/docs/dist/js/paper-button.jsx → src/js/paper-button.jsx
diff --git a/docs/dist/js/paper.jsx → src/js/paper.jsx b/docs/dist/js/paper.jsx → src/js/paper.jsx
diff --git a/docs/dist/js/radio-button.jsx → src/js/radio-button.jsx b/docs/dist/js/radio-button.jsx → src/js/radio-button.jsx
diff --git a/docs/dist/js/ripple.jsx → src/js/ripple.jsx b/docs/dist/js/ripple.jsx → src/js/ripple.jsx
diff --git a/docs/dist/js/table-header.jsx → src/js/table-header.jsx b/docs/dist/js/table-header.jsx → src/js/table-header.jsx
diff --git a/docs/dist/js/table-rows-item.jsx → src/js/table-rows-item.jsx b/docs/dist/js/table-rows-item.jsx → src/js/table-rows-item.jsx
diff --git a/docs/dist/js/table-rows.jsx → src/js/table-rows.jsx b/docs/dist/js/table-rows.jsx → src/js/table-rows.jsx
diff --git a/docs/dist/js/toast.jsx → src/js/toast.jsx b/docs/dist/js/toast.jsx → src/js/toast.jsx
diff --git a/docs/dist/js/toggle.jsx → src/js/toggle.jsx b/docs/dist/js/toggle.jsx → src/js/toggle.jsx
diff --git a/docs/dist/js/toolbar-group.jsx → src/js/toolbar-group.jsx b/docs/dist/js/toolbar-group.jsx → src/js/toolbar-group.jsx
diff --git a/docs/dist/js/toolbar.jsx → src/js/toolbar.jsx b/docs/dist/js/toolbar.jsx → src/js/toolbar.jsx
diff --git a/docs/dist/js/utils/css-event.js → src/js/utils/css-event.js b/docs/dist/js/utils/css-event.js → src/js/utils/css-event.js
diff --git a/docs/dist/js/utils/key-line.js → src/js/utils/key-line.js b/docs/dist/js/utils/key-line.js → src/js/utils/key-line.js
diff --git a/docs/dist/less/components.less → src/less/components.less b/docs/dist/less/components.less → src/less/components.less
diff --git a/docs/dist/less/components/app-bar.less → src/less/components/app-bar.less b/docs/dist/less/components/app-bar.less → src/less/components/app-bar.less
diff --git a/docs/dist/less/components/card.less → src/less/components/card.less b/docs/dist/less/components/card.less → src/less/components/card.less
diff --git a/docs/dist/less/components/checkbox.less → src/less/components/checkbox.less b/docs/dist/less/components/checkbox.less → src/less/components/checkbox.less
diff --git a/docs/dist/less/components/components.less → src/less/components/components.less b/docs/dist/less/components/components.less → src/less/components/components.less
diff --git a/docs/dist/less/components/dialog.less → src/less/components/dialog.less b/docs/dist/less/components/dialog.less → src/less/components/dialog.less
diff --git a/.../dist/less/components/drop-down-icon.less → src/less/components/drop-down-icon.less b/.../dist/less/components/drop-down-icon.less → src/less/components/drop-down-icon.less
diff --git a/.../dist/less/components/drop-down-menu.less → src/less/components/drop-down-menu.less b/.../dist/less/components/drop-down-menu.less → src/less/components/drop-down-menu.less
diff --git a/docs/dist/less/components/icon.less → src/less/components/icon.less b/docs/dist/less/components/icon.less → src/less/components/icon.less
diff --git a/docs/dist/less/components/input.less → src/less/components/input.less b/docs/dist/less/components/input.less → src/less/components/input.less
diff --git a/docs/dist/less/components/left-nav.less → src/less/components/left-nav.less b/docs/dist/less/components/left-nav.less → src/less/components/left-nav.less
diff --git a/docs/dist/less/components/menu.less → src/less/components/menu.less b/docs/dist/less/components/menu.less → src/less/components/menu.less
diff --git a/docs/dist/less/components/paper-button.less → src/less/components/paper-button.less b/docs/dist/less/components/paper-button.less → src/less/components/paper-button.less
diff --git a/docs/dist/less/components/paper.less → src/less/components/paper.less b/docs/dist/less/components/paper.less → src/less/components/paper.less
diff --git a/docs/dist/less/components/radio-button.less → src/less/components/radio-button.less b/docs/dist/less/components/radio-button.less → src/less/components/radio-button.less
diff --git a/docs/dist/less/components/ripple.less → src/less/components/ripple.less b/docs/dist/less/components/ripple.less → src/less/components/ripple.less
diff --git a/docs/dist/less/components/subheader.less → src/less/components/subheader.less b/docs/dist/less/components/subheader.less → src/less/components/subheader.less
diff --git a/docs/dist/less/components/table.less → src/less/components/table.less b/docs/dist/less/components/table.less → src/less/components/table.less
diff --git a/docs/dist/less/components/toast.less → src/less/components/toast.less b/docs/dist/less/components/toast.less → src/less/components/toast.less
diff --git a/docs/dist/less/components/toggle.less → src/less/components/toggle.less b/docs/dist/less/components/toggle.less → src/less/components/toggle.less
diff --git a/docs/dist/less/components/toolbar.less → src/less/components/toolbar.less b/docs/dist/less/components/toolbar.less → src/less/components/toolbar.less
diff --git a/docs/dist/less/core/core.less → src/less/core/core.less b/docs/dist/less/core/core.less → src/less/core/core.less
diff --git a/docs/dist/less/core/keylines.less → src/less/core/keylines.less b/docs/dist/less/core/keylines.less → src/less/core/keylines.less
diff --git a/docs/dist/less/core/layouts.less → src/less/core/layouts.less b/docs/dist/less/core/layouts.less → src/less/core/layouts.less
diff --git a/docs/dist/less/core/scaffolding.less → src/less/core/scaffolding.less b/docs/dist/less/core/scaffolding.less → src/less/core/scaffolding.less
diff --git a/docs/dist/less/core/typography.less → src/less/core/typography.less b/docs/dist/less/core/typography.less → src/less/core/typography.less
diff --git a/...ial-design-fonticons/fonts/mdfonticon.eot → ...ial-design-fonticons/fonts/mdfonticon.eot b/...ial-design-fonticons/fonts/mdfonticon.eot → ...ial-design-fonticons/fonts/mdfonticon.eot
diff --git a/...ial-design-fonticons/fonts/mdfonticon.svg → ...ial-design-fonticons/fonts/mdfonticon.svg b/...ial-design-fonticons/fonts/mdfonticon.svg → ...ial-design-fonticons/fonts/mdfonticon.svg
diff --git a/...ial-design-fonticons/fonts/mdfonticon.ttf → ...ial-design-fonticons/fonts/mdfonticon.ttf b/...ial-design-fonticons/fonts/mdfonticon.ttf → ...ial-design-fonticons/fonts/mdfonticon.ttf
diff --git a/...al-design-fonticons/fonts/mdfonticon.woff → ...al-design-fonticons/fonts/mdfonticon.woff b/...al-design-fonticons/fonts/mdfonticon.woff → ...al-design-fonticons/fonts/mdfonticon.woff
diff --git a/...t/less/material-design-fonticons/mdfi.css → src/less/material-design-fonticons/mdfi.css b/...t/less/material-design-fonticons/mdfi.css → src/less/material-design-fonticons/mdfi.css
diff --git a/docs/dist/less/material-ui-icons/Read Me.txt → src/less/material-ui-icons/Read Me.txt b/docs/dist/less/material-ui-icons/Read Me.txt → src/less/material-ui-icons/Read Me.txt
diff --git a/...ess/material-ui-icons/demo-files/demo.css → ...ess/material-ui-icons/demo-files/demo.css b/...ess/material-ui-icons/demo-files/demo.css → ...ess/material-ui-icons/demo-files/demo.css
diff --git a/...less/material-ui-icons/demo-files/demo.js → ...less/material-ui-icons/demo-files/demo.js b/...less/material-ui-icons/demo-files/demo.js → ...less/material-ui-icons/demo-files/demo.js
diff --git a/docs/dist/less/material-ui-icons/demo.html → src/less/material-ui-icons/demo.html b/docs/dist/less/material-ui-icons/demo.html → src/less/material-ui-icons/demo.html
diff --git a/...rial-ui-icons/fonts/material-ui-icons.eot → ...rial-ui-icons/fonts/material-ui-icons.eot b/...rial-ui-icons/fonts/material-ui-icons.eot → ...rial-ui-icons/fonts/material-ui-icons.eot
diff --git a/...rial-ui-icons/fonts/material-ui-icons.svg → ...rial-ui-icons/fonts/material-ui-icons.svg b/...rial-ui-icons/fonts/material-ui-icons.svg → ...rial-ui-icons/fonts/material-ui-icons.svg
diff --git a/...rial-ui-icons/fonts/material-ui-icons.ttf → ...rial-ui-icons/fonts/material-ui-icons.ttf b/...rial-ui-icons/fonts/material-ui-icons.ttf → ...rial-ui-icons/fonts/material-ui-icons.ttf
diff --git a/...ial-ui-icons/fonts/material-ui-icons.woff → ...ial-ui-icons/fonts/material-ui-icons.woff b/...ial-ui-icons/fonts/material-ui-icons.woff → ...ial-ui-icons/fonts/material-ui-icons.woff
diff --git a/...ist/less/material-ui-icons/selection.json → src/less/material-ui-icons/selection.json b/...ist/less/material-ui-icons/selection.json → src/less/material-ui-icons/selection.json
diff --git a/docs/dist/less/material-ui-icons/style.css → src/less/material-ui-icons/style.css b/docs/dist/less/material-ui-icons/style.css → src/less/material-ui-icons/style.css
diff --git a/docs/dist/less/mixins/clearfix.less → src/less/mixins/clearfix.less b/docs/dist/less/mixins/clearfix.less → src/less/mixins/clearfix.less
diff --git a/docs/dist/less/mixins/lesshat.less → src/less/mixins/lesshat.less b/docs/dist/less/mixins/lesshat.less → src/less/mixins/lesshat.less
diff --git a/docs/dist/less/mixins/mixins.less → src/less/mixins/mixins.less b/docs/dist/less/mixins/mixins.less → src/less/mixins/mixins.less
diff --git a/docs/dist/less/mixins/ripple.less → src/less/mixins/ripple.less b/docs/dist/less/mixins/ripple.less → src/less/mixins/ripple.less
diff --git a/docs/dist/less/mixins/transitions.less → src/less/mixins/transitions.less b/docs/dist/less/mixins/transitions.less → src/less/mixins/transitions.less
diff --git a/docs/dist/less/resets/formalize.css → src/less/resets/formalize.css b/docs/dist/less/resets/formalize.css → src/less/resets/formalize.css
diff --git a/docs/dist/less/resets/ht5bp-main.css → src/less/resets/ht5bp-main.css b/docs/dist/less/resets/ht5bp-main.css → src/less/resets/ht5bp-main.css
diff --git a/docs/dist/less/resets/normalize.css → src/less/resets/normalize.css b/docs/dist/less/resets/normalize.css → src/less/resets/normalize.css
diff --git a/docs/dist/less/resets/typography-resets.less → src/less/resets/typography-resets.less b/docs/dist/less/resets/typography-resets.less → src/less/resets/typography-resets.less
diff --git a/docs/dist/less/scaffolding.less → src/less/scaffolding.less b/docs/dist/less/scaffolding.less → src/less/scaffolding.less
diff --git a/docs/dist/less/variables/colors.less → src/less/variables/colors.less b/docs/dist/less/variables/colors.less → src/less/variables/colors.less
diff --git a/...dist/less/variables/custom-variables.less → src/less/variables/custom-variables.less b/...dist/less/variables/custom-variables.less → src/less/variables/custom-variables.less
diff --git a/docs/dist/less/variables/spacing.less → src/less/variables/spacing.less b/docs/dist/less/variables/spacing.less → src/less/variables/spacing.less