diff --git a/assets/less/mio/classes/container.less b/assets/less/mio/classes/container.less index 73ad6ae5..4660964d 100644 --- a/assets/less/mio/classes/container.less +++ b/assets/less/mio/classes/container.less @@ -4,6 +4,15 @@ margin: 2px 0; box-shadow: 0 1px 2px var(--accent-colour); + &--new { + color: #fff; + border: initial; + background-color: #111; + text-shadow: 0 1px 4px #111; + box-shadow: 0 1px 2px #111; + margin: 0; // new style containers should not depend on existing margins + } + &--hidden { // __title should always be the first element of a container :not(:first-child) { display: none; @@ -40,7 +49,22 @@ } } + &--new &__title { + background-image: linear-gradient(0deg, transparent, var(--accent-colour)); + color: #fff; + font-weight: 400; + font-size: 1.5em; + line-height: 1.5em; + padding: 8px 10px; + font-family: inherit; + } + &__content { // only use this for text going forward, just throw your child container in directly after __title margin: 2px 5px; } + + &--new &__content { + margin: 0; + padding: 2px 5px; + } } diff --git a/assets/less/mio/classes/profile/about.less b/assets/less/mio/classes/profile/about.less new file mode 100644 index 00000000..c5d5e10a --- /dev/null +++ b/assets/less/mio/classes/profile/about.less @@ -0,0 +1,7 @@ +.profile__about { + + &__content { + max-height: 300px; + overflow: auto; + } +} diff --git a/assets/less/mio/classes/profile/accounts.less b/assets/less/mio/classes/profile/accounts.less index bdda6446..369bc90e 100644 --- a/assets/less/mio/classes/profile/accounts.less +++ b/assets/less/mio/classes/profile/accounts.less @@ -2,10 +2,6 @@ display: flex; flex-direction: column; padding: 2px 5px; - color: #fff; - text-shadow: 0 1px 4px #111; - box-shadow: 0 1px 4px #111; - background-color: #111; &__item { padding-bottom: 5px; diff --git a/assets/less/mio/main.less b/assets/less/mio/main.less index 88ff9904..5d6a7fc0 100644 --- a/assets/less/mio/main.less +++ b/assets/less/mio/main.less @@ -20,7 +20,7 @@ --text-colour-header: @default-header-text-colour; --background-colour: @default-background-colour; --background-colour-translucent: fade(@default-background-colour, 90%); - --gradient-start: @default-gradient-start; + --gradient-start: @default-gradient-start; // deprecate this in favour of --accent-colour at some point } * { @@ -81,6 +81,7 @@ body { @import "classes/profile/header"; @import "classes/profile/container"; @import "classes/profile/accounts"; +@import "classes/profile/about"; // Changelog @import "classes/changelog"; diff --git a/database/2018_09_19_170411_add_profile_about_section.php b/database/2018_09_19_170411_add_profile_about_section.php new file mode 100644 index 00000000..8c69a9df --- /dev/null +++ b/database/2018_09_19_170411_add_profile_about_section.php @@ -0,0 +1,22 @@ +exec(" + ALTER TABLE `msz_users` + ADD COLUMN `user_about_content` TEXT NULL DEFAULT NULL AFTER `display_role`, + ADD COLUMN `user_about_parser` TINYINT(4) NOT NULL DEFAULT '0' AFTER `user_about_content`; + "); +} + +function migrate_down(PDO $conn): void +{ + $conn->exec(' + ALTER TABLE `msz_users` + DROP COLUMN `user_about_content`, + DROP COLUMN `user_about_parser`; + '); +} diff --git a/templates/user/profile.twig b/templates/user/profile.twig index 06b28aad..e5c81da9 100644 --- a/templates/user/profile.twig +++ b/templates/user/profile.twig @@ -147,28 +147,51 @@ {% elseif profile_fields|default([])|length > 0 %} -