From 1b728e3a8b64a1b5bf353b7cd9ae833b33330b93 Mon Sep 17 00:00:00 2001 From: Krophil Date: Wed, 7 Sep 2016 21:15:12 +0200 Subject: [PATCH 1/7] README updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 69a98a63..739141fa 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ generate a complete HTML documentation that will be available in the *./doc/html ### Dependencies: See requirements.txt -You may need to install some dev libraries like `libssl-dev`, `libjpeg-dev`, or `zlib1g-dev` to install all the -requiered dependancies with pip. +You may need to install some dev libraries like `libmysqlclient-dev`, `libssl-dev`, `libjpeg-dev`, or `zlib1g-dev` to install all the +requiered dependancies with pip. You may also need `mysql-client`. The development is done with sqlite, but it is advised to set a more robust DBMS for production (Postgresql for example) From 07363c607bd81787fda6aff01ad099bda3ac8a41 Mon Sep 17 00:00:00 2001 From: Krophil Date: Thu, 8 Sep 2016 00:10:36 +0200 Subject: [PATCH 2/7] Few proposals in CSS --- core/static/core/style.css | 18 ++++++++++++++---- core/templates/core/base.jinja | 6 +++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/core/static/core/style.css b/core/static/core/style.css index 6e5c8408..49753fa3 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -19,15 +19,17 @@ header { display: block; position: absolute; top : 0px; - right : 8%; + right : 2%; background-color:#DDD; margin: 0 10px; padding: 0 10px; + border-radius: 0 0 10px 10px; } header ul { display: inline-block; list-style-type: none; margin: 0px; + padding-right: 3px; vertical-align: middle; } header a { @@ -51,10 +53,17 @@ header form { } #language_chooser { position: absolute; + text-align: center; left: 5px; top: 5px; } +#language_chooser input { + margin: 2px; + width: 3em; + height: 2em; +} + /*---------------------------------NAV---------------------------------*/ nav { display: block; @@ -73,7 +82,7 @@ nav a { padding: 20px; } nav a:hover { - background: purple; + background: #535353; color: white; } @@ -147,7 +156,8 @@ table { } td { padding: 4px; - border: solid 1px black; + margin: 5px; + border: solid 1px darkgrey; border-collapse: collapse; vertical-align: top; overflow: hidden; @@ -164,7 +174,7 @@ tbody>tr:nth-child(even) { background: lightgrey; } tbody>tr:hover { - background: yellow; + background: darkgrey; width: 100%; } .tool-bar { diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index d9152278..6b4cd04b 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -19,7 +19,7 @@ alt="{% trans %}Logo{% endtrans %}" />
{% if not user.is_authenticated() %} - {% trans %}Login{% endtrans %} | + {% trans %}Login{% endtrans %} {% trans %}Register{% endtrans %} {% else %}
    @@ -34,8 +34,8 @@ {% endfor %}
- {{ user.get_display_name() }} | - {% trans %}Tools{% endtrans %} | + {{ user.get_display_name() }} + {% trans %}Tools{% endtrans %} {% trans %}Logout{% endtrans %}
From 26a1300417e7838c6b0865500f2b9f7a81f2cef8 Mon Sep 17 00:00:00 2001 From: Krophil Date: Mon, 19 Sep 2016 11:20:37 +0200 Subject: [PATCH 3/7] radius removed --- core/static/core/style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/static/core/style.css b/core/static/core/style.css index 49753fa3..7107ae95 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -23,7 +23,6 @@ header { background-color:#DDD; margin: 0 10px; padding: 0 10px; - border-radius: 0 0 10px 10px; } header ul { display: inline-block; @@ -60,8 +59,7 @@ header form { #language_chooser input { margin: 2px; - width: 3em; - height: 2em; + width:3em; } /*---------------------------------NAV---------------------------------*/ From 4ee858c1304551c870c6a864fbe265495d8c38ff Mon Sep 17 00:00:00 2001 From: Krophil Date: Wed, 7 Sep 2016 21:15:12 +0200 Subject: [PATCH 4/7] README updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 69a98a63..739141fa 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ generate a complete HTML documentation that will be available in the *./doc/html ### Dependencies: See requirements.txt -You may need to install some dev libraries like `libssl-dev`, `libjpeg-dev`, or `zlib1g-dev` to install all the -requiered dependancies with pip. +You may need to install some dev libraries like `libmysqlclient-dev`, `libssl-dev`, `libjpeg-dev`, or `zlib1g-dev` to install all the +requiered dependancies with pip. You may also need `mysql-client`. The development is done with sqlite, but it is advised to set a more robust DBMS for production (Postgresql for example) From b11c5bbd1d1422f9e7332d7c0d1425a7d555e269 Mon Sep 17 00:00:00 2001 From: Krophil Date: Tue, 20 Sep 2016 13:19:44 +0200 Subject: [PATCH 5/7] Merging --- core/static/core/style.css | 22 +++++++++++++++------- core/templates/core/base.jinja | 6 +++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/static/core/style.css b/core/static/core/style.css index 7ddf614f..f96ae8c1 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -19,15 +19,17 @@ header { display: block; position: absolute; top : 0px; - right : 8%; + right : 2%; background-color:#DDD; margin: 0 10px; padding: 0 10px; + border-radius: 0 0 10px 10px; } header ul { display: inline-block; list-style-type: none; margin: 0px; + padding-right: 3px; vertical-align: middle; } header a { @@ -51,10 +53,17 @@ header form { } #language_chooser { position: absolute; + text-align: center; left: 5px; top: 5px; } +#language_chooser input { + margin: 2px; + width: 3em; + height: 2em; +} + /*---------------------------------NAV---------------------------------*/ nav { display: block; @@ -73,7 +82,7 @@ nav a { padding: 20px; } nav a:hover { - background: purple; + background: #535353; color: white; } @@ -147,7 +156,8 @@ table { } td { padding: 4px; - border: solid 1px black; + margin: 5px; + border: solid 1px darkgrey; border-collapse: collapse; vertical-align: top; overflow: hidden; @@ -163,10 +173,8 @@ tbody>tr:nth-child(even) { background: lightgrey; } tbody>tr:hover { - background: yellow; -} -tbody>tr.highlight { - background: orange; + background: darkgrey; + width: 100%; } .tool-bar { overflow: auto; diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja index fc02b256..64cd1854 100644 --- a/core/templates/core/base.jinja +++ b/core/templates/core/base.jinja @@ -19,7 +19,7 @@ alt="{% trans %}Logo{% endtrans %}" />
{% if not user.is_authenticated() %} - {% trans %}Login{% endtrans %} | + {% trans %}Login{% endtrans %} {% trans %}Register{% endtrans %} {% else %}
    @@ -36,8 +36,8 @@ {% endfor %}
- {{ user.get_display_name() }} | - {% trans %}Tools{% endtrans %} | + {{ user.get_display_name() }} + {% trans %}Tools{% endtrans %} {% trans %}Logout{% endtrans %} From 62c4036deea625997f6e33e2aa4846a4507ad3a0 Mon Sep 17 00:00:00 2001 From: Krophil Date: Mon, 19 Sep 2016 11:20:37 +0200 Subject: [PATCH 6/7] radius removed --- core/static/core/style.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/static/core/style.css b/core/static/core/style.css index f96ae8c1..114b6352 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -23,7 +23,6 @@ header { background-color:#DDD; margin: 0 10px; padding: 0 10px; - border-radius: 0 0 10px 10px; } header ul { display: inline-block; @@ -60,8 +59,7 @@ header form { #language_chooser input { margin: 2px; - width: 3em; - height: 2em; + width:3em; } /*---------------------------------NAV---------------------------------*/ From 1d9c058132649afc457cb08b5f73c04f2a1748d9 Mon Sep 17 00:00:00 2001 From: Krophil Date: Tue, 20 Sep 2016 17:12:09 +0200 Subject: [PATCH 7/7] Revert "radius removed" This reverts commit 26a1300417e7838c6b0865500f2b9f7a81f2cef8. --- core/static/core/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/static/core/style.css b/core/static/core/style.css index 114b6352..f96ae8c1 100644 --- a/core/static/core/style.css +++ b/core/static/core/style.css @@ -23,6 +23,7 @@ header { background-color:#DDD; margin: 0 10px; padding: 0 10px; + border-radius: 0 0 10px 10px; } header ul { display: inline-block; @@ -59,7 +60,8 @@ header form { #language_chooser input { margin: 2px; - width:3em; + width: 3em; + height: 2em; } /*---------------------------------NAV---------------------------------*/