From f8fc226673077b115b30964a44e7b77e96661cbd Mon Sep 17 00:00:00 2001 From: rainydaysavings Date: Mon, 13 Jul 2020 23:51:19 +0100 Subject: [PATCH] [UI] Further work into new side panel design --- public/assets/css/base.css | 273 ++++++++++++++++++++-------------- public/assets/css/faq/faq.css | 17 +-- templates/base.html.twig | 185 +++++++++++++---------- templates/faq/faq.html.twig | 2 +- 4 files changed, 277 insertions(+), 200 deletions(-) diff --git a/public/assets/css/base.css b/public/assets/css/base.css index a13fc6a704..5bbc0fdc89 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -1,178 +1,223 @@ -/* GENERAL ----------------------------*/ :root { - --head-font: 'Montserrat', sans-serif; - --main-font: 'Open Sans', sans-serif; - --main-size: 1.25em; - --medium-size: 0.8em; - --small-size: 0.65em; - --unit-size: 1em; - --side-margin: 5em; - --nav-size: 12em; + --head-font: 'Montserrat', sans-serif; + --main-font: 'Open Sans', sans-serif; + --main-size: 1.25em; + --medium-size: 0.8em; + --small-size: 0.65em; + --unit-size: 1em; + --side-margin: 5em; + --nav-size: 15em; } body, html { - background-color: #29323c; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25' height='100%25' viewBox='0 0 1600 800'%3E%3Cg %3E%3Cpath fill='%232d3742' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/%3E%3Cpath fill='%23323c47' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/%3E%3Cpath fill='%2337414d' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/%3E%3Cpath fill='%233b4753' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c186.7 43.7 376.3 34.4 557.9-12.6V0H0z'/%3E%3Cpath fill='%23404c59' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/%3E%3Cpath fill='%23424e5b' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/%3E%3Cpath fill='%2343505d' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/%3E%3Cpath fill='%2345515f' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/%3E%3Cpath fill='%23465361' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/%3E%3Cpath fill='%23485563' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/%3E%3C/g%3E%3C/svg%3E"); - background-attachment: fixed; - background-size: cover; - color: #F6F6F6; - font-family: var(--main-font); - font-size: var(--main-size); - margin: 0; - padding: 0; + background-color: #29323c; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25' height='100%25' viewBox='0 0 1600 800'%3E%3Cg %3E%3Cpath fill='%232d3742' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/%3E%3Cpath fill='%23323c47' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/%3E%3Cpath fill='%2337414d' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/%3E%3Cpath fill='%233b4753' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c186.7 43.7 376.3 34.4 557.9-12.6V0H0z'/%3E%3Cpath fill='%23404c59' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/%3E%3Cpath fill='%23424e5b' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/%3E%3Cpath fill='%2343505d' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/%3E%3Cpath fill='%2345515f' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/%3E%3Cpath fill='%23465361' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/%3E%3Cpath fill='%23485563' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/%3E%3C/g%3E%3C/svg%3E"); + background-attachment: fixed; + background-size: cover; + color: #F6F6F6; + font-family: var(--main-font); + font-size: var(--main-size); + margin: 0; + padding: 0; } ul { - text-decoration: none; - margin: 0; - padding: 0; - list-style: none; + text-decoration: none; + margin: 0; + padding: 0; + list-style: none; } li { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } a:link { - text-decoration: none; - outline: 0; - color: #F6F6F6; - margin: 0; - padding: 0; + text-decoration: none; + outline: 0; + color: #F6F6F6; + margin: 0; + padding: 0; } a:visited { - outline: 0; - color: #F6F6F6; - margin: 0; - padding: 0; + outline: 0; + color: #F6F6F6; + margin: 0; + padding: 0; } b { - font-family: var(--head-font); - font-weight: 800; + font-family: var(--head-font); + font-weight: 800; } -/*-------------------------------------*/ -/* CONTAINER --------------------------*/ #container { - display: flex; - justify-content: space-between; - flex-wrap: wrap; + display: flex; + justify-content: space-between; + flex-wrap: wrap; } /*-------------------------------------*/ /* HEADER -----------------------------*/ #header { - position: fixed; - top: 0; - left: 0; - right: 0; - background-color: #272E36; - box-shadow: 0px 0px 60px -20px rgba(41, 50, 60, 1); - padding: var(--medium-size) var(--unit-size) var(--medium-size) var(--unit-size); + position: fixed; + top: 0; + left: 0; + right: 0; + background-color: #272E36; + box-shadow: 0px 0px 60px -20px rgba(41, 50, 60, 1); + padding: var(--medium-size) var(--unit-size) var(--medium-size) var(--unit-size); } #top { - display: flex; - justify-content: space-between; - flex-wrap: wrap; - width: 100%; - align-items: center; + display: flex; + justify-content: space-between; + flex-wrap: wrap; + width: 100%; + align-items: center; } -/* MENU -------------------------------*/ .icon-menu { - margin: 0; - padding: 0; - display: inline-block; - width: var(--unit-size); - height: var(--unit-size); - stroke-width: 0; - stroke: currentColor; - fill: currentColor; + margin: 0; + padding: 0; + display: inline-block; + width: var(--unit-size); + height: var(--unit-size); + stroke-width: 0; + stroke: currentColor; + fill: currentColor; } -/*-------------------------------------*/ -/* INSTANCE ---------------------------*/ #instance { - order: 2; + order: 1; } #instance b { - margin: 0; - padding: 0; - vertical-align: top; + margin: 0; + padding: 0; + vertical-align: top; } .icon-logo { - margin: 0; - padding: 0; - display: inline-block; - width: var(--unit-size); - height: var(--unit-size); - stroke-width: 0; - stroke: currentColor; - fill: currentColor; + margin: 0; + padding: 0; + display: inline-block; + width: var(--unit-size); + height: var(--unit-size); + stroke-width: 0; + stroke: currentColor; + fill: currentColor; +} + +#left-panel { + order: 2; } -/*-------------------------------------*/ -/* SEARCH -----------------------------*/ #search { - order: 3; + order: 3; } .icon-search { - margin: 0; - padding: 0; - display: inline-block; - width: var(--unit-size); - height: var(--unit-size); - stroke-width: 0; - stroke: currentColor; - fill: currentColor; + margin: 0; + padding: 0; + display: inline-block; + width: var(--unit-size); + height: var(--unit-size); + stroke-width: 0; + stroke: currentColor; + fill: currentColor; } - +/*-------------------------------------*/ +/* LEFT PANEL -------------------------*/ .navbar { - width: var(--nav-size); - height: calc(100vh - (3 * var(--unit-size))); - position: fixed; - background-color: rgba(0, 0, 0, 0.40); - margin-top: calc(2 * var(--medium-size) + var(--main-size)); -} - -.nav-item a { - color: #91B9D0; - margin-left: var(--unit-size); - font-size: var(--medium-size); -} - -.nav-item a:hover { - color: #F6F6F6; - transition: all 0.8s ease; -} - -label { - display: block; - cursor: pointer + width: var(--nav-size); + height: calc(100vh - (3 * var(--unit-size))); + position: fixed; + background-color: rgba(0, 0, 0, 0.40); + margin-top: calc(2 * var(--medium-size) + var(--main-size) + 0.15em); } .navbar { - width: 100%; - display: none; + left: -15em; + top: 0; + transition: 0.3s ease; } .navbar a { - display: block; + display: block; + color: #91B9D0; + margin-left: var(--unit-size); + margin-bottom: var(--small-size); + font-size: var(--medium-size); +} + +.navbar a:nth-child(1) { + margin-top: var(--unit-size); +} + +.navbar a:hover { + color: #F6F6F6; + transition: all 0.8s ease; +} + +label { + display: none; + cursor: pointer } #toggle { - display: none; + display: none; } #toggle:checked+.navbar { - display: block; -} \ No newline at end of file + display: block; + left: 0; + top: 0; + transition: 0.3s ease; +} + +.profile { + display: flex; + flex-wrap: wrap; + background-color: rgba(0, 0, 0, 0.40); + padding: var(--unit-size); + font-size: var(--small-size); + margin-bottom: var(--unit-size); + vertical-align: middle; +} + +.icon-avatar { + order: 1; + height: calc(5 * var(--unit-size)); + weight: auto; + width: 25%; + margin-right: var(--small-size); +} + +.info { + order: 2; +} +.info #nick { + order: 1; + margin-bottom: var(--small-size); +} +.info .tags { + order: 2; + margin-bottom: var(--small-size); +} +.info .stats { + order: 3; +} +.info .tags i { + color: #91B9D0; +} +.info .tags i:last-child { + margin-left: var(--small-size); +} +.stats span:last-child { + margin-left: var(--small-size); +} diff --git a/public/assets/css/faq/faq.css b/public/assets/css/faq/faq.css index 267d4995e5..6038d02341 100644 --- a/public/assets/css/faq/faq.css +++ b/public/assets/css/faq/faq.css @@ -1,13 +1,11 @@ -/*-------------------------------------*/ -/* PAGES ------------------------------*/ .content { display: flex; flex-wrap: wrap; - margin-top: 5em; + margin-top: calc(2 * var(--medium-size) + var(--main-size) + 0.15em);; justify-content: center; align-items: center; - margin-left: calc(var(--nav-size) + var(--side-margin)); - margin-right: var(--side-margin); + margin-left: calc(var(--nav-size)); + margin-right: 0; box-shadow: 0px 0px 60px -20px rgba(41, 50, 60, 1); } @@ -28,8 +26,8 @@ align-items: stretch; justify-content: space-evenly; width: 100%; - margin-left: calc(var(--side-margin) * 0.25); - margin-right: calc(var(--side-margin) * 0.25); + margin-left: var(--side-margin); + margin-right: var(--side-margin); padding: 0; } @@ -56,6 +54,7 @@ .markd { order: 2; background-color: #00000040; - font-size: var(--medium-size); + font-size: var(--small-size); padding: var(--unit-size); -} \ No newline at end of file + height: 100%; +} diff --git a/templates/base.html.twig b/templates/base.html.twig index 73702d837d..79b3026275 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,82 +1,115 @@ - - {% block meta %} - - - {% endblock %} - {% block title %}{% endblock %} - {% block stylesheets %} - - - - - {% endblock %} - - - {% block icons %} - - {% endblock %} + + {% block meta %} + + + {% endblock %} + + {% block title %}{% endblock %} + + {% block stylesheets %} + + + + + {% endblock %} + + + {% block icons %} + + {% endblock %} +
-
- {% block header %} - + {% endblock %} - {% block javascripts %}{% endblock %} - + {% block nav %}{% endblock %} + {% block body %}{% endblock %} +
+ {% block javascripts %}{% endblock %} + diff --git a/templates/faq/faq.html.twig b/templates/faq/faq.html.twig index ad89b4a1e4..305d5d3a9e 100644 --- a/templates/faq/faq.html.twig +++ b/templates/faq/faq.html.twig @@ -5,7 +5,7 @@ {% block header %}{{ parent() }}{% endblock %} {% block body %} -
+