From 9a1f979ea68298175db27dce66251dc97d73b73f Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Tue, 10 Mar 2015 11:02:17 +0100 Subject: [PATCH] completely fixed meteor --- meteor/package.js | 2 +- package.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meteor/package.js b/meteor/package.js index 84aec64e..1599e379 100644 --- a/meteor/package.js +++ b/meteor/package.js @@ -23,7 +23,7 @@ Package.onUse(function (api) { 'dist/fonts/Material-Design-Icons.svg', // SVG fallback for iOS < 5 - http://caniuse.com/#feat=svg-fonts, http://stackoverflow.com/a/11002874/126903 'dist/fonts/Material-Design-Icons.ttf', // Android Browers 4.1, 4.3 - http://caniuse.com/#feat=ttf 'dist/fonts/Material-Design-Icons.woff', // Supported by all modern browsers - 'dist/css/material-wfont.css', // includes @font-face rules to load the Roboto font + 'dist/css/material.css', // includes only the primary color variations 'dist/css/ripples.css', 'dist/js/material.js', 'dist/js/ripples.js', diff --git a/package.js b/package.js index 1599e379..dbf76347 100644 --- a/package.js +++ b/package.js @@ -1,21 +1,21 @@ // package metadata file for Meteor.js 'use strict'; -var packageName = 'fezvrasta:bootstrap-material-design'; // https://atmospherejs.com/fezvrasta/bootstrap-material-design +var packageName = 'fezvrasta:bootstrap-material-design-noglyph'; // https://atmospherejs.com/fezvrasta/bootstrap-material-design-noglyph var where = 'client'; // where to install: 'client' or 'server'. For both, pass nothing. var packageJson = JSON.parse(Npm.require("fs").readFileSync('package.json')); Package.describe({ name: packageName, - summary: 'FezVrasta\'s Bootstrap theme implementing Google\'s Material (Paper) Design', + summary: 'FezVrasta\'s Bootstrap Google Material Design theme. Material icons instead of Bootstrap glyphicons.', version: packageJson.version, git: 'https://github.com/fezvrasta/bootstrap-material-design.git' }); Package.onUse(function (api) { api.versionsFrom(['METEOR@0.9.0', 'METEOR@1.0']); - api.use('twbs:bootstrap@3.3.1'); + api.use('twbs:bootstrap-noglyph@3.3.1'); api.use('jquery'); api.addFiles([ // we bundle all font files, but the client will request only one of them via the CSS @font-face rule @@ -23,7 +23,7 @@ Package.onUse(function (api) { 'dist/fonts/Material-Design-Icons.svg', // SVG fallback for iOS < 5 - http://caniuse.com/#feat=svg-fonts, http://stackoverflow.com/a/11002874/126903 'dist/fonts/Material-Design-Icons.ttf', // Android Browers 4.1, 4.3 - http://caniuse.com/#feat=ttf 'dist/fonts/Material-Design-Icons.woff', // Supported by all modern browsers - 'dist/css/material.css', // includes only the primary color variations + 'dist/css/material-wfont.css', // includes @font-face rules to load the Roboto font 'dist/css/ripples.css', 'dist/js/material.js', 'dist/js/ripples.js', @@ -35,5 +35,5 @@ Package.onTest(function (api) { api.use(packageName, where); api.use(['tinytest', 'http'], where); - api.addFiles('meteor/test.js', where); + api.addFiles('meteor/test.js', where); // same test because we don't test the glyphicons in particular (that's the job of twbs:bootstrap) });