added font awesome

prsnca · Aug 6, 2014 · d2557a9 · d2557a9
1 parent e4f727c
commit d2557a9
Show file tree

Hide file tree

Showing 9 changed files with 512 additions and 3 deletions.
diff --git a/committeeVotes/static/css/font-awesome.min.css b/committeeVotes/static/css/font-awesome.min.css
diff --git a/committeeVotes/static/site.css → committeeVotes/static/css/site.css b/committeeVotes/static/site.css → committeeVotes/static/css/site.css
diff --git a/committeeVotes/static/fonts/FontAwesome.otf b/committeeVotes/static/fonts/FontAwesome.otf
diff --git a/committeeVotes/static/fonts/fontawesome-webfont.eot b/committeeVotes/static/fonts/fontawesome-webfont.eot
diff --git a/committeeVotes/static/fonts/fontawesome-webfont.svg b/committeeVotes/static/fonts/fontawesome-webfont.svg
diff --git a/committeeVotes/static/fonts/fontawesome-webfont.ttf b/committeeVotes/static/fonts/fontawesome-webfont.ttf
diff --git a/committeeVotes/static/fonts/fontawesome-webfont.woff b/committeeVotes/static/fonts/fontawesome-webfont.woff
diff --git a/committeeVotes/templates/base.html b/committeeVotes/templates/base.html
@@ -16,7 +16,8 @@
     <link href='http://fonts.googleapis.com/css?family=Alef:400&subset=all' rel='stylesheet' type='text/css'>
     <link href="{% static 'dist/css/bootstrap.css' %}" rel="stylesheet">
     <link href="{% static 'dist/css/bootstrap-rtl.css' %}" rel="stylesheet">
-    <link href="{% static 'site.css' %}" rel="stylesheet">
+    <link href="{% static 'css/font-awesome.min.css' %}" rel="stylesheet">
+    <link href="{% static 'css/site.css' %}" rel="stylesheet">
 
 </head>
 <body>

diff --git a/committeeVotes/templates/committeeVotes/index.html b/committeeVotes/templates/committeeVotes/index.html
@@ -49,7 +49,7 @@ <h2>
                                     <a href="{% url 'bill' b.id %}">
                                         {{ b.name }}
                                         <button class="btn btn-info pull-left">
-                                            <span class="glyphicon glyphicon-plus"></span>
+                                            <span class="fa fa-plus"></span>
                                         </button>
                                     </a>
 
@@ -61,7 +61,7 @@ <h2>
                                 <div class="pull-left">
                                     <a href="{% url 'bills' %}" class="btn btn-primary pull-left" role="button">
                                         עוד
-                                        <span class="glyphicon glyphicon-plus"></span>
+                                        <span class="fa fa-plus"></span>
                                     </a>
                                 </div>
                             </td>