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

Gruntfile.js

@@ -611,20 +611,7 @@ module.exports = function(grunt) {
   };
 
 
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-compress');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-contrib-less');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-
-  grunt.loadNpmTasks('grunt-autoprefixer');
-  grunt.loadNpmTasks('grunt-docco-multi');
-  grunt.loadNpmTasks('grunt-cssjanus');
-  grunt.loadNpmTasks('grunt-clear');
-  grunt.loadNpmTasks('grunt-karma');
+  require('load-grunt-tasks')(grunt);
 
   grunt.initConfig(config);
 

README.md

@@ -1,17 +1,14 @@
-# Semantic
-[![Build Status](https://travis-ci.org/jlukic/Semantic-UI.png)](https://travis-ci.org/jlukic/Semantic-UI)
+# Semantic [![Build Status](https://travis-ci.org/Semantic-Org/Semantic-UI.png)](https://travis-ci.org/Semantic-Org/Semantic-UI) 
+Semantic is a UI Component library implemented using a set of specifications designed around natural language
 
-Semantic is a set of specifications for sharing UI elements between developers. Semantic is also a UI library to make front end development simpler and easier to learn.
-
-Semantic is production ready, but is formally "pre-release" until proper build and theming tools are available, and documentation is complete for all components.
-
-The project is under constant development, so be sure to check out our [release notes](https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md) for recent changes.
+Semantic UI is under constant development, so **be sure to check out our [release notes](https://github.com/Semantic-Org/Semantic-UI/blob/master/RELEASE%20NOTES.md) for recent changes**.
 
 [![Flattr This](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=jlukic&url=https%3A%2F%2Fgithub.com%2Fjlukic%2FSemantic-UI)
-
 ### Bugs and Issues
 
-Please [share any issues](https://github.com/jlukic/Semantic-UI/issues?state=open) you may have, we need your help to get all the kinks out. 
+> Semantic UI is production ready, but is "pre-release" until build and theming tools are available, and documentation is complete for all components.
+
+Please [share any issues](https://github.com/Semantic-Org/Semantic-UI/issues?state=open) you may have, we need your help to get all the kinks out. 
 
 If you are reporting a bug *you must create a test-case*. You can [fork this jsfiddle](http://jsfiddle.net/Vbr9d/42/) to get you started.
 
@@ -21,7 +18,7 @@ The Semantic library describes many UI elements. In most instances it might be b
 
 To download the entire library
 
-    git clone git@github.com:quirkyinc/semantic.git
+    git clone git@github.com:Semantic-Org/semantic.git
 
 If you prefer to download the whole kit as a zip, it is so conveniently packaged.
 
@@ -37,9 +34,9 @@ RTL versions are compiled on every patch update, and are available in ``/rtl/``
     
 ### Integration
 
-Comunity contributed plugins and ports for Wordpress, Angular, Knockout, Rails, and more can be found on the [Integration page](https://github.com/jlukic/Semantic-UI/wiki/Integration).
+Comunity contributed plugins and ports for Wordpress, Angular, Knockout, Rails, and more can be found on the [Integration page](https://github.com/Semantic-Org/Semantic-UI/wiki/Integration).
 
-### Learn More
+## Learn More
 
 * [Introduction to Semantic](http://www.semantic-ui.com/introduction.html)
 * [Semantic Modules](http://www.semantic-ui.com/module.html)
@@ -49,15 +46,12 @@ Comunity contributed plugins and ports for Wordpress, Angular, Knockout, Rails,
 If you want to keep track of development, please [join our google group](https://groups.google.com/forum/?hl=en#!forum/semantic-ui)
 
 
-#### I want to contribute to Semantic
-
-Semantic is very new standard, and we need a community to become truly useful. 
+#### Reaching Out
 
-If you'd like to start a conversation about Semantic feel free to reach out by e-mail [jack@myfav.es](mailto:jack@myfav.es)
+If you'd like to start a conversation about Semantic feel free to reach out by e-mail [jack@semantic-ui.com](mailto:jack@semantic-ui.com)
 
 
 ### Roadmap
-* [Features Missing for 1.0](https://github.com/jlukic/Semantic-UI/issues?direction=desc&milestone=1&page=1&sort=updated&state=open)
-* [Planned Updates for 1.X](https://github.com/jlukic/Semantic-UI/issues?direction=desc&milestone=2&page=1&sort=updated&state=open)
-* [Additional Components Scoped for 2.0](https://github.com/jlukic/Semantic-UI/issues?direction=desc&labels=&milestone=3&page=1&sort=updated&state=open)
-
+* [Features Missing for 1.0](https://github.com/Semantic-Org/Semantic-UI/issues?direction=desc&milestone=1&page=1&sort=updated&state=open)
+* [Planned Updates for 1.X](https://github.com/Semantic-Org/Semantic-UI/issues?direction=desc&milestone=2&page=1&sort=updated&state=open)
+* [Additional Components Scoped for 2.0](https://github.com/Semantic-Org/Semantic-UI/issues?direction=desc&labels=&milestone=3&page=1&sort=updated&state=open)

package.json

@@ -46,6 +46,7 @@
     "grunt-karma": "~0.6.2",
     "karma-spec-reporter": "0.0.5",
     "grunt-clear": "~0.2.1",
-    "grunt-autoprefixer": "~0.4.0"
+    "grunt-autoprefixer": "~0.4.0",
+    "load-grunt-tasks": "~0.2.0"
   }
 }

src/elements/basic.icon.less

@@ -19,9 +19,9 @@
   src: url(../fonts/basic.icons.eot);
   src:
     url(../fonts/basic.icons.eot?#iefix) format('embedded-opentype'),
+    url(../fonts/basic.icons.svg#basic.icons) format('svg'),
     url(../fonts/basic.icons.woff) format('woff'),
-    url(../fonts/basic.icons.ttf) format('truetype'),
-    url(../fonts/basic.icons.svg#basic.icons) format('svg')
+    url(../fonts/basic.icons.ttf) format('truetype')
   ;
 
   font-style: normal;

src/elements/icon.less

@@ -31,9 +31,9 @@
   src: url(../fonts/icons.eot);
   src:
     url(../fonts/icons.eot?#iefix) format('embedded-opentype'),
+    url(../fonts/icons.svg#icons) format('svg'),
     url(../fonts/icons.woff) format('woff'),
-    url(../fonts/icons.ttf) format('truetype'),
-    url(../fonts/icons.svg#icons) format('svg')
+    url(../fonts/icons.ttf) format('truetype')
   ;
 
   font-style: normal;