Skip to content
This repository has been archived by the owner on Dec 28, 2018. It is now read-only.

feat(bootstrap): introduce bootstrap from npm #581

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ gulp.task('__postcss', ['__clean:client:css'], function () {
.pipe(postcss(processors))
.pipe(gulp.dest(DIST_CLIENT_CSS));
});
gulp.task('__cp:client:css:bootstrap', ['__clean:client:css'], function () {
return gulp.src(NPM_MOD_DIR + '/bootstrap/dist/css/**/**.@(css|map)')
.pipe(gulp.dest(DIST_CLIENT_CSS));
});

gulp.task('__eslint', function () {
const src = [
Expand Down Expand Up @@ -319,7 +323,7 @@ gulp.task('clean:server', function () {

gulp.task('__build:server', ['__babel:server']);
gulp.task('__build:client:js', ['__uglify', '__browserify']);
gulp.task('__build:client:css', ['__postcss']);
gulp.task('__build:client:css', ['__postcss', '__cp:client:css:bootstrap']);

gulp.task('jslint', ['__eslint', '__tslint']);
gulp.task('tsc', ['__typescript']);
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"license": "MIT",
"dependencies": {
"bcrypt-nodejs": "0.0.3",
"bootstrap": "^3.3.6",
"cheerio": "^0.20.0",
"commander": "^2.9.0",
"compression": "^1.6.1",
Expand All @@ -55,6 +56,7 @@
"moment": "^2.11.2",
"option-t": "^0.16.0",
"react": "^0.14.7",
"react-bootstrap": "^0.28.3",
"react-dom": "^0.14.7",
"read": "^1.0.7",
"request": "^2.69.0",
Expand Down
3 changes: 2 additions & 1 deletion src/client/rize/output/view/RizeAppView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@

/// <reference path='../../../../../typings/main.d.ts'/>
import * as React from 'react';
import Button from 'react-bootstrap/lib/Button';

export function RizeAppView() {
return (
<div>
{'Thé des Alizés'}
<Button>{'Thé des Alizés'}</Button>
</div>
);
}
Expand Down
1 change: 1 addition & 0 deletions src/server/view/rize/RizeHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export function RizeHeader() {
<meta charSet='utf-8'/>
<meta name='viewport' content='width=device-width, user-scalable=no'/>
<meta name='referrer' content='no-referrer'/>
<link rel='stylesheet' media='all' href='/dist/css/bootstrap.css'/>

<title>{'Project Rize'}</title>

Expand Down