From 48a34095e161f49aa3ad9d5e809c83a80c1233e4 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 9 Nov 2016 19:32:23 +0100 Subject: [PATCH] more css updates --- resources/assets/less/yuuno/base.less | 64 +- resources/assets/less/yuuno/bem/alert.less | 3 - .../assets/less/yuuno/bem/announce-box.less | 30 + resources/assets/less/yuuno/bem/auth.less | 26 + resources/assets/less/yuuno/bem/avatar.less | 11 + resources/assets/less/yuuno/bem/banned.less | 11 + .../assets/less/yuuno/bem/container.less | 3 +- resources/assets/less/yuuno/bem/content.less | 42 +- resources/assets/less/yuuno/bem/dropdown.less | 5 +- resources/assets/less/yuuno/bem/footer.less | 6 +- .../assets/less/yuuno/bem/header-login.less | 32 + resources/assets/less/yuuno/bem/header.less | 12 +- resources/assets/less/yuuno/bem/input.less | 69 ++ resources/assets/less/yuuno/bem/link.less | 6 + resources/assets/less/yuuno/bem/members.less | 93 ++ resources/assets/less/yuuno/bem/news.less | 60 ++ resources/assets/less/yuuno/bem/profile.less | 201 ++++ resources/assets/less/yuuno/bem/user.less | 19 + resources/assets/less/yuuno/legacy.less | 952 +----------------- resources/assets/less/yuuno/main.less | 19 +- resources/assets/less/yuuno/np.less | 19 - .../assets/typescript/Sakura/Changelog.ts | 3 +- resources/views/yuuno/auth/login.twig | 59 +- resources/views/yuuno/auth/logout.twig | 18 +- resources/views/yuuno/auth/reactivate.twig | 39 +- resources/views/yuuno/auth/register.twig | 82 +- resources/views/yuuno/auth/resetpassword.twig | 72 +- resources/views/yuuno/elements/comment.twig | 12 +- .../views/yuuno/elements/indexPanel.twig | 18 +- resources/views/yuuno/elements/newsPost.twig | 16 +- .../views/yuuno/elements/pagination.twig | 10 +- .../views/yuuno/forum/elements/forumBase.twig | 4 +- .../views/yuuno/forum/elements/forumBtns.twig | 10 +- .../yuuno/forum/elements/forumEntry.twig | 8 +- .../views/yuuno/forum/elements/forumMod.twig | 10 +- .../views/yuuno/forum/elements/replyForm.twig | 10 +- .../yuuno/forum/elements/topicEntry.twig | 8 +- resources/views/yuuno/forum/forum.twig | 6 +- resources/views/yuuno/forum/index.twig | 28 +- resources/views/yuuno/forum/topic.twig | 166 ++- resources/views/yuuno/global/information.twig | 4 +- resources/views/yuuno/manage/master.twig | 10 +- resources/views/yuuno/master.twig | 122 +-- resources/views/yuuno/meta/banned.twig | 40 +- resources/views/yuuno/meta/faq.twig | 10 +- resources/views/yuuno/meta/index.twig | 6 +- resources/views/yuuno/meta/search.twig | 30 +- resources/views/yuuno/meta/settings.twig | 23 - resources/views/yuuno/news/category.twig | 24 +- resources/views/yuuno/news/post.twig | 10 +- resources/views/yuuno/premium/index.twig | 6 +- resources/views/yuuno/profile/friends.twig | 18 +- .../views/yuuno/settings/account/details.twig | 12 +- .../views/yuuno/settings/account/profile.twig | 51 +- .../views/yuuno/settings/account/ranks.twig | 2 +- .../yuuno/settings/account/signature.twig | 10 +- .../yuuno/settings/account/userpage.twig | 10 +- .../yuuno/settings/advanced/deactivate.twig | 4 +- .../yuuno/settings/advanced/sessions.twig | 4 +- .../views/yuuno/settings/friends/listing.twig | 4 +- .../yuuno/settings/friends/requests.twig | 4 +- resources/views/yuuno/settings/master.twig | 14 +- .../yuuno/settings/notifications/history.twig | 2 +- resources/views/yuuno/user/members.twig | 130 ++- resources/views/yuuno/user/profile.twig | 79 +- 65 files changed, 1262 insertions(+), 1629 deletions(-) create mode 100644 resources/assets/less/yuuno/bem/announce-box.less create mode 100644 resources/assets/less/yuuno/bem/auth.less create mode 100644 resources/assets/less/yuuno/bem/avatar.less create mode 100644 resources/assets/less/yuuno/bem/banned.less create mode 100644 resources/assets/less/yuuno/bem/header-login.less create mode 100644 resources/assets/less/yuuno/bem/input.less create mode 100644 resources/assets/less/yuuno/bem/link.less create mode 100644 resources/assets/less/yuuno/bem/members.less create mode 100644 resources/assets/less/yuuno/bem/news.less create mode 100644 resources/assets/less/yuuno/bem/profile.less create mode 100644 resources/assets/less/yuuno/bem/user.less delete mode 100644 resources/assets/less/yuuno/np.less delete mode 100644 resources/views/yuuno/meta/settings.twig diff --git a/resources/assets/less/yuuno/base.less b/resources/assets/less/yuuno/base.less index b0fe154..0aca65b 100644 --- a/resources/assets/less/yuuno/base.less +++ b/resources/assets/less/yuuno/base.less @@ -1,7 +1,6 @@ * { margin: 0; padding: 0; - box-sizing: border-box; position: relative; } @@ -34,6 +33,19 @@ h1 { color: #614390; } +a { + color: #22E; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + + &:active { + color: #E22; + } +} + hr { border: 0; height: 1px; @@ -59,3 +71,53 @@ img { display: none !important; visibility: hidden !important; } + +@keyframes spin { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } +} + +@keyframes fadeOut { + 0% { + opacity: 1; + } + + 100% { + opacity: 0; + } +} + +@keyframes fadeIn { + 0% { + opacity: 0; + } + + 100% { + opacity: 1; + } +} + +@keyframes slideInFromRight { + 0% { + right: -100%; + } + + 100% { + right: 0; + } +} + +@keyframes slideOutToBottom { + 0% { + bottom: 0; + } + + 100% { + bottom: -100%; + } +} diff --git a/resources/assets/less/yuuno/bem/alert.less b/resources/assets/less/yuuno/bem/alert.less index d68f366..bc3a6b1 100644 --- a/resources/assets/less/yuuno/bem/alert.less +++ b/resources/assets/less/yuuno/bem/alert.less @@ -1,6 +1,3 @@ -/* - * Notification styling - */ .alerts { position: fixed; bottom: 5px; diff --git a/resources/assets/less/yuuno/bem/announce-box.less b/resources/assets/less/yuuno/bem/announce-box.less new file mode 100644 index 0000000..a0f3e35 --- /dev/null +++ b/resources/assets/less/yuuno/bem/announce-box.less @@ -0,0 +1,30 @@ +.announce-box { + margin: 10px auto; + padding: 10px 3px; + width: auto; + max-width: 1024px; + border: 1px solid #9475B2; + box-shadow: 0 0 3px #9475B2; + border-radius: 3px; + background: #D3BFFF; + background: repeating-linear-gradient(-45deg, #C2AFFE, #C2AFFE 10px, #D3BFFF 10px, #D3BFFF 20px); + display: block; + text-align: center; + + &--restricted { + background: repeating-linear-gradient(-45deg, #B33, #B33 10px, #B00 10px, #B00 20px); + color: #FFF; + border: 1px solid #C00; + box-shadow: 0 0 3px #C00; + + h1 { // oops + color: #fff; + } + } + + &--header { + padding: 2px 3px; + height: 120px; + background: #D3BFFF no-repeat scroll center center; + } +} diff --git a/resources/assets/less/yuuno/bem/auth.less b/resources/assets/less/yuuno/bem/auth.less new file mode 100644 index 0000000..9630914 --- /dev/null +++ b/resources/assets/less/yuuno/bem/auth.less @@ -0,0 +1,26 @@ +.auth { + &__label { + display: block; + text-align: left; + font-size: 20px; + font-weight: 100; + padding: 0 5px; + line-height: 32px; + color: #222; + text-shadow: #888 0 0 3px; + + &--checkbox { + text-align: center; + } + } + + &__button { + display: block; + margin: 4px auto !important; + } + + &__subtext { + font-size: 10px; + line-height: 1.5em; + } +} diff --git a/resources/assets/less/yuuno/bem/avatar.less b/resources/assets/less/yuuno/bem/avatar.less new file mode 100644 index 0000000..fc377e2 --- /dev/null +++ b/resources/assets/less/yuuno/bem/avatar.less @@ -0,0 +1,11 @@ +.avatar { + background: no-repeat center center / cover transparent; + + &--border { + border: 3px solid #eee; + background-color: #eee; + box-shadow: 0 3px 7px #888; + border-radius: 3px; + margin: 5px; + } +} diff --git a/resources/assets/less/yuuno/bem/banned.less b/resources/assets/less/yuuno/bem/banned.less new file mode 100644 index 0000000..04170e3 --- /dev/null +++ b/resources/assets/less/yuuno/bem/banned.less @@ -0,0 +1,11 @@ +.banned { + &__reason { + background: #B19DDD; + border: 1px solid #9475B2; + font-size: 13px; + line-height: 19px; + overflow: auto; + padding: 6px 10px; + border-radius: 3px; + } +} diff --git a/resources/assets/less/yuuno/bem/container.less b/resources/assets/less/yuuno/bem/container.less index 0ade0dd..0a52faa 100644 --- a/resources/assets/less/yuuno/bem/container.less +++ b/resources/assets/less/yuuno/bem/container.less @@ -1,11 +1,12 @@ .container { min-height: 100%; width: 100%; + background: no-repeat center center / cover fixed transparent; &__content { padding-bottom: 220px; - @media (min-width: 1024px) { + @media (max-width: 1064px) { padding: 0; } } diff --git a/resources/assets/less/yuuno/bem/content.less b/resources/assets/less/yuuno/bem/content.less index 98fa795..a9d298e 100644 --- a/resources/assets/less/yuuno/bem/content.less +++ b/resources/assets/less/yuuno/bem/content.less @@ -1,22 +1,58 @@ .content { margin: 10px auto; padding: 2px 3px; - width: 1024px; + max-width: 1024px; border: 1px solid #9475B2; box-shadow: 0 0 3px #9475B2; border-radius: 3px; background: #D3BFFF; - &__left { + &__header { + margin: -1px -2px; + padding: 4px 5px 5px; + font-weight: 700; + font-size: 20px; + color: #306; + background: linear-gradient(90deg, rgba(148, 117, 178, .7), rgba(148, 117, 178, 0)) #C2AFFE; + border-radius: 2px; + word-wrap: break-word; + text-align: left; + + &--alt { + margin: -1px -2px -1px; + padding: 4px 5px 5px; + background: linear-gradient(270deg, rgba(148, 117, 178, .7), rgba(148, 117, 178, 0)) #C2AFFE; + text-align: right; + } + } + + &--auth { + text-align: center; + width: auto; + max-width: 400px; + } + + &--left { float: left; width: 688px; } - &__right { + &--right { float: right; width: 334px; } + @media (max-width: 1064px) { + &--left, + &--right { + width: 100%; + } + + &--left { + border-top: 1px solid #9475B2; + } + } + &--alt { background: #C2AEEE; margin: 5px 10px; diff --git a/resources/assets/less/yuuno/bem/dropdown.less b/resources/assets/less/yuuno/bem/dropdown.less index 3e835e1..0de79ce 100644 --- a/resources/assets/less/yuuno/bem/dropdown.less +++ b/resources/assets/less/yuuno/bem/dropdown.less @@ -14,7 +14,7 @@ padding: 0 1px 0 4px; display: none; color: #FFF; - text-decoration: none; + text-decoration: none !important; clear: both; transition: background .2s; @@ -24,6 +24,7 @@ &:active { background: fade(#151515, 70%); + color: inherit; } &--selected { @@ -49,7 +50,7 @@ } } - @media (max-width: 1024px) { + @media (max-width: 1064px) { float: none !important; margin-bottom: 5px; text-align: center; diff --git a/resources/assets/less/yuuno/bem/footer.less b/resources/assets/less/yuuno/bem/footer.less index 9195c2f..ab39b78 100644 --- a/resources/assets/less/yuuno/bem/footer.less +++ b/resources/assets/less/yuuno/bem/footer.less @@ -47,9 +47,13 @@ &:hover { text-decoration: underline; } + + &:active { + color: inherit; + } } - @media (max-width: 1024px) { + @media (max-width: 1064px) { position: inherit; } } diff --git a/resources/assets/less/yuuno/bem/header-login.less b/resources/assets/less/yuuno/bem/header-login.less new file mode 100644 index 0000000..6740bce --- /dev/null +++ b/resources/assets/less/yuuno/bem/header-login.less @@ -0,0 +1,32 @@ +.header-login { + background: rgba(211, 191, 255, .8); + border: 1px solid #9475B2; + box-shadow: 0 0 3px #8364A1; + text-align: center; + max-width: 1024px; + margin: 10px auto 0; + padding: 6px 3px; + border-radius: 3px; + + &__text { + width: auto !important; + display: inline-block; + } + + &__button { + margin: 0 !important; + padding: 2px 8px !important; + } + + &__label { + font-family: "Open Sans", sans-serif; + font-weight: 100; + font-size: 15px; + } + + @media (max-width: 640px) { + &__label { + display: block; + } + } +} diff --git a/resources/assets/less/yuuno/bem/header.less b/resources/assets/less/yuuno/bem/header.less index 93e5197..854a298 100644 --- a/resources/assets/less/yuuno/bem/header.less +++ b/resources/assets/less/yuuno/bem/header.less @@ -8,9 +8,9 @@ height: auto; width: auto; display: inline-block; - text-decoration: none; font: 100 70px/80px "Open Sans", sans-serif; color: #B06AC4; + text-decoration: none !important; transition: color .2s, text-shadow .2s; &:hover { @@ -53,7 +53,6 @@ margin: 0 7px -2px 6px; display: inline-block; border-bottom: 2px solid #8364A1; - text-decoration: none; text-align: center; transition: background .3s, border-color .3s; height: 30px; @@ -62,6 +61,7 @@ vertical-align: middle; font-size: 1.6em; color: #75569B; + text-decoration: none !important; background: linear-gradient(180deg, transparent 0%, transparent 50%, #8364A1 100%); background-size: 100% 200%; @@ -70,24 +70,24 @@ } &:active { + color: #75569B; background-position: 0 100%; } &--avatar { padding-left: 30px; - background: url('/images/pixel.png') no-repeat scroll left center / contain transparent; + background-size: 100% 100%; } } } } -@media (max-width: 1024px) { +@media (max-width: 1064px) { .header__menu { border: 0; padding: 10px 0 5px; margin: 0 auto; width: auto; - text-align: center; &-item { border: 0; @@ -103,7 +103,7 @@ &:active { background: #75569B; - color: #9575B2; + color: #9475B2; } &--avatar { diff --git a/resources/assets/less/yuuno/bem/input.less b/resources/assets/less/yuuno/bem/input.less new file mode 100644 index 0000000..499ec64 --- /dev/null +++ b/resources/assets/less/yuuno/bem/input.less @@ -0,0 +1,69 @@ +.input { + &__button { + box-sizing: border-box; + background: linear-gradient(0deg, #9475B2 10%, #C2AFFE 90%); + color: #306; + padding: 4px 8px; + text-decoration: none; + border-radius: 2px; + margin: 4px 2px; + display: inline-block; + font-size: 1.3em; + border: 1px solid #9475B2; + cursor: pointer; + text-decoration: none !important; + + &--disabled { + background: linear-gradient(180deg, #858585 0%, #858585 50%, #787878 50%) #858585 !important; + box-shadow: inset #222 0 0 1px !important; + text-shadow: #888 0 0 2px !important; + } + + &--current { + background: linear-gradient(0deg, #A586C3, #D3BFFF); + } + + &:hover { + color: #306; + background: linear-gradient(0deg, #9475B2 30%, #C2AFFE 70%); + } + + &:active { + color: #306; + background: linear-gradient(180deg, #9475B2 30%, #C2AFFE 70%); + } + } + + &__select { + box-sizing: border-box; + background: linear-gradient(180deg, #FFF 0%, #EEE 50%, #E5E5E5 50%) #FFF; + border: 1px solid #CCC; + box-shadow: inset #DDD 0 0 5px; + padding: 3px 4px; + vertical-align: middle; + } + + &__text { + box-sizing: border-box; + width: 100%; + padding: 3px 4px; + border: 1px solid #CCC; + box-shadow: inset #DDD 0 0 5px; + background: linear-gradient(180deg, #FFF 0%, #EEE 50%, #E5E5E5 50%) #FFF; + + &--red { + box-shadow: inset 0 0 7px #EB5959; + } + + &--green { + box-shadow: inset 0 0 7px #A9EC8B; + } + } + + &__range { + border: 0; + width: 100%; + font-size: 1.5em; + margin: 5px 0; + } +} diff --git a/resources/assets/less/yuuno/bem/link.less b/resources/assets/less/yuuno/bem/link.less new file mode 100644 index 0000000..6166eb0 --- /dev/null +++ b/resources/assets/less/yuuno/bem/link.less @@ -0,0 +1,6 @@ +.link { + &--clean { + color: inherit !important; + text-decoration: none !important; + } +} diff --git a/resources/assets/less/yuuno/bem/members.less b/resources/assets/less/yuuno/bem/members.less new file mode 100644 index 0000000..f6ca617 --- /dev/null +++ b/resources/assets/less/yuuno/bem/members.less @@ -0,0 +1,93 @@ +.members { + width: 100%; + margin: 0 auto; + padding: 10px 0; + overflow: hidden; + text-align: center; + max-width: 1280px; + + &__list { + @media (max-width: 1064px) { + padding-top: 10px; + } + + &--rectangles { + .members__box { + display: inline-flex; + width: 300px; + align-items: center; + + &-avatar { + width: 100px; + height: 100px; + flex-grow: 0; + } + + &-text { + padding-top: 0; + padding-left: 10px; + } + } + } + } + + &__box { + background: linear-gradient(180deg, #C2AFFE, #B19EED) #C2AFFE; + margin: 7px; + border-radius: 5px; + text-align: center; + box-shadow: 0 0 .5em #000; + display: inline-block; + vertical-align: top; + padding: 10px; + transition: box-shadow .2s; + + &:hover { + cursor: pointer; + box-shadow: 0 0 1em #000; + } + + &:active { + box-shadow: 0 0 1.5em #9475B2; + } + + &-avatar { + width: 200px; + height: 200px; + } + + &-text { + font-weight: 700; + padding-top: 6px; + display: block; + } + } + + &__table { + margin: 10px auto; + background: #C2AFFE; + box-shadow: 0 0 3px #9475B2; + border: 1px solid #9475B2; + max-width: 1024px; + width: auto; + border-radius: 3px; + border-spacing: 0; + + &-column { + padding: 4px 8px; + + &--legend { + border: 0 solid #9475B2; + background: #A586C4; + } + + &--thead { + border-bottom-width: 1px; + } + + &--tfoot { + border-top-width: 1px; + } + } + } +} diff --git a/resources/assets/less/yuuno/bem/news.less b/resources/assets/less/yuuno/bem/news.less new file mode 100644 index 0000000..fe4228f --- /dev/null +++ b/resources/assets/less/yuuno/bem/news.less @@ -0,0 +1,60 @@ +.news { + &__head { + margin: -1px -2px; + padding: 4px; + background: #C2AFFE; + color: inherit !important; + font-weight: 700; + display: block; + font-size: 16px; + color: inherit; + text-decoration: none !important; + } + + &__body { + font-size: 11px; + line-height: 14px; + padding: 2px 0 0 3px; + + p { // another oops for backwards compatiblity, fix this later with parsing + margin: 0; + margin-bottom: 1em; + } + } + + &__date { + font-size: 11px; + padding: 6px 15px; + text-align: right; + font-weight: 700; + } + + &__poster { + margin-top: -20px; + float: right; + text-align: center; + min-width: 140px; + z-index: 2; + text-decoration: none !important; + color: inherit !important; + } + + &__avatar { + width: 120px; + height: 120px; + + @media (max-width: 400px) { + display: none; + } + } + + &__username { + font-size: 20px; + line-height: 22px; + font-family: "Open Sans", sans-serif; + + @media (max-width: 400px) { + margin-top: 22px; + } + } +} diff --git a/resources/assets/less/yuuno/bem/profile.less b/resources/assets/less/yuuno/bem/profile.less new file mode 100644 index 0000000..9db8e36 --- /dev/null +++ b/resources/assets/less/yuuno/bem/profile.less @@ -0,0 +1,201 @@ +.profile { + background: rgba(211, 191, 255, .8) !important; + + &__header { + height: 200px; + background: no-repeat center center / cover transparent; + width: 100%; + align-items: center; + border-bottom: 1px solid #9475b2; + } + + &__info { + height: 100%; + width: 100%; + background: linear-gradient(0deg, rgba(211, 191, 255, .8), rgba(211, 191, 255, .8) 52px, transparent 52px, transparent); + width: 100%; + display: flex; + align-items: center; + + // hackjob + pointer-events: none; + position: relative; + top: -100%; + + > * { + pointer-events: auto; + } + + @media (max-width: 1064px) { + background: rgba(211, 191, 255, .5); + flex-flow: column; + } + } + + &__avatar { + height: 190px; + width: 190px; + margin: 0 2px; + flex-grow: 0; + flex-shrink: 0; + + @media (max-width: 1064px) { + height: 120px; + width: 120px; + margin: 2px; + } + } + + &__username { + align-self: flex-end; + margin-left: 4px; + } + + &__dates { + font-size: .8em; + line-height: 1.4em; + text-align: right; + align-self: flex-end; + flex-grow: 5; + height: 45px; + + @media (max-width: 500px) { + display: none; + } + } + + @media (max-width: 1064px) { + &__username, + &__dates { + flex-grow: 6; + width: 100%; + text-align: center; + } + + &__date { + display: inline-block; + + &:not(:first-child) { + padding-left: 8px; + } + } + } + + &__interactions { + display: flex; + align-items: center; + justify-content: space-between; + font-size: 2.5em; + line-height: 1.4em; + border-bottom: 1px solid #9475b2; + + &-item { + color: #8364A1; + text-decoration: none !important; + text-shadow: 0 0 2px #9475B2; + transition: all .2s; + + &:hover { + text-shadow: 0 0 6px #9475B2; + } + + &:active { + color: #725390; + text-shadow: 0 0 8px #8364A1; + } + } + + @media (max-width: 1064px) { + flex-flow: column; + } + } + + &__navigation { + margin-left: 5px; + } + + &__actions { + border-left: 1px solid #9475b2; + min-width: 345px; + text-align: right; + margin-right: 5px; + } + + @media (max-width: 1064px) { + &__navigation, + &__actions { + border: 0; + width: 100%; + text-align: center; + margin: 0; + } + } + + &__content { + display: flex; + justify-content: space-between; + + @media (max-width: 1064px) { + flex-flow: column-reverse; + } + } + + &__data { + display: block; + width: 350px; + border-left: 1px solid #9475b2; + flex-shrink: 0; + text-align: center; + + @media (max-width: 1064px) { + width: 100%; + border-bottom: 1px solid #9475b2; + border-left: 0; + } + } + + &__mode { + width: 100%; + flex-grow: 0; + margin-right: 2px; + overflow: auto; + + &-title { + padding-bottom: 2px; + border-bottom: 1px solid #9475b2; + margin-bottom: 2px; + } + + @media (max-width: 1064px) { + margin: 0; + } + } + + &__now-playing { + text-shadow: 0 0 5px #8364A1; + color: #614390; + text-align: center; + font-size: 1.2em; + line-height: 1.5em; + border-bottom: 1px solid #9475b2; + display: flex; + justify-content: space-between; + + &-link { + color: inherit; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + } + + &__friends { + text-align: center; + + &--none { + margin: 2em auto; + } + } +} diff --git a/resources/assets/less/yuuno/bem/user.less b/resources/assets/less/yuuno/bem/user.less new file mode 100644 index 0000000..c874c1d --- /dev/null +++ b/resources/assets/less/yuuno/bem/user.less @@ -0,0 +1,19 @@ +.user { + display: flex; + align-items: center; + background: no-repeat center center / cover transparent; + + &__avatar { + height: 100px; + width: 100px; + margin: 0 2px; + flex-grow: 0; + flex-shrink: 0; + } + + &__info { + background: rgba(211, 191, 255, .8); + width: 100%; + padding: 0 5px; + } +} diff --git a/resources/assets/less/yuuno/legacy.less b/resources/assets/less/yuuno/legacy.less index 087a950..0035b70 100644 --- a/resources/assets/less/yuuno/legacy.less +++ b/resources/assets/less/yuuno/legacy.less @@ -1,756 +1,6 @@ -/* - * Sakura Yuuno Stylesheet - * By Flashwave - */ - -/* Import bbcode specific style */ -@import "np"; - -/* - * Animation Keyframes - */ -/* Spin */ -@keyframes spin { - - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } - -} - -/* Fade out */ -@keyframes fadeOut { - - 0% { - opacity: 1; - } - - 100% { - opacity: 0; - } - -} - -/* Fade in */ -@keyframes fadeIn { - - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } - -} - -/* Slide in from right */ -@keyframes slideInFromRight { /* Requires position: relative to be set on the element */ - - 0% { - right: -100%; - } - - 100% { - right: 0; - } - -} - -/* Slide out to bottom */ -@keyframes slideOutToBottom { /* Read comment above */ - - 0% { - bottom: 0; - } - - 100% { - bottom: -100%; - } - -} - -/* - * Standard Elements - */ - - - - -.centreAlign { - text-align: center; -} - -.leftAlign { - text-align: left; -} - -.rightAlign { - text-align: right; -} - -.default-avatar-setting { - max-width: 200px; - max-height: 200px; - border: 3px solid #EEE; - background: #EEE; - box-shadow: 0 3px 7px #888; - border-radius: 3px; - margin: 5px; -} - - -a.clean, -a.underline, -a.no-underline { - color: inherit !important; - text-decoration: none !important; -} - -a.underline:hover { - text-decoration: underline !important; -} - -a.default { - color: #22E; - text-decoration: none; -} - -a.default:hover { - color: #22E; - text-decoration: underline; -} - -a.default:active { - color: #E22; - text-decoration: underline; -} - -.content .head, -.loginPage .head { - margin: -1px -2px; - padding: 4px 5px 5px; - font-weight: 700; - font-size: 20px; - color: #306; - background: linear-gradient(90deg, rgba(148, 117, 178, .7), rgba(148, 117, 178, 0)) #C2AFFE; - border-radius: 2px; - word-wrap: break-word; -} - -.content-right .head { - margin: -1px -2px -1px; - padding: 4px 5px 5px; - font-weight: 700; - font-size: 20px; - color: #306; - background: linear-gradient(270deg, rgba(148, 117, 178, .7), rgba(148, 117, 178, 0)) #C2AFFE; - border-radius: 2px; - word-wrap: break-word; -} - -.head > .links { - float: right; -} - -@media (max-width: 1024px) { - .membersPageList { - padding-top: 10px; - } -} - -.headerLoginContainer { - background: rgba(211, 191, 255, .8); - border: 1px solid #9475B2; - box-shadow: 0 0 3px #8364A1; - text-align: center; - max-width: 1024px; - margin: 10px auto 0; - padding: 6px 3px; - border-radius: 3px; -} - -.headerLoginContainer form, -.headerLoginContainer div { - display: inline-block; -} - -.headerLoginContainer input[type="submit"], -.headerLoginContainer button { - display: inline-block !important; - border-radius: 3px !important; -} - -@media (max-width: 640px) { - - #headerLoginForm > div { - display: block; - } - - #headerLoginForm label { - text-align: right; - min-width: 80px; - display: inline-block; - } - -} - -#headerLoginForm label { - font-family: "Open Sans", sans-serif; - font-weight: 100; - font-size: 15px; -} - - -.headerNotify { - margin: 10px auto; - padding: 10px 3px; - width: auto; - max-width: 1024px; - border: 1px solid #9475B2; - box-shadow: 0 0 3px #9475B2; - border-radius: 3px; - background: #D3BFFF; - background: repeating-linear-gradient(-45deg, #C2AFFE, #C2AFFE 10px, #D3BFFF 10px, #D3BFFF 20px); - display: block; - text-align: center; -} - -.headerAnnouncement { - display: block; - margin: 10px auto; - text-align: center; - padding: 2px 3px; - border: 1px solid #9475B2; - box-shadow: 0 0 3px #9475B2; - border-radius: 3px; - max-width: 1024px; - height: 120px; - background: #D3BFFF no-repeat scroll center center; -} - -.headerAnnouncement > a { - display: block; - width: 100%; - height: 100%; -} - - -/* - * Authentication page Styling - */ -.loginPage { - margin: 0 auto; - max-width: 825px; -} - -.loginPage > * { - text-align: center; - margin: 10px auto; - padding: 2px 3px; - width: 400px; - border: 1px solid #9475B2; - box-shadow: 0 0 3px #9475B2; - border-radius: 3px; - background: #D3BFFF; -} - -@media (max-width: 430px) { - .loginPage > * { - width: 300px; - } -} - -.loginPage .head { - text-align: left; -} - -.loginPage > div > form > div > input { - font-size: 16px; -} - -.loginPage input[type="text"], -.loginPage input[type="password"] { - width: calc(100% ~'-' 16px); -} - -.loginPage form > div > label { - font-size: 20px; - font-weight: 100; - padding: 0 5px; - line-height: 32px; - color: #222; - text-shadow: #888 0 0 3px; -} - -.loginPage .subLinks { - font-size: 10px; -} - -/* - * Members page Styling - */ -.membersPage { - width: 100%; - margin: 0 auto; - padding: 10px 0; - overflow: hidden; - text-align: center; - max-width: 1280px; -} - -.membersPage a { - color: inherit; -} - -.membersPage .userBox { - background: linear-gradient(180deg, #C2AFFE, #B19EED) no-repeat scroll left top / cover #C2AFFE; - margin: 7px; - border-radius: 5px; - text-align: center; - box-shadow: 0 0 .5em #000; - display: inline-block; - vertical-align: top; - transition: box-shadow .2s; -} - -.membersPage .userBox { - padding: 10px; - line-height: 330%; -} - -.membersPage .userBox:hover { - box-shadow: 0 0 1em #000; - cursor: pointer; -} - -.membersPage .userBox:active { - box-shadow: 0 0 1.5em #9475B2; -} - -.membersPage .userBox img { - margin: 0 auto; -} - -.membersPage .userBox .userBoxUserName { - font-weight: 700; -} - -.membersPage .boxes .userBox { - width: 200px; - height: 230px; -} - -.membersPage .boxes .userBox img { - width: 200px; - height: 200px; - display: block; -} - -.membersPage .rectangles .userBox { - width: 300px; - height: 100px; - text-align: left; -} - -.membersPage .rectangles .userBox img { - width: 100px; - height: 100px; - display: inline-block; -} - -.membersPage .rectangles .userBox .userBoxUserName { - display: inline-block; - vertical-align: top; - padding: 30px 10px; -} - -.membersPage .list table { - margin: 10px auto; - background: #C2AFFE; - box-shadow: 0 0 3px #9475B2; - border: 1px solid #9475B2; - max-width: 1024px; - width: auto; - border-radius: 3px; - border-spacing: 0; -} - -.membersPage .list table td, -.membersPage .list table th { - padding: 4px 8px; -} - -.membersPage .list thead th { - border-bottom: 1px solid #9475B2; - background: #A586C4; -} - -.membersPage .list tfoot th { - border-top: 1px solid #9475B2; - background: #A586C4; -} - -/* - * Private Messages Styling - */ -.messages table { - width: 100%; - border-spacing: 0; -} - -.messages table > tbody > tr.unread { - background: #C2AFFE; - font-weight: 700; -} - -.messages table > tbody > tr > td { - border-bottom: 1px solid #B19EED; - border-top: 1px solid #B19EED; -} - -.messages table > * > tr > td { - padding: 0 4px; -} - -.messages table > * > tr > td:first-child { - width: 150px; - text-align: center; -} - -.messages table > tbody > tr > td:first-child { - border-left: 1px solid #B19EED; -} - -.messages table > * > tr > td:last-child { - width: 220px; - text-align: center; -} - -.messages table > tbody > tr > td:last-child { - border-right: 1px solid #B19EED; -} - -/* - * Background transparency - */ -.background-transparent { - border-style: dashed; - background: fade(#D3BFFF, 50%); -} - -/* - * News page styling - */ -.news { - min-height: 0; -} - -.news-head { - margin: -1px -2px; - padding: 4px; - background: #C2AFFE; - font-weight: 700; - display: block; - font-size: 17px; - color: inherit; - text-decoration: none; -} - -.news-body { - font-size: .9em; - padding: 2px 0 0 3px; -} - -.news-body p { - margin: 0; - margin-bottom: 1em; -} - -.news-post-time { - font-size: 8pt; - padding: 6px 15px; - text-align: right; - font-weight: 700; -} -.news-poster { - margin-top: -20px; - float: right; - text-align: center; - min-width: 140px; -} - -.news-poster img { - max-width: 120px; - max-height: 120px; -} - -.news-poster h1 { - line-height: 100%; - margin: 0; - margin-top: -5px; -} - -@media (max-width: 768px) { - - .news-poster { - margin: 0; - } - -} - -@media (max-width: 400px) { - - .news-poster { - margin-top: 10px; - width: auto; - padding: 0 10px 0 0; - } - - .news-poster img { - display: none; - } - -} - -/* - * Profile page Styling - */ -.profile { - background: rgba(211, 191, 255, .8) !important; -} - -.profile .content-left { - max-height: 800px; - overflow: auto; -} - -.profile .user-actions { - font-size: 3em; - line-height: 1.4em; -} - -.profile .user-actions a { - color: #8364A1; - text-decoration: none; - text-shadow: 0 0 2px #9475B2; - transition: all .2s; -} - -.profile .user-actions a:hover { - text-shadow: 0 0 6px #9475B2; -} - -.profile .user-actions a:active { - color: #725390; - text-shadow: 0 0 8px #8364A1; -} - -@media (max-width: 1024px) { - - .content { - width: auto; - } - - .content .content-right { - width: 100% !important; - min-height: 0; - } - - .content .content-left { - width: 100% !important; - min-height: 0; - border-top: 1px solid #9475B2; - } - -} - -/* - * New profile page styling - */ -.new-profile { - background: rgba(211, 191, 255, .8) !important; -} - -.new-profile .new-profile-header { - height: 200px; - background: no-repeat center center / cover transparent; - width: 100%; - align-items: center; - border-bottom: 1px solid #9475b2; -} - -.new-profile .new-profile-info { - height: 100%; - width: 100%; - background: linear-gradient(0deg, rgba(211, 191, 255, .8), rgba(211, 191, 255, .8) 52px, transparent 52px, transparent); - width: 100%; - display: flex; - align-items: center; - - // hackjob - pointer-events: none; - position: relative; - top: -100%; - - > * { - pointer-events: auto; - } -} - -.new-profile .new-profile-avatar { - height: 190px; - width: 190px; - margin: 0 2px; - flex-grow: 0; - flex-shrink: 0; - background: no-repeat center center / cover #FFF; -} - -.new-profile .new-profile-username { - align-self: flex-end; - margin-left: 4px; -} - -.new-profile .new-profile-dates { - font-size: .8em; - line-height: 1.4em; - text-align: right; - align-self: flex-end; - flex-grow: 5; - height: 45px; -} - -.new-profile .new-profile-interactions { - display: flex; - align-items: center; - justify-content: space-between; - font-size: 2.5em; - line-height: 1.4em; - border-bottom: 1px solid #9475b2; -} - -.new-profile .new-profile-interactions a { - color: #8364A1; - text-decoration: none; - text-shadow: 0 0 2px #9475B2; - transition: all .2s; -} - -.new-profile .new-profile-interactions a:hover { - text-shadow: 0 0 6px #9475B2; -} - -.new-profile .new-profile-interactions a:active { - color: #725390; - text-shadow: 0 0 8px #8364A1; -} - -.new-profile .new-profile-navigation { - margin-left: 5px; -} - -.new-profile .new-profile-actions { - border-left: 1px solid #9475b2; - min-width: 345px; - text-align: right; - margin-right: 5px; -} - -.new-profile .new-profile-content { - display: flex; - justify-content: space-between; -} - -.new-profile .new-profile-data { - display: block; - width: 350px; - border-left: 1px solid #9475b2; - flex-shrink: 0; - text-align: center; -} - -.new-profile .new-profile-mode { - width: 100%; - flex-grow: 0; - margin-right: 2px; - overflow: auto; -} - -.new-profile .new-profile-mode-title { - padding-bottom: 2px; - border-bottom: 1px solid #9475b2; - margin-bottom: 2px; -} - -@media (max-width: 1032px) { - .new-profile .new-profile-info { - background: rgba(211, 191, 255, .5); - flex-flow: column; - } - - .new-profile .new-profile-avatar { - height: 120px; - width: 120px; - margin: 2px; - } - - .new-profile .new-profile-dates, - .new-profile .new-profile-username { - flex-grow: 6; - width: 100%; - text-align: center; - } - - .new-profile .new-profile-dates br { - content: ""; - } - - .new-profile .new-profile-dates br:before { - content: "- "; - } - - .new-profile .new-profile-interactions { - flex-flow: column; - } - - .new-profile .new-profile-navigation, - .new-profile .new-profile-actions { - border: 0; - width: 100%; - text-align: center; - margin: 0; - } - - .new-profile .new-profile-content { - flex-flow: column-reverse; - } - - .new-profile .new-profile-data { - width: 100%; - border-bottom: 1px solid #9475b2; - border-left: 0; - } - - .new-profile .new-profile-mode { - margin: 0; - } -} - -@media (max-width: 500px) { - .new-profile .new-profile-dates { - display: none; - } -} - /* * Friends section */ - .profile-friends { text-align: center; } @@ -826,19 +76,6 @@ a.default:active { background: #888; } -/* - * User Background - */ -#userBackground { - position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; - z-index: -1; - background: no-repeat center center / cover transparent; -} - /* * Settings page styling */ @@ -891,6 +128,7 @@ a.default:active { .settings .settings-table { width: 100%; + border-spacing: 0; } .settings .settings-table tr > th { @@ -917,10 +155,6 @@ a.default:active { width: 100%; } -.settings .profile-field > div:nth-child(2) > input { - width: calc(100% ~'-' 16px); -} - .settings .profile-save { text-align: center; padding: 10px; @@ -1089,7 +323,7 @@ a.default:active { width: 100%; } -@media (max-width: 1024px) { +@media (max-width: 1064px) { .settings .friends-list > div:not(:last-child) { margin-bottom: 6px; @@ -1141,7 +375,7 @@ a.default:active { color: #503170; } -@media (min-width: 1024px) { +@media (min-width: 1064px) { .support .featureBox.final { width: 818px; @@ -1243,107 +477,6 @@ a.default:active { background: linear-gradient(180deg, #C2AFFE, transparent); } -/* - * Input box Styling - */ -input[type="submit"].inputStyling, -input[type="button"].inputStyling, -input[type="reset"].inputStyling, -button.inputStyling, -a.button { - padding: 3px 10px; - cursor: pointer; - border: 0; - border-radius: 3px; - background: linear-gradient(180deg, #9475B2 0%, #9475B2 50%, #86A 50%) #9475B2; - margin: 4px 1px; - color: #FFF; - box-shadow: inset #222 0 0 1px; - text-shadow: #888 0 0 2px; - transition: text-shadow .5s, box-shadow .5s; - font-size: 22px; - min-width: 120px; -} - -input[type="submit"].inputStyling.small, -input[type="button"].inputStyling.small, -input[type="reset"].inputStyling.small, -button.inputStyling.small, -a.button.small { - padding: 0 4px 1px; - margin: -2px 0 0; - font-size: 16px; - border-radius: 0; - min-width: 80px !important; -} - -input[type="submit"].inputStyling:hover, -input[type="button"].inputStyling:hover, -input[type="reset"].inputStyling:hover, -button.inputStyling:hover, -a.button:hover { - box-shadow: inset #222 0 0 3px; - text-shadow: #F1F1F1 0 0 5px; -} - -input[type="submit"].inputStyling:active, -input[type="button"].inputStyling:active, -input[type="reset"].inputStyling:active, -button.inputStyling:active, -a.button:active { - box-shadow: inset #222 0 0 5px; - text-shadow: #F1F1F1 0 0 3px; - transition: text-shadow .2s, box-shadow .2s; -} - -input[type="submit"][disabled=disabled].inputStyling, -input[type="button"][disabled=disabled].inputStyling, -input[type="reset"][disabled=disabled].inputStyling, -button[disabled=disabled].inputStyling, -a.button[disabled=disabled] { - background: linear-gradient(180deg, #858585 0%, #858585 50%, #787878 50%) #858585 !important; - box-shadow: inset #222 0 0 1px !important; - text-shadow: #888 0 0 2px !important; -} - -input[type="text"].inputStyling, -input[type="password"].inputStyling, -input[type="date"].inputStyling, -input[type="url"].inputStyling { - padding: 3px 4px; - border: 1px solid #CCC; - box-shadow: inset #DDD 0 0 5px; - background: linear-gradient(180deg, #FFF 0%, #EEE 50%, #E5E5E5 50%) #FFF; -} - -input[type="text"].inputStyling.red, -input[type="password"].inputStyling.red, -input[type="date"].inputStyling.red, -input[type="url"].inputStyling.red { - box-shadow: inset 0 0 7px #EB5959; -} - -input[type="text"].inputStyling.green, -input[type="password"].inputStyling.green, -input[type="date"].inputStyling.green, -input[type="url"].inputStyling.green { - box-shadow: inset 0 0 7px #A9EC8B; -} - -input[type="range"].inputStyling { - border: 0; - width: 100%; - font-size: 1.5em; - margin: 5px 0; -} - -textarea.inputStyling { - padding: 3px 4px; - border: 1px solid #CCC; - box-shadow: inset #DDD 0 0 5px; - background: linear-gradient(180deg, #FFF 0%, #EEE 50%, #E5E5E5 50%) #FFF; -} - /* * Forum Styling */ @@ -1596,10 +729,6 @@ textarea.inputStyling { padding: 3px 0 2px; } -.posting-subject input { - width: calc(100% ~'-' 10px); -} - .posting-bbcodes { padding: 4px 0 2px; } @@ -1626,8 +755,6 @@ textarea.inputStyling { } .posting-text textarea { - min-width: calc(100% ~'-' 10px); - max-width: calc(100% ~'-' 10px); min-height: 200px; } @@ -1648,55 +775,6 @@ textarea.inputStyling { float: right; } -/* - * Pagination - */ -.pagination a, -.forumbtn { - background: linear-gradient(0deg, #9475B2 10%, #C2AFFE 90%); - color: #306; - padding: 4px 8px; - text-decoration: none; - border-radius: 2px; - margin: 4px 2px; - display: inline-block; - font-size: 1.3em; - border: 1px solid #9475B2; - cursor: pointer; -} - -button.forumbtn { - padding: 3px 6px; -} - -.pagination a.current, -.forumbtn.current { - background: linear-gradient(0deg, #A586C3, #D3BFFF); -} - -.pagination a:hover, -.forumbtn:hover { - background: linear-gradient(0deg, #9475B2 30%, #C2AFFE 70%); -} - -.pagination a:active, -.forumbtn:active { - background: linear-gradient(180deg, #9475B2 30%, #C2AFFE 70%); -} - -/* - * Ban page styling - */ -.banned p { - background: #B19DDD; - border: 1px solid #9475B2; - font-size: 13px; - line-height: 19px; - overflow: auto; - padding: 6px 10px; - border-radius: 3px; -} - /* * Comments */ @@ -1847,27 +925,3 @@ button.forumbtn { #comments ul > li > ul .comment > textarea.comment-content { height: 40px; } - -/* - * User container - */ -.user-container { - display: flex; - align-items: center; - background: no-repeat center center / cover transparent; -} - -.user-container-avatar { - height: 100px; - width: 100px; - margin: 0 2px; - flex-grow: 0; - flex-shrink: 0; - background: no-repeat center center / cover #FFF; -} - -.user-container-info { - background: rgba(211, 191, 255, .8); - width: 100%; - padding: 0 5px; -} diff --git a/resources/assets/less/yuuno/main.less b/resources/assets/less/yuuno/main.less index 1be0124..c5cbe4f 100644 --- a/resources/assets/less/yuuno/main.less +++ b/resources/assets/less/yuuno/main.less @@ -1,7 +1,15 @@ +/* + * Yuuno Stylesheet + * By Flashwave (2014-2016) + */ + @import "base"; -@import "legacy"; @import "bem/alert"; +@import "bem/announce-box"; +@import "bem/auth"; +@import "bem/avatar"; +@import "bem/banned"; @import "bem/bbcode"; @import "bem/busy"; @import "bem/container"; @@ -10,4 +18,13 @@ @import "bem/dropdown"; @import "bem/footer"; @import "bem/header"; +@import "bem/header-login"; +@import "bem/input"; +@import "bem/link"; +@import "bem/members"; +@import "bem/news"; +@import "bem/profile"; @import "bem/uploader"; +@import "bem/user"; + +@import "legacy"; diff --git a/resources/assets/less/yuuno/np.less b/resources/assets/less/yuuno/np.less deleted file mode 100644 index 9a2aa08..0000000 --- a/resources/assets/less/yuuno/np.less +++ /dev/null @@ -1,19 +0,0 @@ -.np { - text-shadow: 0 0 5px #8364A1; - color: #614390; - text-align: center; - font-size: 1.2em; - line-height: 1.5em; - border-bottom: 1px solid #9475b2; - display: flex; - justify-content: space-between; - - a { - color: inherit; - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } -} diff --git a/resources/assets/typescript/Sakura/Changelog.ts b/resources/assets/typescript/Sakura/Changelog.ts index 8ac8749..f5d139c 100644 --- a/resources/assets/typescript/Sakura/Changelog.ts +++ b/resources/assets/typescript/Sakura/Changelog.ts @@ -22,7 +22,7 @@ namespace Sakura this.Element.style.borderSpacing = '0 1px'; - var title: HTMLDivElement = DOM.Create('div', 'head'), + var title: HTMLDivElement = DOM.Create('div', 'content__header content__header--alt'), link: HTMLLinkElement = DOM.Create('a', 'underline'); title.style.marginBottom = '1px'; @@ -30,6 +30,7 @@ namespace Sakura link.innerText = 'Changelog'; link.href = Config.ChangelogUrl; link.target = '_blank'; + link.style.color = 'inherit'; DOM.Append(title, link); DOM.Append(target, title); diff --git a/resources/views/yuuno/auth/login.twig b/resources/views/yuuno/auth/login.twig index fe13095..a9b9f4c 100644 --- a/resources/views/yuuno/auth/login.twig +++ b/resources/views/yuuno/auth/login.twig @@ -3,37 +3,34 @@ {% set title = 'Login' %} {% block content %} -
-
-
- Login -
-
- -
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-

I don't have an account yet!

-

I forgot my password!

-

I want to reactivate my account!

-
-
+
+
+ Login
+
+ + + + + +
+ I don't have an account yet!
+ I forgot my password!
+ I want to reactivate my account! +
+
{% endblock %} diff --git a/resources/views/yuuno/auth/logout.twig b/resources/views/yuuno/auth/logout.twig index 635719f..5934939 100644 --- a/resources/views/yuuno/auth/logout.twig +++ b/resources/views/yuuno/auth/logout.twig @@ -3,16 +3,14 @@ {% set title = 'Logout' %} {% block content %} -
-
-
- Are you sure? -
-
-
- -
-
+
+
+ Are you sure?
+
+ +
{% endblock %} diff --git a/resources/views/yuuno/auth/reactivate.twig b/resources/views/yuuno/auth/reactivate.twig index b5f0622..ba27dc6 100644 --- a/resources/views/yuuno/auth/reactivate.twig +++ b/resources/views/yuuno/auth/reactivate.twig @@ -3,29 +3,22 @@ {% set title = 'Reactivate account' %} {% block content %} -
-
-
- Reactivate account -
-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
+
+
+ Reactivate account
+
+ + + +
{% endblock %} diff --git a/resources/views/yuuno/auth/register.twig b/resources/views/yuuno/auth/register.twig index 696442e..35f3a1f 100644 --- a/resources/views/yuuno/auth/register.twig +++ b/resources/views/yuuno/auth/register.twig @@ -3,62 +3,36 @@ {% set title = 'Register' %} {% block content %} +
{% if config('user.disable_registration') %} -
-
-
-
-

Registration is disabled.

-

Please try again later.

-
-
-
+
+

Registration is disabled.

+

Please try again later.

{% else %} -
-
-
- Register -
-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- By creating an account you agree to the Terms of Service. -
-
-
-
-

-

Are you {{ haltName }}?

-

Making more than one account is not permitted.

-

If you lost your password please use the reset password form but if you don't already have an account you can go ahead and click the link below to show the registration form this check is based on your IP so in some cases someone may have registered/used the site on this IP already.

-

If we find out that you already have an account we may question you about it, if you can give a good reason we'll let it slide otherwise we may issue a temporary ban.

-
-
- This is a mistake, let me register anyway! -
-
+
+ Register
-
+
+ + + + +
+ By creating an account you agree to the Terms of Service.
+ You are only allowed to make a single account. +
+
{% endif %} +
{% endblock %} diff --git a/resources/views/yuuno/auth/resetpassword.twig b/resources/views/yuuno/auth/resetpassword.twig index 8e1a147..4110ce2 100644 --- a/resources/views/yuuno/auth/resetpassword.twig +++ b/resources/views/yuuno/auth/resetpassword.twig @@ -3,46 +3,38 @@ {% set title = 'Reset Password' %} {% block content %} -
-
-
- Reset Password -
-
- - {% if get.u is defined and get.k is defined %} - - -
- -
-
- -
-
- -
- {% else %} -
- -
-
- -
-
- -
-
- -
-
- -
-
- Contact us if you lost access to your e-mail address! -
- {% endif %} -
+
+
+ Reset Password
+
+ + {% if get.u is defined and get.k is defined %} + + + + + {% else %} + + + +
+ Contact us if you lost access to your e-mail address! +
+ {% endif %} +
{% endblock %} diff --git a/resources/views/yuuno/elements/comment.twig b/resources/views/yuuno/elements/comment.twig index abf039f..a18a328 100644 --- a/resources/views/yuuno/elements/comment.twig +++ b/resources/views/yuuno/elements/comment.twig @@ -1,18 +1,18 @@
  • - {{ comment.userData.username }} + {{ comment.userData.username }}
    diff --git a/resources/views/yuuno/elements/indexPanel.twig b/resources/views/yuuno/elements/indexPanel.twig index b0897ac..25838a0 100644 --- a/resources/views/yuuno/elements/indexPanel.twig +++ b/resources/views/yuuno/elements/indexPanel.twig @@ -1,26 +1,26 @@
    {% if user.isActive %} -
    -
    -
    -

    {{ user.username }}

     +
    +
    +
    +

    {{ user.username }}

     {% set friendRequests = user.friends(-1, true)|length %} {% if friendRequests %} - {{ friendRequests }} new friend requests + {{ friendRequests }} new friend requests {% endif %}
    {% endif %} -
    Stats
    +
    Stats
    We have {{ stats.userCount }} user{% if stats.userCount != 1 %}s{% endif %}, - {{ stats.newestUser.username }} is the newest user, + {{ stats.newestUser.username }} is the newest user, it has been {{ stats.lastRegDate }} day{{ stats.lastRegDate == 1 ? '' : 's' }} since the last user registered and the forum has {{ stats.topicCount }} topic{% if stats.topicCount != 1 %}s{% endif %} and {{ stats.postCount }} post{% if stats.postCount != 1 %}s{% endif %}. -
    Online Users
    +
    Online Users
    {% if stats.onlineUsers %} All active users in the past 2 minutes {% for amount,onlineUser in stats.onlineUsers %} - + {% endfor %}
    {{ onlineUser.username }}
    {{ onlineUser.username }}
    {% else %} diff --git a/resources/views/yuuno/elements/newsPost.twig b/resources/views/yuuno/elements/newsPost.twig index 499ea68..0881518 100644 --- a/resources/views/yuuno/elements/newsPost.twig +++ b/resources/views/yuuno/elements/newsPost.twig @@ -1,9 +1,9 @@ -{% if newsHideTitle is not defined %}{{ post.title }}{% endif %} -
    - -
    - {{ post.userData.username }} -

    {{ post.userData.username }}

    +{% if newsHideTitle is not defined %}    {{ post.title }}{% endif %} +
    + +
    +
    + {{ post.userData.username }}
    @@ -11,7 +11,7 @@
    -
    +
    Posted - {% if newsHideCommentCount is not defined %}{{ post.commentCount }} comment{% if post.commentCount != 1 %}s{% endif %}{% endif %} + {% if newsHideCommentCount is not defined %}{{ post.commentCount }} comment{% if post.commentCount != 1 %}s{% endif %}{% endif %}
    diff --git a/resources/views/yuuno/elements/pagination.twig b/resources/views/yuuno/elements/pagination.twig index 7473620..e7b0813 100644 --- a/resources/views/yuuno/elements/pagination.twig +++ b/resources/views/yuuno/elements/pagination.twig @@ -5,19 +5,19 @@ {% if paginationPages is defined and paginationPages|length > 1 %} {% if paginationPage > 1 %} {% if paginationPages|length > 2 %} - + {% endif %} - + {% endif %} {% for id,page in paginationPages %} {% if (id + 1) > (paginationPage - 3) and (id + 1) < (paginationPage + 3) %} - {{ id + 1 }} + {{ id + 1 }} {% endif %} {% endfor %} {% if paginationPage < paginationPages|length %} - + {% if paginationPages|length > 2 %} - + {% endif %} {% endif %} {% endif %} diff --git a/resources/views/yuuno/forum/elements/forumBase.twig b/resources/views/yuuno/forum/elements/forumBase.twig index f8aa5ec..c389199 100644 --- a/resources/views/yuuno/forum/elements/forumBase.twig +++ b/resources/views/yuuno/forum/elements/forumBase.twig @@ -1,10 +1,10 @@ -
    {{ title }}
    +
    {{ title }}
    {% for forum in forum.forums %} {% if forum.type == 1 %} {% if forum.forums|length and forum.perms.view %}
    - {% if forum.type != 1 %}Subforums{% else %}{{ forum.name }}{% endif %} + {% if forum.type != 1 %}Subforums{% else %}{{ forum.name }}{% endif %}
    {% for forum in forum.forums %} {% include 'forum/elements/forumEntry.twig' %} diff --git a/resources/views/yuuno/forum/elements/forumBtns.twig b/resources/views/yuuno/forum/elements/forumBtns.twig index ff168e0..ee26ba2 100644 --- a/resources/views/yuuno/forum/elements/forumBtns.twig +++ b/resources/views/yuuno/forum/elements/forumBtns.twig @@ -1,18 +1,18 @@ {% set paginationClass = 'rightSide' %} -