From dd5cd50a3e1666c914bbe01c56b36a898b38bc75 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sat, 27 May 2017 13:02:36 +0300 Subject: [PATCH 1/4] Prettify about page --- global_static/css/about.css | 14 ++++++++++++++ templates/about.html | 5 +---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 global_static/css/about.css diff --git a/global_static/css/about.css b/global_static/css/about.css new file mode 100644 index 0000000..c9baa32 --- /dev/null +++ b/global_static/css/about.css @@ -0,0 +1,14 @@ +html { + width: 100%; + height: 100%; + font-size: 16px; +} + +body { + background-color: #fcfcfc; + max-width: 750px; + margin: auto; + text-align: center; + color: #100; + font-family: sans-serif; +} diff --git a/templates/about.html b/templates/about.html index 76391ad..7faf8f3 100644 --- a/templates/about.html +++ b/templates/about.html @@ -3,13 +3,10 @@ {% load static %} - +

SIKWEB 2.0

-

Git revision

- {{ REVISION }} -

Git tag

{{ TAG }} From 362c34196600ca9b72b52d359edff2a127541d69 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sat, 27 May 2017 13:53:23 +0300 Subject: [PATCH 2/4] Fix sidebar styles --- members/static/css/members.css | 229 +++++++++++++++++---------------- 1 file changed, 119 insertions(+), 110 deletions(-) diff --git a/members/static/css/members.css b/members/static/css/members.css index 29fcf9d..23d0aeb 100644 --- a/members/static/css/members.css +++ b/members/static/css/members.css @@ -1,110 +1,115 @@ html, body { - font-size: 14px; - width: 100%; + font-size: 14px; + width: 100%; } div { - padding: 0.5rem; + padding: 0.5rem; } input { - padding: 0.5rem; - margin-top: 0.5rem; - margin-bottom: 0.5rem; + padding: 0.5rem; + margin-top: 0.5rem; + margin-bottom: 0.5rem; } #header { - display: block; + display: block; } #wrapper { - padding-right: 0; - padding-top: 0; - padding-bottom: 0; + padding-right: 0; + padding-top: 0; + padding-bottom: 0; } /* fixes for the sidebar layout */ #sidebar-wrapper { - background: #202020; - top: 0; - padding: 0; - -webkit-transition: width 0.01s height 0.01s linear; - -moz-transition: width 0.01s height 0.01s linear; - -o-transition: width 0.01s height 0.01s linear; - transition: width 0.01s, height 0.01s, transform 0.01s; - + background: #202020; + top: 0; + padding: 0; + -webkit-transition: width 0.01s height 0.01s linear; + -moz-transition: width 0.01s height 0.01s linear; + -o-transition: width 0.01s height 0.01s linear; + transition: width 0.01s, height 0.01s, transform 0.01s; } .sidebar-nav { - width: initial; - left: 0; - width: 100%; - padding-top: 0.5rem; - height: 100%; - position: relative; + width: initial; + left: 0; + width: 100%; + padding-top: 0.5rem; + height: 100%; + position: relative; } .sidebar-nav li ul { - padding-left: 0px; + padding-left: 0px; } .sidebar-nav li span { - user-select: none; - cursor: default; + user-select: none; + cursor: default; } -#sidebar-collapse { - display: none; +/* Override bootstrap default margin-bottom */ +.navbar { + margin-bottom: 0; } @media (max-width: 767px) { + table { + table-layout: fixed; + } - table { - table-layout: fixed; - } + #sidebar-wrapper { + position: initial; + width: 100%; + margin-left: 0; + text-align: center; + } - #sidebar-wrapper { - position: initial; - width: 100%; - margin-left: 0; - text-align: center; - } + #sidebar-wrapper ul li { + text-align: center; + } - #sidebar-wrapper ul li { - text-align: center; - } + #header { + display: none; + } - #header { - display: none; - } + .sidebar-nav { + display: none; + } - .sidebar-nav { - display: none; - } + #sidebar-collapse { + display: block; + } - #sidebar-collapse { - display: block; - } + .logout-container { + position: initial; + margin-bottom: 1rem; + } - .logout-container { - position: initial; - margin-bottom: 1rem; - } + #wrapper { + width: 100%; + } - #wrapper { - width: 100%; - } + .page-content-container { + padding: 0; + } - /* Force table to not be like tables anymore */ + /* Force table to not be like tables anymore */ table, thead, tbody, th, td, tr { display: block; } thead tr { - background-color: #CCCCCC; + background-color: #CCCCCC; } - tr { border: 1px solid #ccc; } + tr { + border: 1px solid #ccc; + } td { /* Behave like a "row" */ @@ -127,113 +132,117 @@ input { } @media (min-width: 769px) { - .logout-container { - bottom: 1rem; - position: absolute; - width: 100%; - } + .logout-container { + bottom: 1rem; + position: absolute; + width: 100%; + } - .logout-container input { - width: 80%; - } + .logout-container input { + width: 80%; + } - #settings-button { - position: absolute; - bottom: 0; - } + #settings-button { + position: absolute; + bottom: 0; + } + + #sidebar-collapse { + display: none; + } } #download-csv { - margin-left: 20px; + margin-left: 20px; } #header h1 { - margin-bottom: 5rem; - margin-top: 2rem; - text-align: center; + margin-bottom: 5rem; + margin-top: 2rem; + text-align: center; } .table-button { - margin-left: 5px; - margin-right: 5px; - margin-bottom: 5px; + margin-left: 5px; + margin-right: 5px; + margin-bottom: 5px; } .table-button-column { - text-align: right; + text-align: right; } .pagination li { - padding: 0.5rem; - margin: 0.5rem; + padding: 0.5rem; + margin: 0.5rem; } #filter-collapser { - float: right; - margin-left: 1rem; + float: right; + margin-left: 1rem; } .filter-form { } .filter-row { - float: right; - display: table; - background-color: rgba(122, 164, 232, 0.5); + float: right; + display: table; + background-color: rgba(122, 164, 232, 0.5); } .filter-group { - display: inline-block; - float: left; - height: 100%; + display: inline-block; + float: left; + height: 100%; } .filter-field { - display: table; - clear: both; - width: 100%; - margin-left: 0; - margin-right: 0; + display: table; + clear: both; + width: 100%; + margin-left: 0; + margin-right: 0; } .filter-field h5 { - display: inline; + display: inline; } .filter-field input[type="datetime-local"] { - display: inline; - width: 50%; - float: right; + display: inline; + width: 50%; + float: right; } .filter-button { - margin: 0.5rem; - display: block; - width: 100%; + margin: 0.5rem; + display: block; + width: 100%; } .filter-field #search-filter { - width: 100%; + width: 100%; } .inline-title { - display: inline; + display: inline; } .ellipsis-menu { - height: 2rem; + height: 2rem; } .data-table-button { - width: 100%; + width: 100%; } .readonly { - pointer-events: none; + pointer-events: none; } .large-textarea { - width: 100%; - max-width: 100%; - height: 10rem !important; + width: 100%; + max-width: 100%; + height: 10rem !important; } From 95fe21d599871ef9bd3645e1efdf130550b51d6e Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sat, 27 May 2017 13:59:13 +0300 Subject: [PATCH 3/4] Fix style problem where hamburger menu button was on top of page title --- members/templates/members_base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/members/templates/members_base.html b/members/templates/members_base.html index d357b66..3957588 100644 --- a/members/templates/members_base.html +++ b/members/templates/members_base.html @@ -39,12 +39,12 @@