Skip to content

Commit

Permalink
Merge pull request #185 from viadeo/4.0.0
Browse files Browse the repository at this point in the history
remove bower to npm
  • Loading branch information
gperreymond authored Jul 24, 2017
2 parents 197f70f + 212d134 commit 0e91d84
Show file tree
Hide file tree
Showing 28 changed files with 751 additions and 1,610 deletions.
8 changes: 2 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ module.exports = function(grunt) {
// Merge configurations
grunt.initConfig(_.merge(initConfig, config));

// Force load assemble
grunt.loadNpmTasks('assemble');

grunt.registerTask('test', [
'jshint'
]);
Expand All @@ -57,8 +54,7 @@ module.exports = function(grunt) {
'clean:sass',
'lessToSass',
'string-replace:sass_dist',
'string-replace:less_dist',
'test-sass'
'string-replace:less_dist'
]);

grunt.registerTask('dist-js', [
Expand Down Expand Up @@ -87,7 +83,7 @@ module.exports = function(grunt) {
// Watch and launch server
grunt.registerTask('watch-server', ['connect', 'watch']);

// Default task
// Default task
grunt.registerTask('default', ['test', 'dist', 'doc', 'watch-server']);

};
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Three quick start options are available:

* [Download the latest release](https://github.com/viadeo/tetra-ui/releases).
* Clone the repo: `git clone https://github.com/viadeo/tetra-ui.git`.
* Install with [Bower](http://bower.io): `bower install tetra-ui`.
* Install with [npm](https://www.npmjs.com): `npm install tetra-ui`.

The main folder you’ll use is of course `tetra-ui` where you’ll find the main files: CSS, web fonts, images, Less, Sass.

Expand All @@ -23,7 +23,6 @@ Here are the instructions to launch and build locally the whole Tetra UI project
1. Install [Node.js](http://nodejs.org/)
2. Install [Npm](http://npmjs.org/) dependancies (npm should with Node)
3. Install `grunt-cli` globally with `npm install -g grunt-cli`.
4. Install `bower` globally with `npm install -g bower`.

Navigate to the root `tetra-ui` directory and then run `npm install` to install project dependancies.<br />
The `npm`command installs the dependencies defined in `package.json`.
Expand Down
25 changes: 0 additions & 25 deletions bower.json

This file was deleted.

2 changes: 1 addition & 1 deletion dist/css/tetra-ui-doc-rtl.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tetra-ui v3.3.1 - 2016 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */
/*! tetra-ui v4.0.0 - 2017 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */

@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);

Expand Down
2 changes: 1 addition & 1 deletion dist/css/tetra-ui-doc-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/tetra-ui-doc.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tetra-ui v3.3.1 - 2016 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */
/*! tetra-ui v4.0.0 - 2017 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */

@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);

Expand Down
2 changes: 1 addition & 1 deletion dist/css/tetra-ui-doc.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/tetra-ui-rtl.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tetra-ui v3.3.1 - 2016 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */
/*! tetra-ui v4.0.0 - 2017 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */

@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);

Expand Down
2 changes: 1 addition & 1 deletion dist/css/tetra-ui-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/tetra-ui.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tetra-ui v3.3.1 - 2016 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */
/*! tetra-ui v4.0.0 - 2017 | (MIT Licence) (c) Viadeo/APVO Corp - inspired by Bootstrap (c) Twitter, Inc. (Apache 2 Licence) */

@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);

Expand Down
2 changes: 1 addition & 1 deletion dist/css/tetra-ui.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 0e91d84

Please sign in to comment.