Merge branch 'dev' of github.com:jlukic/Semantic-UI into dev

Conflicts:
	node/src/files/release/semantic.zip

Former-commit-id: f7a6407f6f810ca9deebf0cc0f15346aedb02f50
Former-commit-id: ee664e13b12f71bbec03b4d1f0f263bc258a490f

build/packaged/css/semantic.min.css.REMOVED.git-id

@@ -1 +1 @@
-20f44c2c6b0b42f855f41dca1eb574289d77edb9
+f902b3c242c60d21f06488f578f9b8696f8b6103

build/packaged/javascript/semantic.min.js.REMOVED.git-id

@@ -1 +1 @@
-bcf0e43febcbf04715a43b0ad28ea870dc242488
+3667552c1d04d3e238256fd371b9928abc95a958

node/src/documents/project/contributing.html

@@ -0,0 +1,74 @@
+  ---
+layout : 'default'
+css    : 'contribute'
+
+title  : 'Contributing'
+type   : 'Semantic Project'
+---
+<script src="/javascript/intro.js"></script>
+<div class="segment">
+  <div class="container">
+    <h1 class="ui header">Contributing
+      <div class="ui label">Draft</div>
+    </h1>
+  </div>
+</div>
+<div class="main container">
+  <div class="peek">
+    <div class="ui vertical pointing secondary menu">
+      <a class="item">Introduction</a>
+      <a class="item">Issues</a>
+      <a class="item">Pull Requests</a>
+      <a class="item">Components</a>
+      <a class="item">Community</a>
+    </div>
+  </div>
+
+  <h2 class="ui dividing header">Introduction</h2>
+
+  <h3 class="ui header">Core Contributions</h3>
+
+  <p>There are a variety of ways to contribute to the development of Semantic. We are a very new project and are looking for an enthusiastic and like-minded group of core contributors. We use the lovely free project management software <a href="https://trello.com/jack148/recommend">Trello</a> for keeping track of project issues and updates.</p>
+
+  <p>We're also currently working on "Dev kits" for creating and testing each type of UI definition, which should be available shortly, so hold tight.</p>
+
+  <p>Some boards are open publicly, others are limited to contributors. Anyone can share ideas for the direction of the project using our public boards.</p>
+
+  <h3 class="ui header">Style Guide</h3>
+  <p>Contributors should read over the coding guidelines for the project. Most importantly, the guide for language.</p>
+  <a class="ui secondary button" href="/guide/cssguide.html">CSS</a>
+  <a class="ui secondary button" href="/guide/javascript.html">Javascript</a>
+  <a class="ui secondary button" href="/guide/styleguide.html">Language</a>
+
+  <h2 class="ui dividing header">Bugs & Issues</h2>
+
+  <p>Please submit any bugs you encounter when using the library to our <a href="https://github.com/jlukic/Semantic-UI/issues?state=open">Github Issues Tracker</a>.</p>
+
+  <p>Pleaseinclude a set of steps to reproduce the issue and any related information, browser, OS. If we can't see the issue then it will make solving things much more difficult.</p>
+
+  <h2 class="ui dividing header">Pull Requests</h2>
+
+  <p>Anyone can jump on the issues board and grab off bugs to fix. Make sure however
+
+  <h2 class="ui dividing header">Expanding Core UI</h2>
+
+  <p>Semantic is looking for people to help contribute new UI components, and suggest extensions for our core library</p>
+
+  <p>If you have any suggestions for components missing from Semantic which you'd like to see in future versions please add suggestions to our public UI board. The current list of upcoming components, and there current development status can be seen on the contributor UI board.</p>
+
+  <a class="ui secondary button" href="https://trello.com/b/Q8uTLy2T/semantic-ui-ui-components">Public Board</a>
+  <a class="ui button" href="https://trello.com/b/dtmaAEmg/semantic-ui-components-contributors">Contributor Board</a>
+
+  <h2 class="ui diving header">Community Development</h2>
+
+  <p>We're looking currently for ideas on the best way to expand Semantic to include both core library and third party components. This requires creating a component specification which can be used by anyone to create components, and a package management system (website or command line) for distributing them.</p>
+
+  <a class="ui secondary button" href="https://trello.com/b/FZvMsVIM/semantic-ui-community">Public Board</a>
+  <a class="ui button" href="https://trello.com/b/dtmaAEmg/semantic-ui-components-contributors">Contributor Board</a>
+
+  <div class="ui divider"></div>
+  <a class="ui large right labeled teal icon button" href="/element.html">
+    Next: Roadmap
+    <i class="right arrow icon"></i>
+  </a>
+</div>

node/src/files/release/packaged/css/semantic.min.css.REMOVED.git-id

@@ -1 +1 @@
-20f44c2c6b0b42f855f41dca1eb574289d77edb9
+f902b3c242c60d21f06488f578f9b8696f8b6103

node/src/files/release/packaged/javascript/semantic.min.js.REMOVED.git-id

@@ -1 +1 @@
-bcf0e43febcbf04715a43b0ad28ea870dc242488
+3667552c1d04d3e238256fd371b9928abc95a958

node/src/files/release/semantic.zip.REMOVED.git-id

@@ -1 +1 @@
-5e3a501ca3409f3a54a3ba87eec17f9c432cabfa
+d92269e1bf3b0c7c3445c08a630fb0c0f5404257

node/src/files/spec/button.json

@@ -1,31 +1,57 @@
 {
-  "Name" : "Button",
-  "Type" : "UI Element",
+
+  // Package Name (SubType Type)
+  "Name"         : "Semantic Button",
+
+  // Version #
+  "Version"      : "0.1",
+
+  // Type of element
+  "Type"    : "button",
+
+  // Type of definition
+  "Definition" : "Element",
+
+  // ID of UI components that must be included
+  "Dependencies" : [],
+
+  // list of required components in "id name" format
+  "Coupling"     : ["semantic icon",  "semantic loader"],
+
+  // List of mutually exclusive types with their koan generators <https://github.com/zodoz/jquery-ZenCoding>
   "Types": {
-      "Singular": {
-        "Standard"     : ".ui.button",
-        "Icon"         : ".ui.icon.button > i.add.icon",
-        "Labeled Icon" : ".ui.labeled.icon.button > i.add.icon"
-      },
-      "Group": {
-        "Standard"    : ".ui.buttons > .button+.button+.button",
-        "Icon"        : ".ui.buttons > ( (.button > i.icon.user) + (.button > i.icon.heart) + (.button > i.icon.lab))",
-        "Conditional" : ".ui.buttons > .button+.or+.button",
-        "Vertical"    : ".vertical.ui.buttons > .button+.button+.button"
-      }
-  },
-  "Text": {
-    ".ui.button" : "Button"
+    "Singular": {
+      "Standard"     : ".ui.button",
+      "Icon"         : ".ui.icon.button > i.add.icon",
+      "Labeled Icon" : ".ui.icon.button > i.add.icon",
+      "Social"       : [
+        ".ui.facebook.button > i.facebook.icon",
+        ".ui.twitter.button > i.twitter.icon"
+      ]
+    },
+    "Plural": {
+      "Standard"    : ".ui.buttons > .button+.button+.button",
+      "Icon"        : ".ui.buttons > ( (.button > i.icon.user) + (.button > i.icon.heart) + (.button > i.icon.lab))",
+      "Conditional" : ".ui.buttons > .button+.or+.button",
+      "Vertical" : ".vertical.ui.buttons > .button+.button+.button"
+    }
   },
+
+  // Set of states that an element can occupy
   "States": {
+    "Hover"    : "hover",
+    "Down"     : "down",
     "Active"   : "active",
     "Loading"  : "loading",
     "Disabled" : "disabled"
   },
+
+  // Sets of variations of an element
   "Variations" : {
     "Circular" : "circular",
+    "Toggle"   : "toggle",
     "Fluid"    : "fluid",
-    "Size": [
+    "Size"     : [
       "mini",
       "tiny",
       "small",
@@ -34,7 +60,7 @@
       "huge",
       "massive"
     ],
-    "Color": [
+    "Color" : [
       "black",
       "green",
       "red",
@@ -43,9 +69,9 @@
       "red",
       "teal"
     ],
-    "Ordinality": [
-      "secondary",
-      "tertiary"
+    "Feedback": [
+      "positive",
+      "negative"
     ],
     "Attached" : [
       "attached top",
@@ -53,5 +79,32 @@
       "attached left",
       "attached right"
     ]
+  },
+
+  // Used with generators to create example content
+  "Text": {
+    ".button" : ["Button", "Follow", "Submit"]
+  },
+
+  // Your module may optionally include a text definition of its variations to help clarify their purpose. This may include the definition of types or variations
+  "Definition": {
+    "Standard"     : "A simple button",
+    "Icon"         : "A button icon is formatted to contain only an icon",
+    "Labeled Icon" : "A button can have an icon and a label",
+    "Social"       : "A button can be formatted to link to a social website",
+
+    "Hover"        : "A button can change to show a user has hovered their mouse",
+    "Down"         : "A button can change when pressed using touch or mouse events",
+    "Active"       : "A button can show it is currently the active user selection",
+    "Loading"      : "A button can show a loading indicator",
+    "Disabled"     : "A button can show it is currently unable to be interacted with",
+
+    "Attached"     : "A button can attach to other content",
+    "Circular"     : "A button can be circular",
+    "Color"        : "A button can have different colors",
+    "Fluid"        : "A button can be fluid",
+    "Ordinality"   : "A button can blend into a page",
+    "Size"         : "A button can vary in size",
+    "Toggle"       : "A button can be formatted to toggle on and off"
   }
 }

node/src/layouts/default.html.eco

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <head>
 <% uiIntroduction    = @getCollection("documents").findAllLive({type: $in: ['UI Introduction']},[{title: 1}]).toJSON() %>
+<% uiProject           = @getCollection("documents").findAllLive({type: $in: ['Semantic Project']},[{title: 1}]).toJSON() %>
 <% uiGuide           = @getCollection("documents").findAllLive({type: $in: ['UI Guide']},[{title: 1}]).toJSON() %>
 <% uiElements        = @getCollection("documents").findAllLive({type: $in: ['UI Element']},[{title: 1}]).toJSON() %>
 <% uiCollections     = @getCollection("documents").findAllLive({type: $in: ['UI Collection']},[{title: 1}]).toJSON() %>
@@ -104,6 +105,15 @@
     <a class="item" href="/release/semantic.zip">
       <i class="inverted circular red upload icon"></i> <b>Download</b>
     </a>
+    <div class="item">
+        <b>Project</b>
+      </a>
+      <div class="menu">
+        <% for element in uiProject: %>
+          <a class="<%= if element.id is @document.id then 'active ' %>item" href="<%= element.url %>"><%= element.title %></a>
+        <% end %>
+      </div>
+    </div>
     <div class="item">
       <a href="/introduction.html">
         <b>Introduction</b>