From eb7965a76e63c9c2f498524b50b7cabd1d395fb8 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Oct 16 2014 17:22:37 +0000 Subject: A try with existing styles --- diff --git a/progit/static/progit.css b/progit/static/progit.css index 459acc6..6be1b7d 100644 --- a/progit/static/progit.css +++ b/progit/static/progit.css @@ -111,7 +111,11 @@ header h1 span { min-height: 450px; } -.project_list { +.project_list header h3 { + margin:0; +} + +.project_list > div { display: table; border-spacing: 1em; } @@ -394,7 +398,7 @@ table.list .open_by { color: #aaa; } -.issue_comment, .add_comment { +.issue_comment, .add_comment, .project_list { background-color: #fff; border-radius: 10px; margin-bottom: 1em; @@ -415,6 +419,7 @@ table.list .open_by { .issue_comment > header, .issue_comment > form > header, +.project_list > header, .file_content > .buttons { border-radius: 10px 10px 0 0; diff --git a/progit/templates/index.html b/progit/templates/index.html index 790622a..1cf31c0 100644 --- a/progit/templates/index.html +++ b/progit/templates/index.html @@ -26,35 +26,41 @@ {% endfor %} {%- endmacro %} -{% macro render_repos(list, total, page) %} +{% macro render_repos(list, total, page, title) %}
+
+ {{ title }} +
{% if total and total > 1 %} - - - - - + + + +
- {% if page > 1%} - - < Previous - - {% else %} - < Previous - {% endif %} - {{ page }} / {{ total }} - {% if page < total %} - - Next > - + {{ page }} / {{ total }} + {% if page < total %} + + Next > + + {% else %} + Next > + {% endif %} +
+ {% endif %} - - {{ render_row(list) }} +
+ {{ render_row(list) }} +
{% endmacro %} @@ -62,13 +68,8 @@ {% if username %}

{{ username | avatar(36) | safe }} {{ username }}

-

My Projects

- {{ render_repos(user_repos, total_page_repos, repopage) }} - -

My Forks

- {{ render_repos(user_forks, total_page_forks, forkpage) }} + {{ render_repos(user_repos, total_page_repos, repopage, 'My Projects') }} + {{ render_repos(user_forks, total_page_forks, forkpage, 'My Forks') }} {% endif %} - - {% if username %}All {% endif %}Projects - {{ render_repos(repos, total_page, page) }} + {{ render_repos(repos, total_page, page, 'All Projects') }} {% endblock %}