]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
projects / thirdparty / foundation / foundation-sites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 318bdb4 e5548ef)
Merge branch 'develop' into fix-opens-left-styling 8200/head
authorKevin Ball <kmball11@gmail.com>
Thu, 18 Feb 2016 22:30:45 +0000 (14:30 -0800)
committerKevin Ball <kmball11@gmail.com>
Thu, 18 Feb 2016 22:30:45 +0000 (14:30 -0800)
1  2 
js/foundation.drilldown.js patch | diff1 | diff2 | blob | history
scss/components/_menu.scss patch | diff1 | diff2 | blob | history
scss/foundation.scss patch | diff1 | diff2 | blob | history
test/visual/index.html patch | diff1 | diff2 | blob | history

diff --cc js/foundation.drilldown.js
Simple merge
diff --cc scss/components/_menu.scss
Simple merge
diff --cc scss/foundation.scss
Simple merge
diff --cc test/visual/index.html
index e8f526479db1db3c90ae252708dfb7e4bba21e8d,83d37e31e0c8349453e2f66222220cb49a4c887a..313c5349dfb6a96efc0b7fc06157d303362bc4a1
--- 1/test/visual/index.html
--- 2/test/visual/index.html
+++ b/test/visual/index.html
@@@ -10,16 -10,8 +10,17 @@@
    <body>
      <div class="row column">
        <h1>Foundation for Sites Component Testing</h1>
 -      <ul>
 +      <ul class="menu vertical">
 +        <li><a href="responsive-menu.html">Responsive Menu - Drilldown Medium Dropdown</a></li>
 +        <li><a href="responsive-menu-right-dropdown.html">Responsive Menu - Right Dropdown</a></li>
 +        <li><a href="responsive-menu-left-dropdown.html">Responsive Menu - Left Dropdown</a></li>
+         <li><a href="reveal.html">Reveal</a></li>
 +        <li><a href="various-menu-options.html">Various Menu Options</a></li>
 +      </ul>
 +
 +      <h1>Foundation for Sites Flexbox Component Testing</h1>
 +      <ul class="menu vertical">
 +        <li><a href="various-menu-options-flex.html">Various Menu Options With Flexbox</a></li>
        </ul>
      </div>
  
Mirror of https://github.com/foundation/foundation-sites.git