Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
John Edward committed Mar 26, 2018
2 parents 79549e2 + 4a60bfa commit c6007a9
Show file tree
Hide file tree
Showing 45 changed files with 614 additions and 479 deletions.
7 changes: 6 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
"mocha": true
},
"rules": {
"no-trailing-spaces": 0
"no-trailing-spaces": 0,
"react/jsx-filename-extension": 0,
"react/forbid-prop-types": 0,
"jsx-a11y/anchor-is-valid": 0,
"import/extensions": 0,
"react/require-default-props": 0
}
}
2 changes: 2 additions & 0 deletions .meteor/.finished-upgraders
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ notices-for-facebook-graph-api-2
1.3.0-split-minifiers-package
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
27 changes: 14 additions & 13 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

meteor-base@1.0.4 # Packages every Meteor app needs to have
mobile-experience@1.0.4 # Packages for a great mobile UX
mongo@1.1.14 # The database Meteor supports right now
meteor-base@1.3.0 # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
mongo@1.4.2 # The database Meteor supports right now
blaze-html-templates # Compile .html files into Meteor Blaze views
reactive-var@1.0.11 # Reactive variable for tracker
jquery@1.11.10 # Helpful client-side library
tracker@1.1.1 # Meteor's client-side reactive programming library
tracker@1.1.3 # Meteor's client-side reactive programming library

standard-minifier-css@1.3.2 # CSS minifier run for production mode
standard-minifier-js@1.2.1 # JS minifier run for production mode
es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.6.1 # Enable ECMAScript2015+ syntax in app code
standard-minifier-css@1.4.0 # CSS minifier run for production mode
standard-minifier-js@2.3.1 # JS minifier run for production mode
es5-shim@4.7.0 # ECMAScript 5 compatibility for older browsers.
ecmascript@0.10.0 # Enable ECMAScript2015+ syntax in app code

react-meteor-data
less@2.7.8
less@2.7.11
mizzao:jquery-ui
accounts-password@1.3.3
accounts-password@1.5.0
alanning:roles
accounts-base@1.2.14
shell-server
dispatch:mocha
accounts-base@1.4.2
shell-server@0.3.1
dynamic-import
meteortesting:mocha
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.4.2.7
METEOR@1.6.1
146 changes: 76 additions & 70 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,89 +1,95 @@
accounts-base@1.2.14
accounts-password@1.3.4
alanning:roles@1.2.15
aldeed:browser-tests@0.1.0
allow-deny@1.0.5
autoupdate@1.2.11
babel-compiler@6.14.1
babel-runtime@1.0.1
base64@1.0.10
accounts-base@1.4.2
accounts-password@1.5.1
alanning:roles@1.2.16
allow-deny@1.1.0
autoupdate@1.4.0
babel-compiler@7.0.5
babel-runtime@1.2.2
base64@1.0.11
binary-heap@1.0.10
blaze@2.3.0
blaze-html-templates@1.1.0
blaze@2.3.2
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.0.11
caching-compiler@1.1.9
caching-html-compiler@1.1.0
callback-hook@1.0.10
check@1.2.5
ddp@1.2.5
ddp-client@1.2.9
ddp-common@1.2.8
ddp-rate-limiter@1.0.6
ddp-server@1.2.10
boilerplate-generator@1.4.0
caching-compiler@1.1.11
caching-html-compiler@1.1.2
callback-hook@1.1.0
check@1.3.0
ddp@1.4.0
ddp-client@2.3.1
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.1.2
deps@1.0.12
diff-sequence@1.0.7
dispatch:mocha@0.3.0
ecmascript@0.6.3
ecmascript-runtime@0.3.15
ejson@1.0.13
email@1.1.18
es5-shim@4.6.15
fastclick@1.0.13
diff-sequence@1.1.0
dynamic-import@0.3.0
ecmascript@0.10.5
ecmascript-runtime@0.5.0
ecmascript-runtime-client@0.6.2
ecmascript-runtime-server@0.5.0
ejson@1.1.0
email@1.2.3
es5-shim@4.7.3
geojson-utils@1.0.10
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
http@1.1.8
id-map@1.0.9
jquery@1.11.10
launch-screen@1.0.12
less@2.7.9
http@1.4.0
id-map@1.1.0
jquery@1.11.11
launch-screen@1.1.1
less@2.7.12
livedata@1.0.18
localstorage@1.0.12
logging@1.1.17
meteor@1.6.1
meteor-base@1.0.4
minifier-css@1.2.16
minifier-js@1.2.17
minimongo@1.0.20
mizzao:build-fetcher@0.2.0
localstorage@1.2.0
logging@1.1.19
meteor@1.8.4
meteor-base@1.3.0
meteortesting:browser-tests@0.1.2
meteortesting:mocha@0.5.0
minifier-css@1.3.1
minifier-js@2.3.3
minimongo@1.4.3
mizzao:build-fetcher@0.3.2
mizzao:jquery-ui@1.11.4
mobile-experience@1.0.4
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modules@0.7.9
modules-runtime@0.7.9
mongo@1.1.15
modules@0.11.5
modules-runtime@0.9.2
mongo@1.4.5
mongo-dev-server@1.1.0
mongo-id@1.0.6
npm-bcrypt@0.9.2
npm-mongo@2.2.16_1
observe-sequence@1.0.15
ordered-dict@1.0.9
npm-bcrypt@0.9.3
npm-mongo@2.2.34
observe-sequence@1.0.16
ordered-dict@1.1.0
practicalmeteor:mocha-core@1.0.1
promise@0.8.8
random@1.0.10
rate-limit@1.0.6
react-meteor-data@0.2.9
promise@0.10.2
random@1.1.0
rate-limit@1.0.9
react-meteor-data@0.2.16
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
reload@1.2.0
retry@1.1.0
routepolicy@1.0.12
server-render@0.3.0
service-configuration@1.0.11
sha@1.0.9
shell-server@0.2.2
spacebars@1.0.13
spacebars-compiler@1.1.0
shell-server@0.3.1
shim-common@0.1.0
socket-stream-client@0.1.0
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.10
standard-minifier-css@1.3.3
standard-minifier-js@1.2.2
templating@1.3.0
templating-compiler@1.3.0
templating-runtime@1.3.0
templating-tools@1.1.0
tmeasday:check-npm-versions@0.2.0
tracker@1.1.2
ui@1.0.12
standard-minifier-css@1.4.1
standard-minifier-js@2.3.2
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
tmeasday:check-npm-versions@0.3.2
tracker@1.1.3
ui@1.0.13
underscore@1.0.10
url@1.0.11
webapp@1.3.13
url@1.2.0
webapp@1.5.0
webapp-hashing@1.0.9
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
[![bitHound Dependencies](https://www.bithound.io/github/jeescu/meteor-react-admin-lte/badges/dependencies.svg)](https://www.bithound.io/github/jeescu/meteor-react-admin-lte/master/dependencies/npm)
[![bitHound Dev Dependencies](https://www.bithound.io/github/jeescu/meteor-react-admin-lte/badges/devDependencies.svg)](https://www.bithound.io/github/jeescu/meteor-react-admin-lte/master/dependencies/npm)

Meteor project boilerplate in [ES6](https://es6.io/) and [React](https://facebook.github.io/react/) using [AdminLTE 2.3.11](http://almsaeedstudio.com/themes/AdminLTE/documentation/index.html) styles.
Meteor project boilerplate in [ES6](https://es6.io/) and [React](https://facebook.github.io/react/) using [AdminLTE 2.4.3](http://almsaeedstudio.com/themes/AdminLTE/documentation/index.html) styles.

![Boilerplate screenshot](https://raw.githubusercontent.com/jeescu/meteor-react-admin-lte/master/public/img/Screenshot%20from%202016-06-24%2009%3A52%3A37.png)

### Prerequisites
* Node v6.9 or higher
* Npm v3 or higher
* Meteor v1.4.x
* Meteor v1.6.1

### Meteor packages
* accounts-password
Expand Down
23 changes: 23 additions & 0 deletions client/lib/base/lib/admin-lte/.csslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"adjoining-classes": false,
"box-sizing": false,
"box-model": false,
"compatible-vendor-prefixes": false,
"floats": false,
"font-sizes": false,
"gradients": false,
"important": false,
"known-properties": false,
"outline-none": false,
"qualified-headings": false,
"regex-selectors": false,
"shorthand": false,
"text-indent": false,
"unique-headings": false,
"universal-selector": false,
"unqualified-attributes": false,
"ids": false,
"fallback-colors": false,
"vendor-prefix": false,
"import": false
}
78 changes: 39 additions & 39 deletions client/lib/base/lib/admin-lte/AdminLTE-without-plugins.less
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
/*!
* AdminLTE v2.3.5 Without Third-Party Plugins
* AdminLTE v2.4.0 Without Third-Party Plugins
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* Website: Almsaeed Studio <https://adminlte.io>
* License: Open source - MIT
* Please visit http://opensource.org/licenses/MIT for more information
!*/
//google fonts
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);

//Bootstrap Variables & Mixins
//The core bootstrap code have not been modified. These files
//are included only for reference.
// @import (reference) "../bootstrap/mixins.import.less";
// @import (reference) "../bootstrap/variables.import.less";
// @import (reference) "../bootstrap-less/mixins";
// @import (reference) "../bootstrap-less/variables";
//MISC
//----
@import "core.less";
@import "variables.less";
@import "mixins.less";
@import "core";
@import "variables";
@import "mixins";
//COMPONENTS
//-----------
@import "header.less";
@import "sidebar.less";
@import "sidebar-mini.less";
@import "control-sidebar.less";
@import "dropdown.less";
@import "forms.less";
@import "progress-bars.less";
@import "small-box.less";
@import "boxes.less";
@import "info-box.less";
@import "timeline.less";
@import "buttons.less";
@import "callout.less";
@import "alerts.less";
@import "navs.less";
@import "products.less";
@import "table.less";
@import "labels.less";
@import "direct-chat.less";
@import "users-list.less";
@import "carousel.less";
@import "modal.less";
@import "social-widgets.less";
@import "header";
@import "sidebar";
@import "sidebar-mini";
@import "control-sidebar";
@import "dropdown";
@import "forms";
@import "progress-bars";
@import "small-box";
@import "boxes";
@import "info-box";
@import "timeline";
@import "buttons";
@import "callout";
@import "alerts";
@import "navs";
@import "products";
@import "table";
@import "labels";
@import "direct-chat";
@import "users-list";
@import "carousel";
@import "modal";
@import "social-widgets";
@import "treeview";
//PAGES
//------
@import "mailbox.less";
@import "lockscreen.less";
@import "login_and_register.less";
@import "404_500_errors.less";
@import "invoice.less";
@import "mailbox";
@import "lockscreen";
@import "login_and_register";
@import "404_500_errors";
@import "invoice";
@import "profile";
//Miscellaneous
//-------------
@import "miscellaneous.less";
@import "print.less";
@import "miscellaneous";
@import "print";
Loading

0 comments on commit c6007a9

Please sign in to comment.