Use pull request #11658 from 0xflotus/patch-1 for v6.5.0

189dd494a fixed overridden
03fc63e53 docs: fix various "overridden" in utility docs

Co-Authored-By: Nicolas Coden <nicolas@ncoden.fr>
Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/docs/pages/float-classes.md b/docs/pages/float-classes.md
index 66363c701a51c494aaf1cca1b22fdc67ee7887d6..07d38aacf72adb1ccb09097a0b59238457ff8c69 100644 (file)
--- a/docs/pages/float-classes.md
+++ b/docs/pages/float-classes.md
@@ -9,7 +9,7 @@ video: 'VEzXdMmqhAY'
 You can change the float behavior of an element by adding the `.float-left` or `.float-right` classes to an element. To clear floats, add the class `.clearfix` to the parent element.
 
 <div class="callout primary">
-  <p>Float Left/Right classes use `!important` to ensure they aren't overriden by more specific selectors. This framework conscientiously avoids using `!important` declarations. This is one of the few components that does.</p>
+  <p>Float Left/Right classes use `!important` to ensure they aren't overridden by more specific selectors. This framework conscientiously avoids using `!important` declarations. This is one of the few components that does.</p>
 </div>
 
 <div class="callout warning">

diff --git a/docs/pages/prototyping-utilities.md b/docs/pages/prototyping-utilities.md
index 5eb9ff5492a1b513eee6bb05b265942d437f19fb..cb85fbf79c8c0dcbd7db1c2ab72b994124ddf7a1 100644 (file)
--- a/docs/pages/prototyping-utilities.md
+++ b/docs/pages/prototyping-utilities.md
@@ -20,7 +20,7 @@ Not all projects require Prototyping Utilities and adding utility classes like t
 
 <div class="primary callout">
        <p>
-               Many Prototype classes use `!important` to ensure that these they aren't overriden by more specific selectors. This framework conscientiously avoids using `!important` declarations. Please note that we have only inserted `!important` on those specific **CSS** properties which in no case should be overridden.
+               Many Prototype classes use `!important` to ensure that these they aren't overridden by more specific selectors. This framework conscientiously avoids using `!important` declarations. Please note that we have only inserted `!important` on those specific **CSS** properties which in no case should be overridden.
        </p>
 </div>
 

diff --git a/docs/pages/typography-base.md b/docs/pages/typography-base.md
index 06b28ee7833cd5ccd64b39bde4f16e799f498bfd..8ecbd811754a761c3e5005900342010ffee4f3b3 100644 (file)
--- a/docs/pages/typography-base.md
+++ b/docs/pages/typography-base.md
@@ -378,5 +378,5 @@ On top of that, Foundation includes a couple of simple classes you can use to co
 <a class="" data-open-video="4:42"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
 
 <div class="callout primary">
-  <p>Print styles use `!important` to ensure they aren't overriden by more specific selectors. This framework conscientiously avoids using `!important` declarations. This is one of the few components that does.</p>
+  <p>Print styles use `!important` to ensure they aren't overridden by more specific selectors. This framework conscientiously avoids using `!important` declarations. This is one of the few components that does.</p>
 </div>

diff --git a/docs/pages/visibility.md b/docs/pages/visibility.md
index 381b89d1f0c6e2b50acbd61a9263f164ca02b48b..8f07ce23a7a736d7be5a66a78a2e6a782276f447 100644 (file)
--- a/docs/pages/visibility.md
+++ b/docs/pages/visibility.md
@@ -9,7 +9,7 @@ tags:
 ---
 
 <div class="callout primary">
-  <p>Visibility classes use `!important` to ensure they aren't overriden by more specific selectors. This framework conscientiously avoids using `!important` declarations. This is one of the few components that does.</p>
+  <p>Visibility classes use `!important` to ensure they aren't overridden by more specific selectors. This framework conscientiously avoids using `!important` declarations. This is one of the few components that does.</p>
 </div>
 
 <div class="callout warning">