diff --git a/.meteor/packages b/.meteor/packages index 62200af..8fb5ac3 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -19,7 +19,6 @@ shell-server@0.2.4 # Server-side component of the `meteor shell` comm react-meteor-data alanning:roles fourseven:scss -twbs:bootstrap accounts-base@1.3.2 accounts-password@1.4.0 service-configuration@1.0.11 diff --git a/.meteor/versions b/.meteor/versions index 87e5bde..0fa2f09 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -97,7 +97,6 @@ templating-tools@1.1.2 themeteorchef:bert@2.1.3 tmeasday:check-npm-versions@0.3.1 tracker@1.1.3 -twbs:bootstrap@3.3.6 underscore@1.0.10 url@1.1.0 webapp@1.3.19 diff --git a/client/main.html b/client/main.html index db2b85f..172a2fb 100644 --- a/client/main.html +++ b/client/main.html @@ -3,6 +3,17 @@ Pup + + + + + + + + + + diff --git a/imports/ui/stylesheets/app.scss b/imports/ui/stylesheets/app.scss index be7cbf1..21c9469 100644 --- a/imports/ui/stylesheets/app.scss +++ b/imports/ui/stylesheets/app.scss @@ -1,4 +1,3 @@ @import './colors'; @import './forms'; @import './bootstrap-overrides'; -@import 'web-fonts'; diff --git a/package.json b/package.json index bdeaf69..2246aa5 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ "@cleverbeagle/seeder": "^1.2.0", "babel-runtime": "^6.26.0", "bcrypt": "^1.0.3", + "bootstrap": "^4.0.0-beta.2", + "bootstrap-material-design": "^4.0.0-beta.4", "commonmark": "^0.28.1", "core-js": "^2.5.1", "fs": "0.0.1-security", @@ -24,6 +26,7 @@ "lodash": "^4.17.4", "meteor-node-stubs": "^0.2.11", "moment": "^2.19.2", + "popper.js": "^1.12.7", "prop-types": "^15.5.10", "react": "^15.6.1", "react-addons-pure-render-mixin": "^15.6.0",