Commits · master · Peter Walter / visual-framework

05 Nov, 2018 4 commits
- Merge branch 'fix-npm-dependencies' into 'master' · b7a8844d
  Ken Hawkins authored Nov 05, 2018
```
fix npm dependency

See merge request grp-stratcom/visual-framework!120
```
  b7a8844d
- fix gulp 4 dependency · f554a765
  Peter Walter authored Nov 05, 2018
  
  f554a765
- Merge branch 'deploy-to-aws' into 'master' · 8b0574e7
  Ken Hawkins authored Nov 05, 2018
```
add deployment to aws, tidy up .gitlabci and prepare for prod deployment

See merge request grp-stratcom/visual-framework!119
```
  8b0574e7
- add deployment to aws, tidy up .gitlabci and prepare for prod deployment · 1d263fd0
  Peter Walter authored Nov 05, 2018
  
  1d263fd0
26 Oct, 2018 12 commits

Merge branch 'develop' into 'master' · 5b0cfcd2
Ken Hawkins authored Oct 26, 2018
```
release/v0.2.0-alpha.1

See merge request grp-stratcom/visual-framework!118
```
5b0cfcd2

Merge branch 'master' into 'develop' · 37a07940

Ken Hawkins authored Oct 26, 2018

# Conflicts:
#   .gitignore
#   assets/scss/styles.scss
#   components/blocks/vf-global-header/vf-global-header.hbs
#   components/blocks/vf-global-header/vf-global-header.scss
#   components/blocks/vf-masthead/vf-masthead.hbs
#   components/blocks/vf-tabs/vf-tabs.scss
#   components/elements/vf-heading/vf-heading.scss
#   components/elements/vf-logo/vf-logo.config.yml
#   components/elements/vf-logo/vf-logo.hbs
#   components/elements/vf-logo/vf-logo.scss
#   fractal.js
#   tools/frctl-mandelbrot-embl-subtheme/views/macros/status.nunj
#   tools/frctl-mandelbrot-embl-subtheme/views/partials/header.nunj
#   tools/frctl-mandelbrot-embl-subtheme/views/partials/pen/preview.nunj

37a07940

Merge branch 'documentation/v0.2.0-alpha.1' into 'develop' · 6fec1354
Ken Hawkins authored Oct 26, 2018
```
documentation/v0.2.0-alpha.1

See merge request grp-stratcom/visual-framework!117
```
6fec1354
documentation/v0.2.0-alpha.1 · b51c9462
Ken Hawkins authored Oct 26, 2018
```
Cut the nots
```
b51c9462
Merge branch 'documentation/versioning' into 'develop' · f7d3da9d
Stu Robson authored Oct 26, 2018
```
documentation/versioning

See merge request grp-stratcom/visual-framework!113
```
f7d3da9d
Merge branch 'updates/UI' into 'develop' · b338dd3b
Stu Robson authored Oct 26, 2018
```
adds a few UI tweaks

See merge request grp-stratcom/visual-framework!116
```
b338dd3b
adds shame file for undetermined CSS · 5e9644dc
Stu Robson authored Oct 26, 2018

5e9644dc
Merge branch 'update/tags' into 'develop' · b0b8de69
Stu Robson authored Oct 26, 2018
```
updates vf-tags element

See merge request grp-stratcom/visual-framework!115
```
b0b8de69
updates vf-tags element · d3037a0b
Stu Robson authored Oct 26, 2018

d3037a0b

Merge branch 'update/logo' into 'develop' · 5808b6ed

Stu Robson authored Oct 26, 2018

updates logo to an actual image and removes European Molecular Biology Laboratory

See merge request grp-stratcom/visual-framework!114

5808b6ed

updates logo to an actual image and removes European Molecular Biology Laboratory · 6021f36b
Stu Robson authored Oct 26, 2018

6021f36b

documentation/versioning · a6c63d44

Ken Hawkins authored Oct 26, 2018

Add some notes about how we plan to version.

#changelog #documentation #versioning

a6c63d44

25 Oct, 2018 23 commits
- Merge branch 'updates/masthead' into 'develop' · 99886f34
  Stu Robson authored Oct 25, 2018
```
updates masthead

See merge request grp-stratcom/visual-framework!112
```
  99886f34
- Merge branch 'updates/tabLinkColor' into 'develop' · da98e50a
  Stu Robson authored Oct 25, 2018
```
updates text link colour for UI tabs

See merge request grp-stratcom/visual-framework!111
```
  da98e50a
- Merge branch 'updates/globalHeader' into 'develop' · d377331d
  Stu Robson authored Oct 25, 2018
```
updates global header to use vf-logo

See merge request grp-stratcom/visual-framework!110
```
  d377331d
- Merge branch 'dev/UI' into 'develop' · bf57a279
  Stu Robson authored Oct 25, 2018
```
updates component library UI

See merge request grp-stratcom/visual-framework!108
```
  bf57a279
- Merge branch 'updates/gridSpacing' into 'develop' · 57801884
  Stu Robson authored Oct 25, 2018
```
Updates grid spacing

See merge request grp-stratcom/visual-framework!107
```
  57801884
- Updates grid spacing · a6fcba7d
  Stu Robson authored Oct 25, 2018
  
  a6fcba7d
- Merge branch 'pattern/logo' into 'develop' · a985c72f
  Stu Robson authored Oct 25, 2018
```
adds proper EMBL logo pattern

See merge request grp-stratcom/visual-framework!106
```
  a985c72f
- adds proper EMBL logo pattern · fd4cf9c4
  Stu Robson authored Oct 25, 2018
  
  fd4cf9c4
- Merge branch 'dev/perPatternVariables' into 'develop' · 25a535e7
  Stu Robson authored Oct 25, 2018
```
starts adding per pattern variables within the .scss file

See merge request grp-stratcom/visual-framework!105
```
  25a535e7
- starts adding per pattern variables within the .scss file · 41bcf45e
  Stu Robson authored Oct 25, 2018
  
  41bcf45e
- updates masthead to use grid and have a black background for heading text · 4869a443
  Stu Robson authored Oct 25, 2018
  
  4869a443
- updates text link colour for UI tabs · 856a5a3f
  Stu Robson authored Oct 25, 2018
  
  856a5a3f
- updates global header to use vf-logo · 22b77477
  Stu Robson authored Oct 25, 2018
  
  22b77477
- updates UI of component library · b174ea19
  Stu Robson authored Oct 25, 2018
  
  b174ea19
- updates grid column gap so they're all the same · 873c53da
  Stu Robson authored Oct 25, 2018
  
  873c53da
- adds updated logo pattern · 3ac72ee6
  Stu Robson authored Oct 25, 2018
  
  3ac72ee6
- adds index.scss and package.json for utility classes · 9d6a001e
  Stu Robson authored Oct 25, 2018
  
  9d6a001e
- tidies up component view in framework · cb8a6664
  Stu Robson authored Oct 25, 2018
  
  cb8a6664
- adds squre tag, and adds per pattern variables · b250447c
  Stu Robson authored Oct 25, 2018
  
  b250447c
- updates background color to be the hex version of the ruby red · e5df9e43
  Stu Robson authored Oct 25, 2018
  
  e5df9e43
- splits out utility mixins and creates a single import file · e39f6a34
  Stu Robson authored Oct 25, 2018
  
  e39f6a34
- some per pattern variables · 6a38da17
  Stu Robson authored Oct 25, 2018
  
  6a38da17
- updates package.json to include urls and filenames · 7720fd33
  Stu Robson authored Oct 25, 2018
  
  7720fd33
24 Oct, 2018 1 commit
- fixes linting issue by adding // sass-lint:disable force-element-nesting · 1bc36c1c
  Stu Robson authored Oct 24, 2018
  
  1bc36c1c