]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into feature/buttongroup-flex 11871/head
authorDaniel Ruf <827205+DanielRuf@users.noreply.github.com>
Sat, 19 Oct 2019 14:32:20 +0000 (16:32 +0200)
committerGitHub <noreply@github.com>
Sat, 19 Oct 2019 14:32:20 +0000 (16:32 +0200)
1  2 
docs/assets/scss/docs.scss
docs/pages/button-group.md
scss/components/_button-group.scss

index 6ac2f8316d02c49a619c342ff7cfa177c717d431,f0446902b217d017cfe2bc8f0f6f624a571d49ba..9d623e8f6c4d9f3ee9b5c67b2404e2971e77a25c
  @include foundation-meter-element;
  @include motion-ui-transitions;
  
+ $foundation-dark: #074E68 ;
+ $true-white: #fff;
  @import 'foundation-docs';
+ @import 'content/install';
 +@import 'examples/buttons';
  @import 'examples/grid';
  @import 'examples/motion-ui';
  @import 'examples/off-canvas';
Simple merge
Simple merge