Browse Source

Merge branch 'master' into 4.7.0

Dave Gandy 8 years ago
parent
commit
9fe5852ce8
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/_includes/examples/bordered-pulled.html
  2. 1 1
      src/whats-new.html

+ 2 - 2
src/_includes/examples/bordered-pulled.html

@@ -10,7 +10,7 @@
     <div class="col-md-3 col-sm-4">
     <div class="col-md-3 col-sm-4">
       <p>
       <p>
         <i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
         <i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
-        &hellip;tomorrow we will run faster, stretch out our arms farther&hellip; And then one fine morning
+        &hellip;tomorrow we will run faster, stretch out our arms farther&hellip; And then one fine morning&mdash;
         So we beat on, boats against the current, borne back ceaselessly into the past.
         So we beat on, boats against the current, borne back ceaselessly into the past.
       </p>
       </p>
     </div>
     </div>
@@ -22,7 +22,7 @@
 {% highlight html %}
 {% highlight html %}
 <i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
 <i class="fa fa-quote-left fa-3x fa-pull-left fa-border" aria-hidden="true"></i>
 ...tomorrow we will run faster, stretch out our arms farther...
 ...tomorrow we will run faster, stretch out our arms farther...
-And then one fine morning So we beat on, boats against the
+And then one fine morning&mdash; So we beat on, boats against the
 current, borne back ceaselessly into the past.
 current, borne back ceaselessly into the past.
 {% endhighlight %}
 {% endhighlight %}
     </div>
     </div>

+ 1 - 1
src/whats-new.html

@@ -23,7 +23,7 @@ relative_path: ../
   <div class="row feature-list">
   <div class="row feature-list">
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">
       <h4><i class="fa fa-universal-access" aria-hidden="true"></i> <a href="{{ page.relative_path }}accessibility">Accessibility Docs</a></h4>
       <h4><i class="fa fa-universal-access" aria-hidden="true"></i> <a href="{{ page.relative_path }}accessibility">Accessibility Docs</a></h4>
-      Details on how to mark up your icons depending on how youre using them.
+      Details on how to mark up your icons depending on how you're using them.
       Make your site icons usable by the most people, and start here.
       Make your site icons usable by the most people, and start here.
     </div>
     </div>
     <div class="col-md-4 col-sm-6">
     <div class="col-md-4 col-sm-6">