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

server/documents/behaviors/visibility.html.eco

@@ -100,7 +100,7 @@ type        : 'UI Behavior'
       <p>By default images will appear without animation, however you can also specify a named <a href="/modules/transition.html">transition</a>, and a duration that should be used for animating the image into view</p>
 
       <div class="evaluated code" data-type="javascript">
-        $('.demo.items img')
+        $('.demo.items .image img')
           .visibility({
             type       : 'image',
             transition : 'fade in',
@@ -317,7 +317,7 @@ type        : 'UI Behavior'
     </div>
   </div>
 
-  <div class="ui overview tab" data-tab="usage">
+  <div class="ui tab" data-tab="usage">
 
     <h2 class="ui header">Usage</h2>
 

server/files/stylesheets/docs.css

@@ -188,12 +188,17 @@ a:hover {
   border-bottom-color: #FFFFFF;
 }
 
+<<<<<<< HEAD
 #example .top.segment .download.popup .choice.grid .column {
   width: 200px;
 }
 #example .top.segment .download.popup .framework.grid .column,
 #example .top.segment .download.popup .standalone.grid .column {
   width: 350px;
+=======
+#example .header.segment .download.popup {
+  width: 400px;
+>>>>>>> 1b47fb3bd1365a03ecf713c122268e88cb58d312
 }
 #example .top.segment .download.popup .check.icon {
   margin-left: -1em;