Merge branch 'master' of github.com:Semantic-Org/Semantic-UI-Docs into next

jlukic · jlukic · commit 0cc605f0b359 · 2017-03-12T21:09:10.000-04:00
diff --git a/docpad.coffee b/docpad.coffee
@@ -29,7 +29,7 @@ docpadConfig = {
 			# Here are some old site urls that you would like to redirect from
 			oldUrls: [],
 
-			version: "2.2.6",
+			version: "2.2.9",
 
 			branch: "master",
 
diff --git a/server/documents/behaviors/form.html.eco b/server/documents/behaviors/form.html.eco
@@ -28,7 +28,7 @@ type        : 'UI Behavior'
       <h4 class="ui header">Specifying Validation Rules</h4>
       <p>Form validation requires passing in a validation object with the rules required to validate your form.</p>
       <div class="ui ignored info message">
-        A validation object includes a list of form elements, and rules to validate each field against. Fields are matched by either the <code>id</code>, <code>name</code>, or <code>data-validate</code>  property matching the identifier specified in the settings object.
+        A validation object includes a list of form elements, and rules to validate each field against. Fields are matched by either the <code>id</code>, <code>name</code>, or <code>data-validate</code>  property matching the identifier specified in the settings object. Validation objects must use either shorthand or longhand exclusively.
       </div>
       <div class="ignore code" data-title="Shorthand Validation">
       $('.ui.form')
diff --git a/server/documents/elements/container.html.eco b/server/documents/elements/container.html.eco
@@ -32,7 +32,7 @@ themes      : ['Default']
 
       <h3 class="ui header">Container Sizes</h3>
 
-      <p>Containers are designed to responsively adjust their maximum width based on the size of the screen they are appearing.</p>
+      <p>Containers are designed to responsively adjust their maximum width based on the size of the screen on which they are appearing.</p>
 
       <table class="ui celled definition table">
         <thead>
@@ -462,4 +462,4 @@ themes      : ['Default']
 
 
   <div class="main container"></div>
-</div>
+</div>
diff --git a/server/documents/elements/divider.html.eco b/server/documents/elements/divider.html.eco
@@ -37,6 +37,9 @@ themes      : ['default']
     <div class="ui info ignored message">
       A vertical divider will automatically swap to a horizontal divider at mobile resolutions when used inside a <a href="/collections/grid.html#stackable-grid"><code>stackable grid</code></a>
     </div>
+    <div class="ui warning ignored message">
+      There is a know bug of vertical dividers after a W3C update. Please read <a href="https://github.com/Semantic-Org/Semantic-UI/issues/4342" target="_blank" rel="nofollow">#4342</a> for more information
+    </div>
     <div class="ui three column very relaxed grid">
       <div class="column">
         <img class="ui wireframe image" src="/images/wireframe/short-paragraph.png">
@@ -205,4 +208,4 @@ themes      : ['default']
     </div>
   </div>
 
-</div>
+</div>
diff --git a/server/documents/elements/icon.html.eco b/server/documents/elements/icon.html.eco
@@ -1300,7 +1300,6 @@ themes      : ['Default']
         <div class="column"><i class="pied piper alternate icon"></i>Pied Piper Alternate</div>
         <div class="column"><i class="pied piper hat icon"></i>Pied Piper Hat</div>
         <div class="column"><i class="pinterest icon"></i>Pinterest</div>
-        <div class="column"><i class="pinterest icon"></i>Pinterest</div>
         <div class="column"><i class="pinterest square icon"></i>Pinterest Square</div>
         <div class="column"><i class="pocket icon"></i>Pocket</div>
         <div class="column"><i class="product hunt icon"></i>Product Hunt</div>
diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco
@@ -31,7 +31,7 @@ standalone : true
           <script type="text/javascript">
           window.twttr=(function(d,s,id){var t,js,fjs=d.getElementsByTagName(s)[0];if(d.getElementById(id)){return}js=d.createElement(s);js.id=id;js.src="https://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);return window.twttr||(t={_e:[],ready:function(f){t._e.push(f)}})}(document,"script","twitter-wjs"));
           </script>
-          <iframe class="github" src="http://ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+          <iframe class="github" src="//ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
           <% end %>
         </div>
         <div class="ui language floating dropdown link item" id="languages">
@@ -69,14 +69,14 @@ standalone : true
       <a href="/introduction/getting-started.html" class="ui huge inverted download button">
         Get Started
       </a>
-      <a href="/introduction/new.html" class="ui huge inverted basic button">New in 2.2 - June 2016</a>
+      <a href="/introduction/new.html" class="ui huge inverted basic button">New in 2.2</a>
     </div>
     <div class="inverted advertisement">
       <% unless 'development' in @getEnvironments(): %>
       <div id="carbonads-container">
         <div class="carbonad">
           <div id="azcarbon"></div>
-          <script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/51619/azcarbon_2_1_0_VERTDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script>
+          <script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "//engine.carbonads.com/z/51619/azcarbon_2_1_0_VERTDARK"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script>
         </div>
       </div>
       <% end %>
diff --git a/server/documents/introduction/getting-started.html.eco b/server/documents/introduction/getting-started.html.eco
@@ -124,12 +124,6 @@ type        : 'Main'
     <h4>Include in Your HTML</h4>
     <p>Running the gulp build tools will compile CSS and Javascript for use in your project. Just link to these files in your HTML along with the latest <a href="http://www.jquery.com" target="_blank">jQuery</a>.</p>
     <div class="ignored code" data-type="html" data-escape="true">
-      <script
-  src="https://code.jquery.com/jquery-3.1.1.min.js"
-  integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
-  crossorigin="anonymous"></script>
-
-      &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
       &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
       &lt;script
   src="https://code.jquery.com/jquery-3.1.1.min.js"
diff --git a/server/documents/modules/popup.html.eco b/server/documents/modules/popup.html.eco
@@ -867,7 +867,7 @@ themes      : ['Default']
           <td>onUnplaceable</td>
           <td>$module</td>
           <td>$popup</td>
-          <td>Callback after popup cannot be plaed on screen</td>
+          <td>Callback after popup cannot be placed on screen</td>
         </tr>
       </tbody>
     </table>
diff --git a/server/documents/test.html.eco b/server/documents/test.html.eco
@@ -142,7 +142,7 @@ type       : 'Library'
                 <div class="sub header">
                   <% if 'developments' in @getEnvironments(): %>
                   <% else: %>
-                  <iframe class="github" src="http://ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+                  <iframe class="github" src="//ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
                   <% end %>
                   <%=@document.description %>
                 </div>
@@ -431,4 +431,4 @@ type       : 'Library'
   <%- @partial('less') %>
 </body>
 
-</html>
+</html>
diff --git a/server/documents/usage/layout.html.eco b/server/documents/usage/layout.html.eco
@@ -43,7 +43,7 @@ type        : 'Usage'
       <div class="content">
         <div class="header">Grid</div>
         <div class="description">
-          An introduction to using Semantic UI grids
+          An introduction to using Semantic UI grids.
         </div>
       </div>
     </a>
@@ -54,7 +54,7 @@ type        : 'Usage'
       <div class="content">
         <div class="header">Attached Content</div>
         <div class="description">
-          Examples of content that can attach to other content
+          Examples of content that can attach to other content.
         </div>
       </div>
     </a>
@@ -65,7 +65,7 @@ type        : 'Usage'
       <div class="content">
         <div class="header">Bootstrap Migration</div>
         <div class="description">
-          Examples of replacements for components found in Bootstrap
+          Examples of replacements for components found in Bootstrap.
         </div>
       </div>
     </a>
@@ -81,7 +81,7 @@ type        : 'Usage'
       <div class="content">
         <div class="header">Homepage</div>
         <div class="description">
-          A simple, responsive homepage design with sidebar
+          A simple, responsive homepage design with sidebar.
         </div>
       </div>
     </a>
@@ -92,7 +92,7 @@ type        : 'Usage'
       <div class="content">
         <div class="header">Sticky Menus</div>
         <div class="description">
-         Using visibility APIs to fix content after passing position in page
+         Using visibility APIs to fix content after passing position in page.
         </div>
       </div>
     </a>
@@ -103,7 +103,7 @@ type        : 'Usage'
       <div class="content">
         <div class="header">Fixed Menu</div>
         <div class="description">
-          Using a fixed menu with page content
+          Using a fixed menu with page content.
         </div>
       </div>
     </a>
diff --git a/server/files/stylesheets/docs.css b/server/files/stylesheets/docs.css
@@ -2037,6 +2037,10 @@ code .chunk {
 }
 
 
+/*******************************
+        Advertisements
+*******************************/
+
 /* Rail Ad */
 #example .rail .advertisement {
   display: block;
@@ -2050,6 +2054,86 @@ code .chunk {
   width: auto;
 }
 
+#example .bsa-cpc {
+  height: 38px;
+}
+#example .bsa-cpc #_default_ {
+  position: relative;
+  border-bottom: solid 1px #dddddd;
+  text-align: center;
+  font-size: 14px;
+  line-height: 1.5;
+  transition: background 0.3s ease;
+}
+#example .bsa-cpc #_default_:hover {
+  background-color: #FAFAFA;
+}
+
+#example .bsa-cpc .default-ad {
+  display: none;
+}
+
+#example .bsa-cpc ._default_ {
+  display: inline-block;
+  overflow: hidden;
+  padding: 10px 3em;
+  max-width: 1044px;
+  color: #415a5a;
+  text-align: left;
+  line-height: 1;
+  margin-right: 344px;
+  display: block;
+}
+
+#example .bsa-cpc ._default_ > * {
+  vertical-align: middle;
+}
+
+#example .bsa-cpc a {
+  text-decoration: none;
+}
+
+#example .bsa-cpc .default-image {
+  display: inline-block;
+  margin-right: 6px;
+  line-height: 0;
+}
+
+#example .bsa-cpc .default-image img {
+  height: 18px;
+  border-radius: 3px;
+}
+
+#example .bsa-cpc .default-title:after {
+  content: " — ";
+}
+
+#example .bsa-cpc .default-title,
+#example .bsa-cpc .default-description {
+  display: inline;
+}
+
+#example .bsa-cpc .default-title {
+  position: relative;
+  font-weight: 600;
+}
+
+#example .bsa-cpc .default-description:after {
+  position: relative;
+  top: 0px;
+  right: 0px;
+  padding: 4px 6px;
+  float: right;
+  border-radius: 3px;
+  background-color: #848484;
+  color: #fff;
+  content: "Ad";
+  text-transform: uppercase;
+  font-size: 9px;
+  font-family: Verdana, sans-serif;
+}
+
+
 
 /*******************************
           Responsive
@@ -2135,6 +2219,9 @@ code .chunk {
     padding-left: 3em;
     padding-right: 0em;
   }
+  #example .bsa-cpc ._default_ {
+    margin-right: 0px;
+  }
 }
 
 /* Squish Content (Just For Small Computers) */
@@ -2315,6 +2402,12 @@ code .chunk {
           flex: 1 0 auto;
   }
 
+  /* Ad Label */
+  #example .bsa-cpc ._default_ {
+    padding-left: 1em;
+    padding-right: 1em;
+  }
+
   /* Let Buttons Vertically Stack */
   #example .masthead .button {
     margin-bottom: 0.75em;
diff --git a/server/partials/examples/single/flag-menu.html b/server/partials/examples/single/flag-menu.html
@@ -33,7 +33,7 @@
         <div class="item" data-value="bn"><i class="bn flag"></i>Brunei</div>
         <div class="item" data-value="bg"><i class="bg flag"></i>Bulgaria</div>
         <div class="item" data-value="bf"><i class="bf flag"></i>Burkina Faso</div>
-        <div class="item" data-value="ar"><i class="ar flag"></i>Burma</div>
+        <div class="item" data-value="mm"><i class="mm flag"></i>Burma</div>
         <div class="item" data-value="bi"><i class="bi flag"></i>Burundi</div>
         <div class="item" data-value="tc"><i class="tc flag"></i>Caicos Islands</div>
         <div class="item" data-value="kh"><i class="kh flag"></i>Cambodia</div>
@@ -241,4 +241,4 @@
         <div class="item" data-value="ye"><i class="ye flag"></i>Yemen</div>
         <div class="item" data-value="zm"><i class="zm flag"></i>Zambia</div>
         <div class="item" data-value="zw"><i class="zw flag"></i>Zimbabwe</div>
-      </div>
+      </div>
diff --git a/server/partials/fixed-menu.html.eco b/server/partials/fixed-menu.html.eco
@@ -17,7 +17,7 @@
       <% if 'development' in @getEnvironments(): %>
       <% else: %>
       <div class="vertically fitted borderless item">
-        <iframe class="github" src="http://ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+        <iframe class="github" src="//ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
       </div>
       <% end %>
       <!--
diff --git a/server/partials/header.html.eco b/server/partials/header.html.eco
@@ -18,9 +18,9 @@
             data-via="semanticui">
           </a>
           <script type="text/javascript">
-          window.twttr=(function(d,s,id){var t,js,fjs=d.getElementsByTagName(s)[0];if(d.getElementById(id)){return}js=d.createElement(s);js.id=id;js.src="https://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);return window.twttr||(t={_e:[],ready:function(f){t._e.push(f)}})}(document,"script","twitter-wjs"));
+          window.twttr=(function(d,s,id){var t,js,fjs=d.getElementsByTagName(s)[0];if(d.getElementById(id)){return}js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);return window.twttr||(t={_e:[],ready:function(f){t._e.push(f)}})}(document,"script","twitter-wjs"));
           </script>
-          <iframe class="github" src="http://ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
+          <iframe class="github" src="//ghbtns.com/github-btn.html?user=semantic-org&amp;repo=semantic-ui&amp;type=watch&amp;count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
           <% end %>
           <%=@document.description %>
         </div>
@@ -178,3 +178,16 @@
     <% end %>
   </div>
 </div>
+  <script src="//m.servedby-buysellads.com/monetization.js" type="text/javascript"></script>
+  <div class="bsa-cpc"></div>
+  <script>
+    (function(){
+      if(typeof _bsa !== 'undefined' && _bsa) {
+      _bsa.init('default', 'CVAIKK7I', 'placement:semanticuicom', {
+        target: '.bsa-cpc',
+        align: 'horizontal',
+        disable_css: 'true'
+      });
+        }
+    })();
+  </script>
diff --git a/server/partials/tab-header.html.eco b/server/partials/tab-header.html.eco
@@ -14,7 +14,7 @@
       <% end %>
     </div>
     <div class="advertisement">
-      <div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/51619/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
+      <div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "//engine.carbonads.com/z/51619/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div>
     </div>
   </div>
-</div>
+</div>
diff --git a/server/partials/transifex.html.eco b/server/partials/transifex.html.eco
@@ -14,5 +14,5 @@
     ignore_class : ['code', 'anchor']
   };
 </script>
-<script type="text/javascript" src="http://cdn.transifex.com/live.js"></script>
-<% end %>
+<script type="text/javascript" src="//cdn.transifex.com/live.js"></script>
+<% end %>
