]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'prototype/sepration-from-core' of git://github.com/IamManchanda/foundat...
authorRafiBomb <rafi@zurb.com>
Tue, 30 May 2017 17:29:41 +0000 (10:29 -0700)
committerRafiBomb <rafi@zurb.com>
Tue, 30 May 2017 17:29:41 +0000 (10:29 -0700)
1  2 
docs/assets/scss/docs.scss
docs/pages/float-classes.md
docs/pages/typography-helpers.md
docs/pages/visibility.md
scss/_global.scss
scss/foundation.scss

Simple merge
Simple merge
index d671b4913db1f091b5bdc988aacee255243c8409,ae8f1c73e918d736c4dc6f03b9ae87f7acb38417..6f7dfc4b8c6f5147b9f82ab73c241eecc7ac68f3
@@@ -86,16 -65,10 +90,18 @@@ A slightly-larger-than-normal block of 
  
  ## Un-bulleted List
  
- In Foundation, the `<ul>` is a bulleted list by default, but you can add the class `.no-bullet` to remove the bullets.
+ In Foundation, the `<ul>` is a bulleted list and `<ol>` is a numbered list by default, but you can add the class `.no-bullet` to remove the bullets and numbers respectively.
+ #### Unordered List
  
 +<p>
 +  <a class="" data-open-video="5:18"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
 +</p>
 +
 +<div class="docs-codepen-container">
 +  <a class="codepen-logo-link" href="http://codepen.io/IamManchanda/pen/wdxyxb?editors=1000" target="_blank"><img src="{{root}}assets/img/logos/edit-in-browser.svg" class="" height="" width="" alt="edit on codepen button"></a>
 +</div>
 +
  ```html_example
  <ul class="no-bullet">
    <li>List item with a much longer description or more content.</li>
Simple merge
Simple merge
Simple merge