[copr] master: Start the styling... layout first (b7ff50a)
bkabrda at fedoraproject.org
bkabrda at fedoraproject.org
Fri Jan 18 15:06:13 UTC 2013
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit b7ff50a54f1529d28265e0844e68688b91b4602b
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Fri Jan 18 12:01:47 2013 +0100
Start the styling... layout first
>---------------------------------------------------------------
coprs_frontend/coprs/static/copr_logo.png | Bin 0 -> 3411 bytes
coprs_frontend/coprs/static/header_background.png | Bin 0 -> 195 bytes
coprs_frontend/coprs/static/style-new.css | 46 +++++++++++++++++++++
coprs_frontend/coprs/templates/layout.html | 33 +++++++--------
4 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/coprs_frontend/coprs/static/copr_logo.png b/coprs_frontend/coprs/static/copr_logo.png
new file mode 100644
index 0000000..4576f78
Binary files /dev/null and b/coprs_frontend/coprs/static/copr_logo.png differ
diff --git a/coprs_frontend/coprs/static/header_background.png b/coprs_frontend/coprs/static/header_background.png
new file mode 100644
index 0000000..61fcb6f
Binary files /dev/null and b/coprs_frontend/coprs/static/header_background.png differ
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
new file mode 100644
index 0000000..01bbe6e
--- /dev/null
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -0,0 +1,46 @@
+html, body {
+ font-family: Cantarell, "Droid Sans", Verdana, sans-serif;
+ font-size: 0.9em;
+
+ margin: 0px;
+ padding: 0px;
+}
+
+#logo {
+ position: relative;
+ top: 8px;
+}
+
+div.menu {
+ background-image: url("header_background.png");
+ background-repeat: repeat-x;
+ height: 81px;
+}
+
+div.login, div.login a {
+ color: white;
+ font-weight: bold;
+ text-align: right;
+ text-decoration: none;
+ line-height: 250%;
+
+ position: relative;
+ float: right;
+}
+
+div.page, div.menu-inner {
+ width: 780px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+div.grey-box {
+ background-color: #ececec;
+}
+
+input.rounded {
+ padding-left: 4px;
+ border-radius:10px;
+ -moz-border-radius:10px;
+ -webkit-border-radius:10px;
+}
diff --git a/coprs_frontend/coprs/templates/layout.html b/coprs_frontend/coprs/templates/layout.html
index a9c6c6b..e6f88f6 100644
--- a/coprs_frontend/coprs/templates/layout.html
+++ b/coprs_frontend/coprs/templates/layout.html
@@ -1,30 +1,29 @@
<!doctype html>
<html>
<head>
- <title>{% block title %}Coprs Build System{% endblock %}</title>
-<link rel=stylesheet type=text/css href="{{ url_for('static', filename='style.css') }}">
+ <title>{% block title %}Coprs Build System{% endblock %}</title>
+ <link rel=stylesheet type=text/css href="{{ url_for('static', filename='style-new.css') }}">
</head>
<body>
-<div class=menu>
- <div class=menu-inner>
- {% block menu %}
- <a href="{{ url_for('coprs_ns.coprs_show') }}">All Coprs</a>
- {% if g.user %}
- <a href="{{ url_for('coprs_ns.coprs_by_owner', username = g.user.name) }}">Owned Coprs</a>
- <a href="{{ url_for('coprs_ns.coprs_by_allowed', username = g.user.name) }}">Coprs I Can Build In</a>
- <a class=log-url href="{{ url_for('misc.logout') }}">Log out</a>
- {% else %}
- <a class=log-url href="{{ url_for('misc.login') }}">Log in</a>
- {% endif %}
- {% endblock %}
+<div class="menu">
+ <div class="menu-inner">
+ <a href="/"><img id="logo" src="{{ url_for('static', filename='copr_logo.png') }}" alt="Copr Build System"></a>
+ <div class="login">
+ {% if g.user %}
+ logged in as {{ g.user.name }}
+ {% else %}
+ <div><a href="{{ url_for('misc.login') }}">log in</a></div>
+ <input class="rounded" type="text" name="search_text">
+ {% endif %}
+ </div>
</div>
</div>
-<div class=page>
+<div class="page">
<h1>{% block header %}Coprs Build System{% endblock %}</h1>
{% for message in get_flashed_messages() %}
- <div class=flash>{{ message }}</div>
+ <div class="flash">{{ message }}</div>
{% endfor %}
- <div class=page-inner>
+ <div class="page-inner">
{% block body %}{% endblock %}
</div>
</div>
More information about the copr-devel
mailing list