diff --git a/OurUmbraco.Client/src/scss/pages/_forum.scss b/OurUmbraco.Client/src/scss/pages/_forum.scss index a2447993a6..e8be49e2b9 100644 --- a/OurUmbraco.Client/src/scss/pages/_forum.scss +++ b/OurUmbraco.Client/src/scss/pages/_forum.scss @@ -27,10 +27,6 @@ .search-big { flex: 0 0 100%; - - @media (min-width: $md) { - flex: 0 0 70%; - } } .or { @@ -173,60 +169,27 @@ } } - .category { - line-height: 1.3; - } - &.solved { background: rgba($color-our, .23); border: 2px solid rgba($color-our, .66); } - - - @media (min-width: $md) { padding: 35px 15px; - - &:hover { - // background: rgba($color-space, .08); - } - - &.solved { - &:hover { - // background: rgba($color-our, .30); - } - } } } - - .topic { order: 2; margin: 10px 0; @media (min-width: $md) { - flex: 0 0 50%; + flex: 0 0 80%; margin: 0 10% 0 0; order: 1; } } - - - .category { - order: 1; - - @media (min-width: $md) { - flex: 0 0 25%; - margin-right: 5%; - order: 2; - } - } - - - .posts { order: 3; display: flex; diff --git a/OurUmbraco.Client/src/scss/sections/_forum.scss b/OurUmbraco.Client/src/scss/sections/_forum.scss index e1fb8e2428..6df2edc586 100644 --- a/OurUmbraco.Client/src/scss/sections/_forum.scss +++ b/OurUmbraco.Client/src/scss/sections/_forum.scss @@ -1,283 +1,263 @@ section.forum { - background: rgba($color-space, .11); - background-size: 100%; - background-position: center bottom; - background-repeat: no-repeat; - position: relative; - - - h1 { - font-size: 1.8rem; - text-align: center; - position: relative; - z-index: 30; - - //margin-bottom: 3.5rem; // Remove me when text is ready under this - - @media (min-width: $md) { - font-size: 2.4rem; - } - - + p { - max-width: 700px; - margin: 1rem auto 3.5rem; - margin-bottom: 3rem; - padding: 0 10px; - - font-size: 1rem; - color: darken($color-space, 15%); - text-align: center; + background: rgba($color-space, .11); + background-size: 100%; + background-position: center bottom; + background-repeat: no-repeat; + position: relative; + + + h1 { + font-size: 1.8rem; + text-align: center; + position: relative; + z-index: 30; + @media (min-width: $md) { + font-size: 2.4rem; + } - @media (min-width: $md) { - padding: 0; - font-size: 1.2rem; - } - } - } + + p { + max-width: 700px; + margin: 1rem auto 3.5rem; + margin-bottom: 3rem; + padding: 0 10px; + font-size: 1rem; + color: darken($color-space, 15%); + text-align: center; + + @media (min-width: $md) { + padding: 0; + font-size: 1.2rem; + } + } + } - .flex { - display: flex; - flex-flow: row wrap; - justify-content: space-between; - } + .flex { + display: flex; + flex-flow: row wrap; + justify-content: space-between; + } - .forum-thread { - flex: 0 0 100%; - display: flex; - overflow: hidden; + .forum-thread { + flex: 0 0 100%; + display: flex; + overflow: hidden; - @media (min-width: $md) { - flex: 1 0 49%; + @media (min-width: $md) { + flex: 1 0 49%; - &:nth-child(odd) { - margin-right: 2%; - } - } + &:nth-child(odd) { + margin-right: 2%; + } + } - .avatar { - flex: 0 0 23%; - margin-right: 20px; + .avatar { + flex: 0 0 23%; + margin-right: 20px; - @media (min-width: $md) { - flex: 0 0 15%; - } + @media (min-width: $md) { + flex: 0 0 15%; + } - img { - width: 100%; - max-width: 112px; - height: auto; - } - } + img { + width: 100%; + max-width: 112px; + height: auto; + } + } - .meta { - display: flex; - flex-direction: column; - flex: 1 0 75%; + .meta { + display: flex; + flex-direction: column; + flex: 1 0 75%; + overflow: hidden; + padding: 0 10px 0 0; - overflow: hidden; + @media (min-width: $md) { + flex: 1 0 83%; + } + } + } - padding: 0 10px 0 0; + .goto-forum { + text-align: center; + margin-top: 20px; - @media (min-width: $md) { - flex: 1 0 83%; - } + @media (min-widt: $md) { + margin-top: 60px; + } + } - } + .button { + @media (min-width: $md) { + font-size: 1.2rem; + } + } + + small { + font-size: .9rem; + color: darken($color-space, 20%); + text-transform: uppercase; + font-weight: 700; + letter-spacing: .5px; + display: block; + margin-bottom: .5rem; + } +} +.forum-thread, .person-activity { + background: #fff; + padding: 25px; + margin-bottom: 30px; + border: 1px solid darken(#f6f6f6, 5%); + transition: box-shadow .2s ease, border-color .2s ease; + text-decoration: none; + display: flex; + align-items: center; + + &:hover { + border-color: white; + @include box_shadow(2); + } + .row { + margin: 0; + } - .category { - margin: .5rem 0 0; - max-width: 95%; + img { + border-radius: 50%; + width: 100%; + max-width: 112px; + height: auto; - span { - font-size: .75rem; - } - } + .package-forum-activity & { + border-radius: 0; + } - } + @media (min-width: $md) { + width: 58px; + } + &.aura { + border: 2px solid transparent; + border-radius: 50%; + padding: 3px; + &.mvp { + border-color: rgba($color-green, .4); + } - .goto-forum { - text-align: center; - margin-top: 20px; + &.admin { + border-color: rgba(#f61700, .4); + } - @media (min-widt: $md) { - margin-top: 60px; - } - } + &.hq { + border-color: rgba(#227cf6, .4); + } + } + } - .button { - @media (min-width: $md) { - font-size: 1.2rem; - } - } + h3 { + margin-bottom: 2px; + font-weight: normal; + color: #000; + line-height: 1.3; + font-size: 1rem; + @media (min-width: $md) { + font-size: 1.1rem; + } + } + p { + margin: 0; + text-align: left; + font-size: .9rem; + color: $color-space; + } - small { - font-size: .9rem; - color: darken($color-space, 20%); - text-transform: uppercase; - font-weight: 700; - letter-spacing: .5px; - display: block; - margin-bottom: .5rem; - } -} + small { + font-size: .8rem; + } -.forum-thread, .person-activity { - background: #fff; - padding: 25px; - margin-bottom: 30px; - border: 1px solid darken(#f6f6f6, 5%); - transition: box-shadow .2s ease, border-color .2s ease; - text-decoration: none; - - display: flex; - align-items: center; - - &:hover { - border-color: white; - @include box_shadow(2); - } - - .row { - margin: 0; - } - - img { - border-radius: 50%; - width: 100%; - max-width: 112px; - height: auto; + .col-xs-2 { + padding: 0 .1rem; - .package-forum-activity & { - border-radius: 0; + @media (min-width: $md) { + padding: 0 .3rem; } - - @media (min-width: $md) { - width: 58px; - } - - &.aura { - border: 2px solid transparent; - border-radius: 50%; - padding: 3px; - - &.mvp { - border-color: rgba($color-green, .4); - } - - &.admin { - border-color: rgba(#f61700, .4); - } - - &.hq { - border-color: rgba(#227cf6, .4); - } - } - } - - h3 { - margin-bottom: 2px; - font-weight: normal; - color: #000; - line-height: 1.3; - font-size: 1rem; - - @media (min-width: $md) { - font-size: 1.1rem; - } - } - - p { - margin: 0; - text-align: left; - font-size: .9rem; - color: $color-space; - } - - small { - font-size: .8rem; - } - - .col-xs-2 { - padding: 0 .1rem; - - @media (min-width: $md) { - padding: 0 .3rem; - } - } + } } _:-ms-input-placeholder, :root .selector { section.forum .forum-thread { - @media (min-width: $md) { - flex: 0 1 47%; - } - } + @media (min-width: $md) { + flex: 0 1 47%; + } + } } .typing-indicator { - $ti-color-bg: #E6E7ED; - background-color: $ti-color-bg; - will-change: transform; - width: auto; - border-radius: 25px; - padding: 10px; - display: table; - margin: 0 auto; - position: relative; - animation: 2s bulge infinite ease-out; - &::before, - &::after { - content: ''; - position: absolute; - bottom: -2px; - left: -2px; - height: 10px; - width: 10px; - border-radius: 50%; + $ti-color-bg: #E6E7ED; background-color: $ti-color-bg; - } - &::after { - height: 5px; - width: 5px; - left: -5px; - bottom: -5px; - } - span { - height: 8px; - width: 8px; - float: left; - margin: 0 1px !important; - background-color: #9E9EA1; - display: block; - border-radius: 50%; - opacity: 0.4; - @for $i from 1 through 3 { - &:nth-of-type(#{$i}) { - animation: 1s blink infinite ($i * .3333s); - } + will-change: transform; + width: auto; + border-radius: 25px; + padding: 10px; + display: table; + margin: 0 auto; + position: relative; + animation: 2s bulge infinite ease-out; + + &::before, + &::after { + content: ''; + position: absolute; + bottom: -2px; + left: -2px; + height: 10px; + width: 10px; + border-radius: 50%; + background-color: $ti-color-bg; + } + + &::after { + height: 5px; + width: 5px; + left: -5px; + bottom: -5px; + } + + span { + height: 8px; + width: 8px; + float: left; + margin: 0 1px !important; + background-color: #9E9EA1; + display: block; + border-radius: 50%; + opacity: 0.4; + + @for $i from 1 through 3 { + &:nth-of-type(#{$i}) { + animation: 1s blink infinite ($i * .3333s); + } + } } - } } @keyframes blink { - 50% { - opacity: 1; - } + 50% { + opacity: 1; + } } @keyframes bulge { - 50% { - transform: scale(1.05); - } -} \ No newline at end of file + 50% { + transform: scale(1.05); + } +} diff --git a/OurUmbraco.Site/Assets/js/editor.min.js b/OurUmbraco.Site/Assets/js/editor.min.js index 6e45904f1d..c5833ec4ae 100644 --- a/OurUmbraco.Site/Assets/js/editor.min.js +++ b/OurUmbraco.Site/Assets/js/editor.min.js @@ -215,9 +215,9 @@ var replyTo = ""; if (ent.closest('.actions').length > 0) { - replyTo = ent.closest('.actions').prevAll('.meta').find('a').text(); + replyTo = ent.closest('.actions').prevAll('.meta').find('a:first').text(); } else { - replyTo = $(".question:first .actions").prevAll('.meta').find('a').text() + replyTo = $(".question:first .actions").prevAll('.meta').find('a:first').text() } $('.reply-name').html(replyTo); diff --git a/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml index 42e903af23..dde1704b70 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/Forum.cshtml @@ -49,8 +49,6 @@ TimeSpan.FromMinutes(1)); var pages = (totalTopics / pageSize) + 1; - - var categories = Model.Content.AncestorOrSelf(2); } @if (Model.Content.NewTopicsAllowed() == false || Model.Content.AncestorOrSelfIsArchived()) { @@ -76,31 +74,6 @@ -
or
-
- -
-
@@ -131,7 +104,6 @@
Topic
-
Category
Replies
@@ -160,9 +132,6 @@ }
-
- @(Utils.GetForumName(forum)) -
@topic.Replies replies
} diff --git a/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml index 52dc07fdc7..79fe3a9cd7 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml @@ -107,10 +107,6 @@

@Model.Title

-
- @Model.ForumName -
- @if (Model.Version > 0) {
diff --git a/OurUmbraco.Site/Views/Partials/Forum/Thread.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Thread.cshtml index 2052cd2a08..fe69a39b44 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/Thread.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/Thread.cshtml @@ -1,6 +1,5 @@ @model ReadOnlyTopic @using System.Web.Mvc.Html -@using OurUmbraco.Forum.Extensions @using OurUmbraco.Forum.Models @using Umbraco.Core.Logging @@ -47,6 +46,15 @@
} + +@if ((DateTime.UtcNow - Model.Created.ToUniversalTime()).TotalDays > 365 * 2) +{ +
+ Heads up! Please be aware that this thread was created more than 2 years ago and it's possible that it's outdated. +
+} + +