Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Commit

Permalink
Merge pull request #221 from Financial-Times/matth/origami-major-cascade
Browse files Browse the repository at this point in the history
Upgrade n-ui-foundations to v4
  • Loading branch information
i-like-robots committed Nov 27, 2019
2 parents 08357be + 4e293c0 commit d44a3b2
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 121 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ demo-build:
@$(DONE)

demo: demo-build
@node --inspect demos/app
@node demos/app

a11y: demo-build
@node .pa11yci.js
Expand Down
8 changes: 4 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"tests"
],
"dependencies": {
"n-ui-foundations": "^3.0.0",
"o-teaser": "^3.0.0",
"o-labels": "^4.0.0",
"n-image": "^5.0.0"
"n-ui-foundations": "^4.0.0",
"o-teaser": "^4.0.0",
"o-labels": "^5.0.0",
"n-image": "^6.0.0"
}
}
8 changes: 0 additions & 8 deletions demos/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const express = require('@financial-times/n-internal-tool');
const fixtures = require('./fixtures/fixtures.json');
const fixturesCommercial = require('./fixtures/fixtures-commercial-content');
const fixturesPackage = require('./fixtures/fixtures-package');
const fixturesPackageArticle = require('./fixtures/fixtures-article-in-package');
const fixturesVideo = require('./fixtures/fixtures-video');
const fixturesLiveBlog = require('./fixtures/fixures-live-blog.json');
Expand Down Expand Up @@ -40,13 +39,6 @@ app.get('/package-article', (req, res) => {
}, fixturesPackageArticle));
});

app.get('/package', (req, res) => {
res.render('demo-package', Object.assign({
title: 'Package with content teasers',
layout: 'demo-layout',
}, fixturesPackage));
});

app.get('/video', (req, res) => {
res.render('demo', Object.assign({
title: 'Video teasers',
Expand Down
103 changes: 0 additions & 103 deletions demos/fixtures/fixtures-package.json

This file was deleted.

8 changes: 3 additions & 5 deletions demos/src/demo.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
$system-code: 'n-teaser-demo';

@import 'n-ui-foundations/main';

$o-labels-is-silent: false;
@import 'o-labels/main';
$o-teaser-is-silent: false;
@import 'o-teaser/main';

.o-labels {
@include oTypographySansBold($scale: -1);
}
@include oLabels();

0 comments on commit d44a3b2

Please sign in to comment.