diff --git a/public/assets/css/base.css b/public/assets/css/base.css index 8a4b070ecf..62a1ebbfd1 100644 --- a/public/assets/css/base.css +++ b/public/assets/css/base.css @@ -5,14 +5,16 @@ --medium-size: 0.8em; --small-size: 0.65em; --unit-size: 1em; - --side-margin: 5em; + --side-margin: 2em; --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: #2E3945; + background: -moz-linear-gradient(80deg, #2E3945 0%, #61778C 100%); + background: -webkit-linear-gradient(80deg, #2E3945 0%, #61778C 100%); + background: linear-gradient(80deg, #2E3945 0%, #61778C 100%); background-attachment: fixed; background-size: cover; color: #F6F6F6; @@ -20,7 +22,6 @@ html { font-size: var(--main-size); margin: 0; padding: 0; - height: 100%; } ul { @@ -48,12 +49,6 @@ a:visited { padding: 0; } -a { - display: inline-block; - margin: 0; - padding: 0; -} - b { font-family: var(--head-font); font-weight: 800; @@ -82,7 +77,6 @@ b { justify-content: space-between; flex-wrap: wrap; width: 100%; - align-items: center; } .icon-menu { @@ -171,7 +165,7 @@ b { transition: all 0.8s ease; } -label { +.icon-menu label { display: none; cursor: pointer } diff --git a/public/assets/css/base_mid.css b/public/assets/css/base_mid.css index 1ea7f60252..2496d46049 100644 --- a/public/assets/css/base_mid.css +++ b/public/assets/css/base_mid.css @@ -2,7 +2,7 @@ --head-font: 'Montserrat', sans-serif; --main-font: 'Open Sans', sans-serif; --main-size: 1.2em; - --medium-size: 0.8em; + --medium-size: 0.85em; --small-size: 0.65em; --unit-size: 1em; --side-margin: 5em; @@ -11,11 +11,10 @@ body, html { - background: rgb(51,61,71); - background: -moz-linear-gradient(80deg, rgba(51,61,71,1) 0%, rgba(39,46,54,1) 90%); - background: -webkit-linear-gradient(80deg, rgba(51,61,71,1) 0%, rgba(39,46,54,1) 90%); - background: linear-gradient(80deg, rgba(51,61,71,1) 0%, rgba(39,46,54,1) 90%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#333d47",endColorstr="#272e36",GradientType=1); + background: #2E3945; + background: -moz-linear-gradient(80deg, #2E3945 0%, #61778C 100%); + background: -webkit-linear-gradient(80deg, #2E3945 0%, #61778C 100%); + background: linear-gradient(80deg, #2E3945 0%, #61778C 100%); background-attachment: fixed; background-size: cover; color: #F6F6F6; diff --git a/public/assets/css/base_small.css b/public/assets/css/base_small.css index 6e740bcd6c..bda78cc07c 100644 --- a/public/assets/css/base_small.css +++ b/public/assets/css/base_small.css @@ -2,20 +2,19 @@ --head-font: 'Montserrat', sans-serif; --main-font: 'Open Sans', sans-serif; --main-size: 1.2em; - --medium-size: 0.8em; + --medium-size: 0.85em; --small-size: 0.65em; --unit-size: 1em; - --side-margin: 5em; + --side-margin: 2em; --nav-size: 100%; } body, html { - background: rgb(51,61,71); - background: -moz-linear-gradient(80deg, rgba(51,61,71,1) 0%, rgba(39,46,54,1) 90%); - background: -webkit-linear-gradient(80deg, rgba(51,61,71,1) 0%, rgba(39,46,54,1) 90%); - background: linear-gradient(80deg, rgba(51,61,71,1) 0%, rgba(39,46,54,1) 90%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#333d47",endColorstr="#272e36",GradientType=1); + background: #2E3945; + background: -moz-linear-gradient(80deg, #2E3945 0%, #61778C 100%); + background: -webkit-linear-gradient(80deg, #2E3945 0%, #61778C 100%); + background: linear-gradient(80deg, #2E3945 0%, #61778C 100%); background-attachment: fixed; background-size: cover; color: #F6F6F6; diff --git a/public/assets/css/settings/settings.css b/public/assets/css/settings/settings.css index cdbf260b49..0aa4f2f1bf 100644 --- a/public/assets/css/settings/settings.css +++ b/public/assets/css/settings/settings.css @@ -4,10 +4,8 @@ margin-top: calc(2 * var(--unit-size) + var(--main-size) + 0.15em); justify-content: center; align-items: center; - margin-left: calc(var(--nav-size)); + margin-left: var(--nav-size); margin-right: 0; - box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); - height: 100%; } .set-nav { @@ -20,6 +18,7 @@ padding: var(--medium-size); font-size: var(--medium-size); font-family: var(--head-font); + box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); } .set-nav ul { @@ -59,10 +58,15 @@ justify-content: space-between; flex-wrap: wrap; width: 100%; - background-color: #2A323B; + background-color: #00000050; padding: var(--medium-size); + margin-top: calc(2 * var(--unit-size)); + margin-left: var(--side-margin); + margin-right: var(--side-margin); font-size: var(--medium-size); font-family: var(--head-font); + border-radius: var(--unit-size) var(--unit-size) 0 0; + box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); } .set-nav2 ul { @@ -98,28 +102,31 @@ .form { order: 3; - background-color: #00000040; - font-size: var(--small-size); - padding: calc(3*var(--unit-size)); - padding-top: var(--unit-size); + background-color: #00000050; + padding: calc(2*var(--unit-size)); + font-size: var(--medium-size); height: 100%; + width: 100%; + margin-left: var(--side-margin); + margin-right: var(--side-margin); + box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); + border-radius: 0 0 var(--unit-size) var(--unit-size); } /* FORMS ------------------------------*/ -label { +.form label { font-family: 'Montserrat', sans-serif; - font-weight: 800; - font-size: var(--medium-size); + font-weight: 700; } -label:nth-child() { +.form label:nth-child() { margin-top: var(--medium-size); } -input[type=text] { +.form input[type=text] { margin-top: calc(var(--unit-size) * 0.5); - width: 100%; + width: calc(100% - var(--unit-size)); background-color: rgba(0, 0, 0, 0.30); border-style: none; padding: calc(var(--unit-size) * 0.5) calc(var(--unit-size) * 0.5); @@ -128,3 +135,16 @@ input[type=text] { font-size: var(--medium-size); margin-bottom: var(--unit-size); } + +button[type=submit] { + background: rgba(0, 0, 0, 0.30); + padding: calc(var(--unit-size) * 0.8) calc(var(--unit-size) * 2); + color: #F6F6F6; + border-style: solid; + border-color: rgba(144, 185, 208, 0.65); + border-radius: var(--unit-size); + border-width: 2px; + font-family: 'Montserrat', sans-serif; + font-size: var(--small-size); + font-weight: 700; +} diff --git a/public/assets/css/settings/settings_mid.css b/public/assets/css/settings/settings_mid.css index 25cbf09d64..c68d985318 100644 --- a/public/assets/css/settings/settings_mid.css +++ b/public/assets/css/settings/settings_mid.css @@ -6,7 +6,6 @@ align-items: center; margin-left: 0; margin-right: 0; - height: 100%; } .set-nav { @@ -55,7 +54,7 @@ justify-content: space-between; flex-wrap: wrap; width: 100%; - background-color: #00000030; + background-color: #00000050; padding: var(--medium-size); margin-top: calc(2 * var(--unit-size)); margin-left: var(--side-margin); @@ -101,10 +100,11 @@ .form { order: 3; - background-color: #00000040; + background-color: #00000050; padding: calc(2*var(--unit-size)); font-size: var(--medium-size); height: 100%; + width: 100%; margin-left: var(--side-margin); margin-right: var(--side-margin); box-shadow: 0px 0px 60px -20px rgba(0, 0, 0, 0.75); @@ -115,7 +115,7 @@ /* FORMS ------------------------------*/ label { font-family: 'Montserrat', sans-serif; - font-weight: 800; + font-weight: 700; } label:nth-child() { @@ -124,12 +124,25 @@ label:nth-child() { input[type=text] { margin-top: calc(var(--unit-size) * 0.5); - width: 100%; + width: calc(100% - var(--unit-size)); background-color: rgba(0, 0, 0, 0.30); border-style: none; - padding: calc(var(--unit-size) * 0.5) calc(var(--unit-size) * 0.5); + padding: calc(var(--unit-size) * 0.5); color: #F6F6F6; border-radius: calc(var(--unit-size) * 0.5); font-size: var(--medium-size); margin-bottom: var(--unit-size); } + +button[type=submit] { + background: rgba(0, 0, 0, 0.30); + padding: calc(var(--unit-size) * 0.8) calc(var(--unit-size) * 2); + color: #F6F6F6; + border-style: solid; + border-color: rgba(144, 185, 208, 0.65); + border-radius: var(--unit-size); + border-width: 2px; + font-family: 'Montserrat', sans-serif; + font-size: var(--small-size); + font-weight: 700; +} diff --git a/public/assets/css/settings/settings_small.css b/public/assets/css/settings/settings_small.css index 62c7b374a6..98884c6a61 100644 --- a/public/assets/css/settings/settings_small.css +++ b/public/assets/css/settings/settings_small.css @@ -55,7 +55,7 @@ justify-content: space-between; flex-wrap: wrap; width: 100%; - background-color: #00000030; + background-color: #00000050; padding: var(--medium-size); margin-top: var(--unit-size); margin-left: 1%; @@ -101,7 +101,7 @@ .form { order: 3; - background-color: #00000040; + background-color: #00000050; padding: calc(2*var(--unit-size)); font-size: var(--medium-size); height: 100%; @@ -116,7 +116,8 @@ /* FORMS ------------------------------*/ label { font-family: 'Montserrat', sans-serif; - font-weight: 800; + font-weight: 700; + font-size: var(--medium-size); } label:nth-child() { @@ -125,12 +126,25 @@ label:nth-child() { input[type=text] { margin-top: calc(var(--unit-size) * 0.5); - width: 100%; + width: calc(100% - var(--unit-size)); background-color: rgba(0, 0, 0, 0.30); border-style: none; - padding: calc(var(--unit-size) * 0.5) calc(var(--unit-size) * 0.5); + padding: calc(var(--unit-size) * 0.5); color: #F6F6F6; border-radius: calc(var(--unit-size) * 0.5); font-size: var(--medium-size); margin-bottom: var(--unit-size); } + +button[type=submit] { + background: rgba(0, 0, 0, 0.30); + padding: calc(var(--unit-size) * 0.8) calc(var(--unit-size) * 2); + color: #F6F6F6; + border-style: solid; + border-color: rgba(144, 185, 208, 0.65); + border-radius: var(--unit-size); + border-width: 2px; + font-family: 'Montserrat', sans-serif; + font-size: var(--small-size); + font-weight: 700; +} diff --git a/templates/settings/profile.html.twig b/templates/settings/profile.html.twig index 51bc8efc50..7a48c7464a 100644 --- a/templates/settings/profile.html.twig +++ b/templates/settings/profile.html.twig @@ -8,7 +8,10 @@ {% block title %}Profile Settings{% endblock %} -{% block nav %} +{% block header %}{{ parent() }}{% endblock %} + +{% block body %} +
+{% block form %} +
+ {{ form(prof) }}
{% endblock %} - -{% block body %} -
- {{ form(prof) }} -
+
{% endblock %}