Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
377afbb
Add config manager module as a dependency
davidcmoulton Jan 15, 2019
10607d1
Update Gulp file to use @libero/pattern-library-config-manager from npm
davidcmoulton Jan 16, 2019
72ec0a0
Update config manager dependency
davidcmoulton Jan 16, 2019
dbe12c1
Update config manager dependency
davidcmoulton Jan 16, 2019
b784334
Update config manager dependency
davidcmoulton Jan 16, 2019
cbe75ad
Delete obsolete built-in config generation
davidcmoulton Jan 16, 2019
a5e2768
Remove references to obsolete built-in config generation
davidcmoulton Jan 17, 2019
b2e4a32
Add font-size mixin with tests
davidcmoulton Jan 17, 2019
64285cf
Update config manager to latest version for it sass string export change
davidcmoulton Jan 18, 2019
ee4be32
Add font-family mixin with tests
davidcmoulton Jan 18, 2019
abe72e0
Introduce get-font-size sass function
davidcmoulton Jan 18, 2019
dcd8988
Improve test fixture
davidcmoulton Jan 18, 2019
166c0ef
Reset reference to a subject under test (sass)
davidcmoulton Jan 18, 2019
e83c283
Update .gitignore to ignore .sass-cache/ everywhere
davidcmoulton Jan 18, 2019
e9a7fa5
Improve font-family mixin
davidcmoulton Jan 18, 2019
ff959a0
Tweak style lint rules
davidcmoulton Jan 18, 2019
632e74a
Use css custom properties in font-family mixin
davidcmoulton Jan 18, 2019
79bd471
Improve font-size mixin, allow rem-based numbers
davidcmoulton Jan 21, 2019
5d64246
Add set-color mixin
davidcmoulton Jan 21, 2019
95fb46c
Add set-background-color mixin
davidcmoulton Jan 21, 2019
28edc84
Improve internals of color handling
davidcmoulton Jan 21, 2019
1aff125
Bug fix in @font-family mixin
davidcmoulton Jan 21, 2019
bdc6881
Improve test wording
davidcmoulton Jan 21, 2019
9f2cb7f
Parameter order
davidcmoulton Jan 21, 2019
c42e421
Rework label-content-typography mixin with tests
davidcmoulton Jan 21, 2019
12bcaf4
Minor improvements and tests
davidcmoulton Jan 21, 2019
41e393a
Improve test wording
davidcmoulton Jan 22, 2019
293fd04
Nesting
davidcmoulton Jan 22, 2019
f951419
Consolidate heading typography mixins; use heading css custom properties
davidcmoulton Jan 22, 2019
3c6520d
Streamline sass heading mixin a bit
davidcmoulton Jan 22, 2019
72a8051
Update normalise to use function to get a map-defined color
davidcmoulton Jan 22, 2019
53081db
Add function to get baseline grid measures from map
davidcmoulton Jan 22, 2019
e0bd4f3
Remove obsolete comment
davidcmoulton Jan 22, 2019
30ab5ce
Add function to get breakpoint from the breakpoint map
davidcmoulton Jan 22, 2019
0e2e017
Use updated config names
davidcmoulton Jan 22, 2019
05cf864
Add tests for set-font-size-and-vertical-height
davidcmoulton Jan 22, 2019
fde5765
Merge branch 'master' into use-config-module
davidcmoulton Jan 23, 2019
d270ac8
Simplify, and add tests for, blg-spacing mixin
davidcmoulton Jan 23, 2019
fc5efca
Add accessor for grid map
davidcmoulton Jan 23, 2019
589200f
Remove parentheses from spacing mixin signatures that don't take params
davidcmoulton Jan 23, 2019
1e6ffa8
Merge branch 'master' into use-config-module
davidcmoulton Jan 28, 2019
4e6e3e7
Merge remote-tracking branch 'libero/master' into use-config-module
davidcmoulton Mar 20, 2019
a9a6b96
Fix sass import loop
davidcmoulton Mar 20, 2019
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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/.sass-cache/
/**/*.sass-cache/
/export/
/node_modules/
/pattern-library-*.tar.gz
Expand Down
6 changes: 6 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
"color-hex-length": "short",
"color-no-invalid-hex": true,
"comment-empty-line-before": "always",
"declaration-block-no-duplicate-properties": [
true,
{
"ignore": ["consecutive-duplicates-with-different-values"]
}
],
"csstools/use-logical": "always",
"declaration-block-semicolon-newline-after": "always",
"declaration-block-semicolon-space-before": "never",
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ COPY .babelrc \
.stylelintrc \
gulpfile.babel.js \
./
COPY libero-config/ libero-config/
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the actual config should remain here...

COPY --from=npm /app/node_modules/ node_modules/
COPY test/ test/
COPY source/ source/
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ Developer quick start: running `docker-compose down --volumes && docker-compose

#### Uses of configuration
Configuration is used to be the single source of truth for knowledge that needs to be shared across across front end technology boundaries. For example, media query breakpoint values need to exist in the styling layer, but they are also often needed by JavaScript. Note that for flexibility all configuration could be maintained using this system in order to make it easier to later distribute configuration if it suddenly becomes necessary.

#### Anatomy of configuration
(All config file code examples are taken from `/libero-config/config--libero-default.js`.)

##### Simple example
`config.data` is where you define your configuration data.
Expand Down
1 change: 0 additions & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ services:
target: gulp
command: bash -c "npx gulp assemble --environment=development --sass-lint=${LINT_SASS} && npx gulp watch --environment=development --sass-lint=${LINT_SASS}"
volumes:
- ./libero-config:/app/libero-config
- ./source:/app/source
watch-build:
build:
Expand Down
7 changes: 4 additions & 3 deletions gulpfile.babel.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import browserSync from 'browser-sync';
import del from 'del';
import distributeConfig from './libero-config/bin/distributeConfig';
import distributeConfig from '@libero/pattern-library-config-manager';
import flatten from 'gulp-flatten';
import gulp from 'gulp';
import minimist from 'minimist';
Expand Down Expand Up @@ -206,9 +206,10 @@ const watchSass = () => gulp.watch(config.files.src.sass, build);

const watchSassTests = () => gulp.watch(config.files.test.sass, build);

const watchSharedConfig = () => gulp.watch('libero-config/**/*', distributeSharedConfig);
// TODO: replace with new watcher once config override arrangement decided
// const watchSharedConfig = () => gulp.watch('libero-config/**/*', distributeSharedConfig);

export const watch = gulp.parallel(watchSass, watchSassTests, watchSharedConfig);
export const watch = gulp.parallel(watchSass, watchSassTests/*, watchSharedConfig */);

// Server

Expand Down
1 change: 0 additions & 1 deletion libero-config/.babelrc

This file was deleted.

84 changes: 0 additions & 84 deletions libero-config/bin/ConfigGenerator.js

This file was deleted.

37 changes: 0 additions & 37 deletions libero-config/bin/distributeConfig.js

This file was deleted.

21 changes: 0 additions & 21 deletions libero-config/bin/isMergeableObject.js

This file was deleted.

5 changes: 0 additions & 5 deletions libero-config/configRegister.json

This file was deleted.

Loading