rework of index with twitter bootstrap and fontawesome

PoGo606 · Jun 25, 2013 · 9835654 · 9835654
1 parent 2d383b9
commit 9835654
Show file tree

Hide file tree

Showing 9 changed files with 848 additions and 29 deletions.
diff --git a/static/bootstrap.min.css b/static/bootstrap.min.css
diff --git a/static/font-awesome.min.css b/static/font-awesome.min.css
diff --git a/static/font/FontAwesome.otf b/static/font/FontAwesome.otf
diff --git a/static/font/fontawesome-webfont.eot b/static/font/fontawesome-webfont.eot
diff --git a/static/font/fontawesome-webfont.svg b/static/font/fontawesome-webfont.svg
diff --git a/static/font/fontawesome-webfont.ttf b/static/font/fontawesome-webfont.ttf
diff --git a/static/font/fontawesome-webfont.woff b/static/font/fontawesome-webfont.woff
diff --git a/static/static.css b/static/static.css
@@ -5,21 +5,16 @@ html {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
-h1 {
+#title {
   height:200px;
   line-height:200px;
 }
 
-form {
-  margin: 0 0 0px;
-  height: 60px;
-}
-
 footer {
   position: absolute;
   bottom: 0;
   width: 100%;
-  font-size: 60%;
   text-align: center;
   border-top: 1px solid #ddd;
-}
+  padding-top: 10px;
+}
diff --git a/templates/index.tpl b/templates/index.tpl
@@ -1,32 +1,45 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='static.css') }}">
+    <meta http-equiv=”content-type” content=”text/html; charset=utf-8″>
+	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='static.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='font-awesome.min.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='bootstrap.min.css') }}">
     <title>
       Twitter-RSS
     </title>
-
 <body>
-
-	<h1>RSS generator for Twitter</h1>
-
-	<form action="/user" method="POST">
-	<input type="text" id="username" name="user_data" size="40" placeholder="Enter an username">
-	<input type="submit" id="userIt" value="RSS it!">
-	</form>
-
-	<form action="/htag" method="POST">
-	<input type="text" id="hashtag" name="user_data" size="40" placeholder="Enter a hashtag">
-	<input type="submit" id="htagIt" value="RSS it!">
-	</form>
-
-	{% if err %} <p class=error><strong>Error:</strong> </p> <p>{{ err }}</p> {% endif %}
-
+	<div id="title">
+	    <h1>RSS generator for Twitter</i></h1>
+		<h2> <i class="icon-twitter" style="color: #00ACED;"></i>&nbsp;&nbsp;&nbsp;<i class="icon-caret-right"></i><i class="icon-caret-right"></i><i class="icon-caret-right"></i>&nbsp;&nbsp;<i class="icon-rss" style="color: #EC6522"></i>
+	</div>
+    <div class="thumbnail" style="width: 800px;margin: auto;"><br>
+    {% if err %} <div class="alert alert-error"><strong>Error:</strong> {{ err }} </div>{% endif %}
+    <form action="/user" method="POST">
+   		<div class="control-group">
+        	<div class="controls">
+            	<div class="input-prepend input-append">
+                	<span class="add-on"><i class="icon-user"></i></span>
+                	<input type="text" class="span3" id="username" name="user_data" placeholder="Enter an username">
+                	<button type="submit" class="btn btn-primary" id="userIt" value="RSS it!"><i class="icon-rss"></i> RSS it !</button>
+            	</div>
+        	</div>
+        </div>
+    </form>	- or -<br><br>
+    <form action="/htag" method="POST">
+    	<div class="control-group">
+       		<div class="controls">
+            	<div class="input-prepend input-append">
+                	<span class="add-on">#</i></span>
+                	<input type="text" class="span3" id="hashtag" name="user_data" placeholder="Enter a hashtag">
+                	<button type="submit" class="btn btn-primary" id="htagIt" value="RSS it!"><i class="icon-rss"></i> RSS it !</button>
+            	</div>
+        	</div>
+        </div>
+    </form>
+	</div><!--/Thumbnail-->
 </body>
-
 	<footer>
-		<p><a href="https://github.com/Astalaseven/twitter-rss">Source code on GitHub</a></p>
+        <p><a href="https://github.com/Astalaseven/twitter-rss">Source code on GitHub <i class="icon-github-sign"></i></a></p>
 	</footer>
-
 </html>