Merge pull request #31 from himedlooff/gh-pages

Fixes typo.
cfpb · Aug 12, 2014 · 1d7dbf3 · 1d7dbf3
2 parents 609bb2f + 3ac2e3b
commit 1d7dbf3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/demo/static/css/main.css b/demo/static/css/main.css
diff --git a/docs/index.html b/docs/index.html
@@ -19,7 +19,7 @@ <h1 class="docs-title"><span class="docs-icon">&lt;/&gt;</span> cf-expandables d
       <h2 class="docs-component_header"><span>Recommended expandable pattern</span></h2>
       <div class="docs-component_intro">
         <ul class="docs-notes">
-          <li>Expandables can be built by combing the basic barebones structure described in the next section along with more specialized expandable elements and modifiers described throughout.</li>
+          <li>Expandables can be built by combining the basic barebones structure described in the next section along with more specialized expandable elements and modifiers described throughout.</li>
           <li>The following combination is our recommended go-to expandable pattern.</li>
         </ul>
       </div>

diff --git a/docs/static/css/main.css b/docs/static/css/main.css
diff --git a/src/less/cf-expandables.less b/src/less/cf-expandables.less
@@ -8,7 +8,7 @@
     name: Recommended expandable pattern
     family: cf-expandables
     notes:
-      - "Expandables can be built by combing the basic barebones structure
+      - "Expandables can be built by combining the basic barebones structure
          described in the next section along with more specialized expandable
          elements and modifiers described throughout."
       - "The following combination is our recommended go-to expandable pattern."