Migrating from twitter bootstrap to font-awesome

TheOtherNet · Aug 6, 2012 · 3c6dd8a · 3c6dd8a
1 parent 2051d57
commit 3c6dd8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "less/font-awesome"]
+	path = less/font-awesome
+	url = https://github.com/XayOn/Font-Awesome
diff --git a/Makefile b/Makefile
@@ -9,6 +9,7 @@ compress:
 build: dirs
 	coffee --join ./js/simpleHtml5Editor.js --compile coffee/*.coffee
 	lessc less/main.less css/simpleHtml5Editor.css
+	cp -r less/font-awesome/font css/
 
 dirs:
 	@mkdir js css &>/dev/null

diff --git a/less/font-awesome b/less/font-awesome
diff --git a/less/main.less b/less/main.less
@@ -1,4 +1,5 @@
-@import 'less/bootstrap/less/bootstrap.less';
+@import 'less/font-awesome/less/font-awesome.less';
+
 .hidden{ display:none; }
 .simpleHtml5Editor a {
 		color: black;
@@ -9,7 +10,7 @@
         padding-top:1px;
         margin:3px;
         text-decoration:none;
-        background: lighten(@blue, 25%);
+        background: lighten(#0000ff, 25%);
         text-align: center;
         border-radius: 2px;
         font-weight: bold;