]> 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 | patch | inline | side by side (parent: 352d597)
adds docs about using select menu
authorRafiBomb <rafi@zurb.com>
Thu, 7 Apr 2016 18:18:08 +0000 (11:18 -0700)
committerRafiBomb <rafi@zurb.com>
Thu, 7 Apr 2016 18:18:08 +0000 (11:18 -0700)
docs/pages/callout.md patch | blob | blame | history
docs/pages/forms.md patch | blob | blame | history
test/visual/flex-grid/column-row.html patch | blob | blame | history
test/visual/flex-grid/nesting.html patch | blob | blame | history
test/visual/grid/nesting.html patch | blob | blame | history

diff --git a/docs/pages/callout.md b/docs/pages/callout.md
index 6ddb9323fba3ffa4a230287c3c7ca0506e62faf8..f2959251e07cade7a2e89edffc62674c5ac6d1b4 100644 (file)
--- a/docs/pages/callout.md
+++ b/docs/pages/callout.md
@@ -27,38 +27,38 @@ Callouts can be colored using the `.secondary`, `.primary`, `.success`, `.warnin
 
 ```html
 <div class="callout secondary">
-  <h5>This is a secondary panel</h5>
+  <h5>This is a secondary callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
 ```
 
 <div class="callout secondary">
-  <h5>This is a secondary panel</h5>
+  <h5>This is a secondary callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
 
 <div class="primary callout">
-  <h5>This is a primary panel</h5>
+  <h5>This is a primary callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
 
 <div class="success callout">
-  <h5>This is a success panel</h5>
+  <h5>This is a success callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
 
 <div class="warning callout">
-  <h5>This is a warning panel</h5>
+  <h5>This is a warning callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
 
 <div class="alert callout">
-  <h5>This is an alert panel</h5>
+  <h5>This is an alert callout</h5>
   <p>It has an easy to override visual style, and is appropriately subdued.</p>
   <a href="#">It's dangerous to go alone, take this.</a>
 </div>
diff --git a/docs/pages/forms.md b/docs/pages/forms.md
index 47b09bdec6ef6bbb954b60853a2c6b6f6b0f8196..b933706b9fd372412e6922faeb1e08fbadcd9c03 100644 (file)
--- a/docs/pages/forms.md
+++ b/docs/pages/forms.md
@@ -82,7 +82,7 @@ Use select menus to combine many choices into one menu.
 </label>
 ```
 
-Add the `multiple` attribute to allow more than one option to be selected.
+Add the `multiple` attribute to allow more than one option to be selected. Hold down the Ctrl (windows) / Command (Mac) button to select multiple options.
 
 ```html_example
 <label>Multiple Select Menu
diff --git a/test/visual/flex-grid/column-row.html b/test/visual/flex-grid/column-row.html
index 5f40c4a129d2eeedc8ba3448df23e90c25539a87..2ff657e0acfeb0998c42c695f580ed2a50368838 100644 (file)
--- a/test/visual/flex-grid/column-row.html
+++ b/test/visual/flex-grid/column-row.html
@@ -9,6 +9,7 @@
   </head>
   <body>
     <div class="row column">
+      <style>.row.column {border: 1px solid #333;}</style>
       <h1>Flex Grid: Column Row</h1>
 
       <p>This text is inside a combined column/row.</p>
diff --git a/test/visual/flex-grid/nesting.html b/test/visual/flex-grid/nesting.html
index 5ba08049190ff7377350d60060ed040ba5011f52..e5992db204927649590e475b645864d96c09ba18 100644 (file)
--- a/test/visual/flex-grid/nesting.html
+++ b/test/visual/flex-grid/nesting.html
@@ -8,7 +8,7 @@
     <link href="../assets/css/foundation-flex.css" rel="stylesheet" />
     <style>
       .test-1 {
-        background: #eee;
+        border: 1px solid #333;
       }
 
       .test-2 {
diff --git a/test/visual/grid/nesting.html b/test/visual/grid/nesting.html
index caab9b814852a8eea85a1ddc678057978e4fc0b9..9bf558812c80c1e01bc5ea5d3a49eb4a64769d7e 100644 (file)
--- a/test/visual/grid/nesting.html
+++ b/test/visual/grid/nesting.html
@@ -8,7 +8,7 @@
     <link href="../assets/css/foundation.css" rel="stylesheet" />
     <style>
       .test-1 {
-        background: #eee;
+        background: red;
       }
 
       .test-2 {
@@ -27,7 +27,7 @@
 
     <div class="row expanded test-1">
       <div class="column">
-        <div class="row test-2">
+        <div class="row expanded test-2">
           <div class="column">
             <p>This is a grid.</p>
           </div>
Mirror of https://github.com/foundation/foundation-sites.git