Эх сурвалжийг харах

make site more presentable

raylu 11 жил өмнө
parent
commit
e0b1a26704

+ 20 - 2
web/static/css/base.ccss

@@ -5,9 +5,27 @@
 
 body:
 	height: 100%
-	background: #fff
-	color: #777
+	background: #111
+	color: #ccc
 	font-family: sans-serif
 
 a:
+	color: #3ae
 	text-decoration: none
+
+.wrapper:
+	width: 1200px
+	margin: 0 auto
+
+.topbar:
+	margin: 15px 0
+
+	.title:
+		display: inline-block
+	.nav:
+		display: inline-block
+		float: right
+
+		& > a:
+			display: inline-block
+			margin: 0 10px

+ 2 - 0
web/static/css/login_register.ccss

@@ -0,0 +1,2 @@
+input:
+	display: block

+ 8 - 2
web/static/css/stats.ccss

@@ -10,5 +10,11 @@
 	.rickshaw_legend:
 		width: 128px
 
-	.rickshaw_graph .x_tick .title:
-		bottom: -15px
+	.rickshaw_graph .x_tick:
+		border-left-color: rgba(255, 255, 255, 0.20)
+
+		.title:
+			bottom: -15px
+
+	.rickshaw_graph .y_grid .tick:
+		stroke: rgba(255, 255, 255, 0.20)

+ 11 - 15
web/templates/base.html

@@ -14,22 +14,18 @@
 	{% block css %}{% end %}
 </head>
 <body>
-    <div id="topbar">
-        <div class="wrapper">
-            <div id="title"><a href="/">website</a></div>
-            <div id="nav">
-                {% if current_user %}
-                    <div id="user-nav">
-                        <a href="/logout">logout</a>
-                    </div>
-                {% else %}
-                    <a href="/login">login</a>
-                    <a href="/register">sign up</a>
-                {% end %}
-            </div>
-        </div>
-    </div>
 	<div class="wrapper">
+		<div class="topbar">
+			<div class="title"><a href="/">sysvitals.com</a></div>
+			<div class="nav">
+				{% if current_user %}
+					<a href="/logout">logout</a>
+				{% else %}
+					<a href="/login">login</a>
+					<a href="/register">sign up</a>
+				{% end %}
+			</div>
+		</div>
 		{% block main %}{% end %}
 	</div>
 </body>

+ 1 - 0
web/templates/home.html

@@ -12,6 +12,7 @@
 			</p>
 		{% end %}
 		<form method="post" action="/groups/create">
+			create a group:
 			<input type="text" name="name">
 			<input type="submit">
 		</form>

+ 9 - 5
web/templates/login.html

@@ -1,14 +1,18 @@
 {% extends "base.html" %}
 
+{% block css %}
+	<link rel="stylesheet" href="/css/login_register.css">
+{% end %}
+
 {% block main %}
 
-<h1> Sign in </h1>
-<form id="auth-form" action="" method="post">
-	<label for="username">Username</label>
+<h1>sign in</h1>
+<form action="" method="post">
+	<label for="username">username</label>
 	<input type="text" name="username" id="username">
-	<label for="password">Password</label>
+	<label for="password">password</label>
 	<input type="password" name="password" id="password">
-	<input type="submit" class="button" name="signin" value="Sign in">
+	<input type="submit" class="button" name="signin" value="sign in">
 	{% module xsrf_form_html() %}
 </form>
 

+ 9 - 5
web/templates/register.html

@@ -1,14 +1,18 @@
 {% extends "base.html" %}
 
+{% block css %}
+	<link rel="stylesheet" href="/css/login_register.css">
+{% end %}
+
 {% block main %}
 
-<h1> Sign up </h1>
-<form id="auth-form" action="" method="post">
-	<label for="username">Username</label>
+<h1>sign up</h1>
+<form action="" method="post">
+	<label for="username">username</label>
 	<input type="text" name="username" id="username">
-	<label for="password">Password</label>
+	<label for="password">password</label>
 	<input type="password" name="password" id="password">
-	<input type="submit" class="button" name="signup" value="Sign up">
+	<input type="submit" class="button" name="signup" value="sign up">
 	{% module xsrf_form_html() %}
 </form>