Skip to content

Commit 15e3f23

Browse files
committed
collection dev, tidy fractal away
1 parent 6f7d8a0 commit 15e3f23

File tree

136 files changed

+5536
-15872
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+5536
-15872
lines changed

Diff for: .sassdocrc

-16
This file was deleted.

Diff for: CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) (although note we're still in development 0.x mode).
7+
8+
## [Unreleased]
9+
10+
### Added/Changed
11+
12+
- Swapped Fractal for Storybook (html with handlebars support)
13+
- Upgrades other dependencies
14+
- Removes our `sass-between` dependency in favour of an internal custom `clamp-between` function
15+
- Updates `o-grid` to use actual css grid
16+
- N.B. This is a significant change, to be compatible with the collections site, Wordpress sites should stay on 0.10 until tested
17+
18+
19+
## [0.10.4] - 2024-01-15
20+
21+
### Added
22+
- SIP logos / favicons
23+
24+
## [0.9.0] - 2023-10-17
25+
26+
### Changes
27+
- bump sass-between
28+
29+
> Before that, sorry see the git log for details

Diff for: README.md

+10-13
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ If you want to contribute to this, you will need to:
1212

1313
- Clone this repository
1414
- `npm install` to get dependencies
15-
- `npm run watch` to start a development server and watch for your changes on http://localhost:3000 (n.b. Fractal is running on :4000 but is proxied by webpack dev server on :3000 for hot reloading)
16-
- `npm run dist` to make a production-ready copy (you'll need to serve that yourself)
15+
- `npm start` to start a development server and watch for your changes on http://localhost:6009
16+
- `npm run build` to make a production-ready copy (you'll need to serve that yourself)
1717
- `npm run deploy` to update the `gh-pages` branch the public documentation is on.
1818

1919
## Contribution guideline
@@ -23,17 +23,14 @@ TBC - https://github.com/TheScienceMuseum/collectionsonline/wiki/Collaborator-co
2323
## Structure
2424

2525
```
26-
├── dist // built version of fractal, and select files for npm
27-
├── fractal // all the stuff for the fractal styleguide
28-
│ ├── components
29-
│ ├── docs
30-
│ └── theme // subtheme of Mandelbrot, with its own deps for recompiling
31-
├── public // static directory for serving fractal - all generated
32-
├── src // gets included in pkg
33-
│ ├── assets
34-
│ ├── js
35-
│ └── scss
36-
├── fractal.js // Fractal setup
26+
├── dist // built version of storybook, and select files for npm
27+
├── public // static directory for serving storybook - all generated
28+
├── src
29+
│ ├── assets // gets included in pkg
30+
│ ├── js // gets included in pkg
31+
│ ├── scss // gets included in pkg
32+
│ └── stories // storybook stories
33+
├── storybook // storybook config
3734
└── package.json
3835
```
3936

Diff for: deploy-to-gh-pages.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -e
55

66
# build
7-
npm run dist
7+
npm run build
88

99
# add readme
1010
cp gh-pages.md dist/readme.md

Diff for: fractal.config.js

-60
This file was deleted.

Diff for: fractal/components/_layout/footer.hbs

-4
This file was deleted.

Diff for: fractal/components/_layout/header.hbs

-11
This file was deleted.

Diff for: fractal/components/_preview-container.hbs

-8
This file was deleted.

Diff for: fractal/components/_preview-grid.hbs

-12
This file was deleted.

Diff for: fractal/components/_preview-raw.hbs

-5
This file was deleted.

Diff for: fractal/components/accordion/accordion.hbs

-14
This file was deleted.

Diff for: fractal/components/accordion/readme.md

-1
This file was deleted.

Diff for: fractal/components/audioplayer/audioplayer.config.js

-26
This file was deleted.

Diff for: fractal/components/audioplayer/audioplayer.hbs

-26
This file was deleted.

Diff for: fractal/components/button/button.config.js

-57
This file was deleted.

Diff for: fractal/components/button/button.hbs

-2
This file was deleted.

Diff for: fractal/components/button/readme.md

-13
This file was deleted.

Diff for: fractal/components/card/card.config.js

-28
This file was deleted.

Diff for: fractal/components/card/card.hbs

-20
This file was deleted.

0 commit comments

Comments
 (0)