]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge pull request #8988 from andycochran/accordion-title-font-size
authorRafi <rafibomb@users.noreply.github.com>
Mon, 11 Jul 2016 17:13:41 +0000 (10:13 -0700)
committerGitHub <noreply@github.com>
Mon, 11 Jul 2016 17:13:41 +0000 (10:13 -0700)
add settings variable for accordion title font size

1  2 
scss/components/_accordion.scss
scss/settings/_settings.scss

index fed5c30e8a3d5ff3e9b9ada3d7db9f5c4568203f,9037cd10e922a0e359e132b5b92b4567153d0e61..d5352e0968b06649e543515f1e8bbd30d8674fee
@@@ -65,16 -61,10 +69,16 @@@ $accordion-content-padding: 1rem !defau
    display: block;
    padding: $accordion-item-padding;
    line-height: 1;
-   font-size: rem-calc(12);
+   font-size: $accordion-title-font-size;
    color: $accordion-item-color;
    position: relative;
 -  border-bottom: $accordion-content-border;
 +  border: $accordion-content-border;
 +  border-bottom: 0;
 +
 +  :last-child:not(.is-active) > & {
 +    border-radius: 0 0 $global-radius $global-radius;
 +    border-bottom: $accordion-content-border;
 +  }
  
    &:hover,
    &:focus {
Simple merge