Merge pull request #19 from 540co/develop

1.1.0 develop merge
540co · Dec 7, 2015 · 84e2058 · 84e2058
2 parents ae6bde1 + 15d6fba
commit 84e2058
Show file tree

Hide file tree

Showing 16 changed files with 1,056 additions and 329 deletions.
diff --git a/README.md b/README.md
@@ -1,20 +1,20 @@
 ## Govicons
 
-*Version 1.0.0*
+*Version 1.1.0*
 
 **A Government font and CSS toolkit, inspired by [Font-Awesome](http://fontawesome.io)**.
 
-Govicons is a icon font and CSS toolkit with 80 government themed icons, for easy scalable vector graphics on projects that needs government based icons. Govicons is created and maintained by [540](http://540.co).
+Govicons is a icon font and CSS toolkit with 95 government themed icons, for easy scalable vector graphics on projects that needs government based icons. Govicons is created and maintained by [540](http://540.co).
 
 ![](https://media1.giphy.com/media/5ME9j9hbSJYrK/200.gif)
 
 Get started at <http://govicons.io>!
 
 ## Getting started
 
-Download the govicons project and place the 4 font files and the main govicons.min.css file in your project, with the assumption that the fonts are located up ../ from your CSS directory.
+- Download and place the entire `govicons` directory into your project
 
-In the `<head>` of your html, reference the location to your govicons.css
+- In the `<head>` of your html, reference the location to your govicons.min.css
 
 ```html
 <link rel="stylesheet" href="path/to/govicons/css/govicons.min.css">

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "govicons",
   "description": "Govicons - Government font and CSS toolkit",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "keywords": [
     "government",
     "font",
@@ -17,7 +17,7 @@
     "./css/*",
     "./fonts/*",
     "./less/govicons.less",
-    "./less/govicons.scss"
+    "./scss/govicons.scss"
   ],
   "ignore": [
     "*/.*",

diff --git a/css/govicons.css b/css/govicons.css
@@ -10,6 +10,7 @@
 	src:url('../fonts/govicons-webfont.eot') format('embedded-opentype'),
 		url('../fonts/govicons-webfont.ttf') format('truetype'),
 		url('../fonts/govicons-webfont.woff') format('woff'),
+		url('../fonts/govicons-webfont.woff2') format('woff2'),
 		url('../fonts/govicons-webfont.svg') format('svg');
 	font-weight: normal;
 	font-style: normal;
@@ -155,6 +156,49 @@
   color: #ffffff;
 }
 
+.gi-sol:before,
+.gi-statue-of-liberty:before {
+	content: "\e95c";
+}
+.gi-liberty-bell:before {
+	content: "\e95d";
+}
+.gi-users:before {
+	content: "\e95a";
+}
+.gi-user-politician:before {
+	content: "\e959";
+}
+.gi-shield-o:before {
+	content: "\e956";
+}
+.gi-shield:before {
+	content: "\e957";
+}
+.gi-us-shield:before {
+	content: "\e958";
+}
+.gi-missile:before {
+	content: "\e954";
+}
+.gi-satellite:before {
+	content: "\e955";
+}
+.gi-drone:before {
+	content: "\e953";
+}
+.gi-security-camera:before {
+	content: "\e94f";
+}
+.gi-textile:before {
+	content: "\e950";
+}
+.gi-leaf:before {
+	content: "\e951";
+}
+.gi-recycle:before {
+	content: "\e952";
+}
 .gi-comment:before {
 	content: "\e90f";
 }
@@ -176,7 +220,7 @@
 .gi-script:before {
 	content: "\e902";
 }
-.gi-clock:before {
+.gi-clock-o:before {
 	content: "\e903";
 }
 .gi-code:before {
@@ -212,7 +256,7 @@
 .gi-heartbeat:before {
 	content: "\e90b";
 }
-.gi-ship:before {
+.gi-ship-front:before {
 	content: "\e911";
 }
 .gi-bus-front:before {
@@ -245,6 +289,7 @@
 .gi-desktop:before {
 	content: "\e91c";
 }
+.gi-mobile-phone:before,
 .gi-mobile:before {
 	content: "\e91d";
 }
@@ -375,9 +420,12 @@
 .gi-dc-map:before {
 	content: "\e600";
 }
-.gi-us-flag:before {
+.gi-us-flag-wavy:before {
 	content: "\e948";
 }
+.gi-us-flag-straight:before {
+	content: "\e95b";
+}
 .gi-us-map:before {
 	content: "\e946";
 }
@@ -388,7 +436,7 @@
 .gi-washington-monument:before {
 	content: "\e94a";
 }
-.gi-capital:before {
+.gi-capitol:before {
 	content: "\e94b";
 }
 .gi-pentagon:before {

diff --git a/css/govicons.min.css b/css/govicons.min.css
diff --git a/fonts/Govicons.otf b/fonts/Govicons.otf
diff --git a/fonts/govicons-webfont.eot b/fonts/govicons-webfont.eot