From 59d8b2070328ee7be97d7e6d1e89657a3c29fb2c Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 11:45:17 +0100 Subject: [PATCH 01/10] Logged in and out users have same page, changes to text positioning --- .../Views/Partials/Community/Home.cshtml | 59 ++++++++----------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml index a4894b30b6..0b9ac5df57 100644 --- a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml +++ b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml @@ -11,32 +11,33 @@ }
+
+
+
+
+ The friendliest CMS community on the planet +

our.umbraco.org is the central hub for the friendly umbraco community. Search for documentation, get help and guidance from seasoned experts, download and collaborate on plugins and extensions.

+
+
-
-
- - -
- -
- -
-
    -
    - - @if (MemberData == null) - { -
    -
    -
    -
    - The friendliest CMS community on the planet -

    our.umbraco.org is the central hub for the friendly umbraco community. Search for documentation, get help and guidance from seasoned experts, download and collaborate on plugins and extensions.

    -
    +
    +
    + +
    +
    + +
    +
      +
      + + +

      Or ask a question

       +
      - } +
      +
      @@ -59,24 +60,14 @@ @Html.Raw(homeNotificationText) } -@if (Members.IsLoggedIn()) -{ - @ForumActivity() - @Gitter() - @Meetups() - @GitHubContributors() - @TwitterSearch() - @Html.Partial("home/documentation") -} -else -{ + @Html.Partial("home/documentation") @ForumActivity() @Gitter() @Meetups() @GitHubContributors() @TwitterSearch() -} + @helper ForumActivity() { From 480aa2f5311d043cecdb45b0fceb5c097febe409 Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 14:07:12 +0100 Subject: [PATCH 02/10] Ask me a question link behaviour dependent on login status --- OurUmbraco.Client/build/sign-in.html | 2 +- .../Views/Partials/Community/Home.cshtml | 32 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/OurUmbraco.Client/build/sign-in.html b/OurUmbraco.Client/build/sign-in.html index 70489bedd9..4ab0224a5a 100644 --- a/OurUmbraco.Client/build/sign-in.html +++ b/OurUmbraco.Client/build/sign-in.html @@ -1,4 +1,4 @@ - + diff --git a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml index 0b9ac5df57..7979dbef96 100644 --- a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml +++ b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml @@ -3,11 +3,13 @@ @using OurUmbraco.Our.Models @inherits OurUmbracoTemplatePage @{ - + var featuresService = new UpcomingFeaturesService(); + var userIsLoggedIn = featuresService.MemberHasAccessToFeature(); var homeNotificationText = Model.Content.GetPropertyValue("homeOnlyBanner"); var showHomeNotification = string.IsNullOrWhiteSpace(homeNotificationText) == false; var globalNotificationText = Model.Content.GetPropertyValue("mainNotification"); var showGlobalNotification = string.IsNullOrWhiteSpace(globalNotificationText) == false; + }
      @@ -31,10 +33,18 @@
        - - -

        Or ask a question

         - + @if (MemberData != null) + { + + Ask a question + + } + else + { + + Ask a question + + } @@ -61,12 +71,12 @@ } - @Html.Partial("home/documentation") - @ForumActivity() - @Gitter() - @Meetups() - @GitHubContributors() - @TwitterSearch() +@Html.Partial("home/documentation") +@ForumActivity() +@Gitter() +@Meetups() +@GitHubContributors() +@TwitterSearch() @helper ForumActivity() From 48953b7045e1c843679842483abc3a960909d831 Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 14:09:08 +0100 Subject: [PATCH 03/10] Position of link adjusted --- .../Views/Partials/Community/Home.cshtml | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml index 7979dbef96..8b44f1e0b2 100644 --- a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml +++ b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml @@ -33,18 +33,23 @@
          - @if (MemberData != null) - { - - Ask a question - - } - else - { - - Ask a question - - } + +
          +
          + @if (MemberData != null) + { + + Ask a question + + } + else + { + + Ask a question + + } +
          +
          From f14619d76ab0fbfc190e4d9bb4c76b098388d0fe Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 14:10:00 +0100 Subject: [PATCH 04/10] changing my ignore file --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 65da82855f..1d209e69ae 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,7 @@ OurUmbraco.Site/App_Data/NotificationTest/ build/tools/node* wwwcache/ build/toolsnode.js.*/ + +OurUmbraco\.Client/package-lock\.json + +OurUmbraco\.Client/package\.json From 9b6ffa91a747a1e7af3bac58efb007da6aa52a3d Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 14:36:27 +0100 Subject: [PATCH 05/10] Better check for member status --- OurUmbraco.Site/Views/Partials/Community/Home.cshtml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml index 8b44f1e0b2..5901a7b74f 100644 --- a/OurUmbraco.Site/Views/Partials/Community/Home.cshtml +++ b/OurUmbraco.Site/Views/Partials/Community/Home.cshtml @@ -36,11 +36,12 @@
          - @if (MemberData != null) + @if (userIsLoggedIn != null) { - Ask a question - + Ask a question + + } else { From 67fde3436bdbc7975ed7afab050f6166d24b036c Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 16:45:44 +0100 Subject: [PATCH 06/10] Download button gone --- .../Views/Partials/Forum/TopicForm.cshtml | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml index 8fe945cd8b..2fc7509030 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml @@ -15,33 +15,34 @@
          +
          - @if (CurrentPage.Parent.DocumentTypeAlias != "Project") - { - var categories = Model.Content.AncestorOrSelf(2).Children.Where(m => m.NewTopicsAllowed()).ToList(); - var categoriesIncludeCurrentPage = categories.Any(x => x.Id == Model.Content.Id); - -
          - -
          - } - -
          + @*@if (CurrentPage.Parent.DocumentTypeAlias != "Project") + { + var categories = Model.Content.AncestorOrSelf(2).Children.Where(m => m.NewTopicsAllowed()).ToList(); + var categoriesIncludeCurrentPage = categories.Any(x => x.Id == Model.Content.Id); + +
          + +
          + }*@ + +
          + @if (CurrentPage.Parent.DocumentTypeAlias == "Project") {
          @@ -87,7 +89,8 @@
          - + +
          Draft
          @@ -152,7 +155,7 @@ Reply - + Edit From 3772873fb585b6b8c5f3524f7c8a00bbeaab9317 Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 17:00:16 +0100 Subject: [PATCH 07/10] Full screen question and editor wording change --- OurUmbraco.Client/src/scss/elements/_markdown-editor.scss | 1 + OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss index 478a1038f1..71972c4fee 100644 --- a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss +++ b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss @@ -15,6 +15,7 @@ } &.write { + top:0px; bottom:0px; overflow-y: scroll; visibility: visible; diff --git a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml index 2fc7509030..4dab41ff6b 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml @@ -69,7 +69,7 @@
          - +
          @@ -90,7 +90,6 @@
          -
          Draft
          From b602d63fe7cfdbf510bba76b45321534ff7db8e6 Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 17:47:46 +0100 Subject: [PATCH 08/10] finish me later button in --- .../src/scss/elements/_markdown-editor.scss | 4 ++-- .../Views/Partials/Forum/TopicForm.cshtml | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss index 71972c4fee..bc57c34775 100644 --- a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss +++ b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss @@ -271,10 +271,10 @@ .markdown-close { - position: absolute; + position: fixed; right: 1.5rem; top: 2rem; - font-size: 28px; + font-size: 15px; cursor: pointer; opacity: .6; @include transition(opacity, .3s); diff --git a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml index 4dab41ff6b..9ab6754c99 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml @@ -4,6 +4,7 @@
          +

          Write your reply to:

          @@ -12,6 +13,11 @@

          +
          +
          + Finish me later +
          +
          @@ -68,21 +74,21 @@
          -
          +
          -
          - -
          -
          + @*
          + +
          +
          *@
          -
          +
          From 38dce5d817463d3c002d843c8daecc8f76201b3b Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 21 May 2018 17:58:39 +0100 Subject: [PATCH 09/10] better positioning but still not great tbh --- .../src/scss/elements/_markdown-editor.scss | 4 ++-- OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss index bc57c34775..8c5ac35f96 100644 --- a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss +++ b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss @@ -271,8 +271,8 @@ .markdown-close { - position: fixed; - right: 1.5rem; + position: relative; + left: 1.5rem; top: 2rem; font-size: 15px; cursor: pointer; diff --git a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml index 9ab6754c99..378515a1b8 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml @@ -14,9 +14,12 @@
          -
          - Finish me later -
          + +
          + Finish me later +
          + +
          From 33fc25f3f5d1d9663b5e51b65927e907e8dbb4b5 Mon Sep 17 00:00:00 2001 From: Emma Date: Tue, 22 May 2018 11:42:49 +0100 Subject: [PATCH 10/10] Positioning changed on finish link and resized text area --- .../src/scss/elements/_markdown-editor.scss | 879 +++++++++--------- .../Views/Partials/Forum/TopicForm.cshtml | 2 +- 2 files changed, 441 insertions(+), 440 deletions(-) diff --git a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss index 8c5ac35f96..f05759279b 100644 --- a/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss +++ b/OurUmbraco.Client/src/scss/elements/_markdown-editor.scss @@ -1,444 +1,445 @@ .markdown-editor { - position: fixed; - bottom: -100%; - max-height: 100%; - width: 100%; - padding: .2rem; - background-color: rgba(darken(#fff, 1%), .94); - box-shadow: 0px -2px 6px 0px rgba(0, 0, 0, 0.08); - transition: bottom .6s $cubicSearch, top .6s $cubicSearch; - z-index: 800; - - @media (max-width: $xs) { - top: 100%; - padding: 20px 0 0; - } - - &.write { - top:0px; - bottom:0px; - overflow-y: scroll; - visibility: visible; - @media (max-width: $xs) { - top: 0; - } - } - - &.mobile-preview { - @media (max-width: $md) { - #input-container { - display: none; - } - - #preview-container { - display: block; - } - } - } - - #preview-container { - @media (max-width: $md) { - display: none; - } - } - - input, textarea, select{ - border: 2px solid #E4E8E9; - color: #000; - - &:focus, &:active{ - outline: none; - border-color: $color-green; - } - - &.warning { - border-color: $color-red !important; - } - } - - - .wmd-button { - position: relative; - margin-right: 15px; - left: 0 !important; - font-size: 1.4em; - top: 10px; - cursor: pointer; - float: left; - border-radius: 20px; - transition: top 300ms $cubicSearch, opacity 300ms $cubicSearch; - - } - - .show { - .wmd-button { - @media (min-width: $md){ - top: 10px; - opacity: .9; - } - } - } - - .reply-to { - p { - font-size: 1rem; - overflow: hidden; - color: darken($color-space, 25%); - background: transparent; - } - span { - font-weight: 800; - } - } - - #wmd-button-bar { - position:relative; - height: 30px; - @media (max-width: $xs) { - display:none; - } - } - - .input-row { - label { - display: block; - margin-bottom: 5px; - color: darken($color-space, 10%); - font-size: .9rem; - } - } - .wmd-button-row { - list-style: none; - li { - &:hover { - span { - color:black; - } - } - - span { - background-image: none; - color: #727272; - transition: color .2s ease-in; - &:before { - font-family: "our-umbraco" !important; - content: attr(data-icon); - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - speak: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - } - } - } - - #wmd-bold-button { - span { - @extend .our-icon-bold; - } - } - - #wmd-italic-button { - span { - @extend .our-icon-italic; - } - } - - #wmd-bold-button { - span { - @extend .our-icon-bold; - } - } - - #wmd-link-button { - span { - @extend .our-icon-hyperlink; - } - } - - #wmd-quote-button { - span { - @extend .our-icon-quote; - } - } - - #wmd-quote-button { - span { - @extend .our-icon-quote; - } - } - - #wmd-code-button { - span { - @extend .our-icon-code; - } - } - - #wmd-image-button { - span { - @extend .our-icon-picture; - } - } - - #wmd-olist-button { - span { - @extend .our-icon-ol; - } - } - - #wmd-ulist-button { - span { - @extend .our-icon-ul; - } - } - - #wmd-heading-button { - span { - @extend .our-icon-header; - } - } - - #wmd-hr-button { - span { - @extend .our-icon-hr; - } - } - - #wmd-undo-button { - span { - @extend .our-icon-undo; - } - } - - #wmd-redo-button { - span { - @extend .our-icon-redo; - } - } - - } - - .wmd-spacer { - float: left; - position: relative; - width: 27px; - display: block; - opacity: 0; - height: 20px; - @media (max-width:$md) { - display: none; - } - } - - #wmd-input { - height: 300px; - width: 100%; - padding: .5rem; - font-size: 1rem; - color: $color-text; - background: white; - border: 2px solid #E4E8E9; - @include transition(border-color, .2s); - - @media (max-width: $xs) { - height: 152px; - } - - &:focus { - border-color: $color-green; - } - } - - #wmd-preview { - width: 100%; - min-height: 300px; - max-height: 300px; - overflow-y: scroll; - padding: .5rem 20px; - font-size: .8rem; - color: #000; - background: darken(#F5F7F7, 5%); - @media (max-width: $xs) { - max-height: 150px; - min-height: 150px; - margin-bottom: 0; - } - } - - - .markdown-close { + position: fixed; + bottom: -100%; + max-height: 100%; + width: 100%; + padding: .2rem; + background-color: rgba(darken(#fff, 1%), .94); + box-shadow: 0px -2px 6px 0px rgba(0, 0, 0, 0.08); + transition: bottom .6s $cubicSearch, top .6s $cubicSearch; + z-index: 800; + + @media (max-width: $xs) { + top: 100%; + padding: 20px 0 0; + } + + &.write { + top: 0px; + bottom: 0px; + overflow-y: scroll; + visibility: visible; + + @media (max-width: $xs) { + top: 0; + } + } + + &.mobile-preview { + @media (max-width: $md) { + #input-container { + display: none; + } + + #preview-container { + display: block; + } + } + } + + #preview-container { + @media (max-width: $md) { + display: none; + } + } + + input, textarea, select { + border: 2px solid #E4E8E9; + color: #000; + + &:focus, &:active { + outline: none; + border-color: $color-green; + } + + &.warning { + border-color: $color-red !important; + } + } + + + .wmd-button { position: relative; - left: 1.5rem; - top: 2rem; - font-size: 15px; - cursor: pointer; - opacity: .6; - @include transition(opacity, .3s); - - @media (min-width: $md) { - top: 1.5rem; - } - - &:hover { - opacity: 1; - } - } - - .draft { - position: fixed; - bottom: -40px; - right: 30px; - background-color: $color-green; - color:white; - padding: 12px 20px; - cursor: pointer; - opacity: 0; - font-size: .9rem; - font-weight: bold; - transition: opacity .3s $cubicSearch, bottom .6s $cubicSearch, box-shadow .2s ease-in-out; - - &.show { - bottom: 30px; - opacity: 1; - - &:hover { - background: lighten($color-green, 5%); - @extend .BoxShadow; - } - } - } - - .markdown-control { - font-family: $font-family; - font-size: .8rem; - -webkit-appearance: none; - @media (max-width: $xs) { - padding: 5px !important; - } - } - - #topic-title { - padding: .5rem; - font-size: .8rem; - overflow: hidden; - color: #000; - background: #fff; - width: 100%; - } - - select { - position: relative; - border: none; - border-radius: 0; - padding: .5rem; - font-size: .8rem; - overflow: hidden; - color: #000; - background: #fff; - width: 100%; - - border: 2px solid #E4E8E9; - - @media (max-width: $xs) { - margin-top: 20px; - } - - &::after { - position: absolute; - display: block; - top: 0; - right: 0; - content: "<"; - color: black; - } - } - - #topic-category { - - option.frontend { - background: #4ea7ff; - color: #fff; - } - - option.core { - background: #ff661b; - color: #fff; - } - - option.azure { - background: #1ed45c; - color: #fff; - - } - } - - #topic-submit { - border: none; - background: $color-green; - color: white; - padding: 10px !important; - padding-left: 32px; - width: 100%; - max-width: 140px; - font-family: $font-family; - cursor: pointer; - - font-size: 1rem; - - &:hover { - background: lighten($color-green, 5%); - } - } - - #mobile-preview { - border: none; - background: none; - -webkit-appearance:none; - text-align: right; - float: right; - opacity: .4; - cursor: pointer; - @include transition(opacity, .3s); - - i { - font-size: 24px; - display: inline-block; - transform: translate(-3px, 5px); - - } - - span { - font-size: 14px; - } - - &:hover { - opacity: 1; - } - - @media (max-width: $xs) { - margin-bottom: 10px; - } - } - - - &.mobile-preview { - - #wmd-preview { - @media (max-width: $md) { - margin-bottom: 4px; - } - } - - #mobile-preview { - color: $color-our; - opacity: 1; - } - } - + margin-right: 15px; + left: 0 !important; + font-size: 1.4em; + top: 10px; + cursor: pointer; + float: left; + border-radius: 20px; + transition: top 300ms $cubicSearch, opacity 300ms $cubicSearch; + } + + .show { + .wmd-button { + @media (min-width: $md) { + top: 10px; + opacity: .9; + } + } + } + + .reply-to { + p { + font-size: 1rem; + overflow: hidden; + color: darken($color-space, 25%); + background: transparent; + } + + span { + font-weight: 800; + } + } + + #wmd-button-bar { + position: relative; + height: 30px; + + @media (max-width: $xs) { + display: none; + } + } + + .input-row { + label { + display: block; + margin-bottom: 5px; + color: darken($color-space, 10%); + font-size: .9rem; + } + } + + .wmd-button-row { + list-style: none; + + li { + &:hover { + span { + color: black; + } + } + + span { + background-image: none; + color: #727272; + transition: color .2s ease-in; + + &:before { + font-family: "our-umbraco" !important; + content: attr(data-icon); + font-style: normal !important; + font-weight: normal !important; + font-variant: normal !important; + text-transform: none !important; + speak: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + } + } + + #wmd-bold-button { + span { + @extend .our-icon-bold; + } + } + + #wmd-italic-button { + span { + @extend .our-icon-italic; + } + } + + #wmd-bold-button { + span { + @extend .our-icon-bold; + } + } + + #wmd-link-button { + span { + @extend .our-icon-hyperlink; + } + } + + #wmd-quote-button { + span { + @extend .our-icon-quote; + } + } + + #wmd-quote-button { + span { + @extend .our-icon-quote; + } + } + + #wmd-code-button { + span { + @extend .our-icon-code; + } + } + + #wmd-image-button { + span { + @extend .our-icon-picture; + } + } + + #wmd-olist-button { + span { + @extend .our-icon-ol; + } + } + + #wmd-ulist-button { + span { + @extend .our-icon-ul; + } + } + + #wmd-heading-button { + span { + @extend .our-icon-header; + } + } + + #wmd-hr-button { + span { + @extend .our-icon-hr; + } + } + + #wmd-undo-button { + span { + @extend .our-icon-undo; + } + } + + #wmd-redo-button { + span { + @extend .our-icon-redo; + } + } + } + + .wmd-spacer { + float: left; + position: relative; + width: 27px; + display: block; + opacity: 0; + height: 20px; + + @media (max-width:$md) { + display: none; + } + } + + #wmd-input { + height: 300px; + width: 100%; + padding: .5rem; + font-size: 1rem; + color: $color-text; + background: white; + border: 2px solid #E4E8E9; + @include transition(border-color, .2s); + + @media (max-width: $xs) { + height: 152px; + } + + &:focus { + border-color: $color-green; + } + } + + #wmd-preview { + width: 100%; + min-height: 300px; + max-height: 300px; + overflow-y: scroll; + padding: .5rem 20px; + font-size: .8rem; + color: #000; + background: darken(#F5F7F7, 5%); + + @media (max-width: $xs) { + max-height: 150px; + min-height: 150px; + margin-bottom: 0; + } + } + + + .markdown-close { + position: absolute; + top: 80px; + right: 0; + font-size: 15px; + cursor: pointer; + opacity: .6; + @include transition(opacity, .3s); + + @media (min-width: $md) { + top: 1.5rem; + } + + &:hover { + opacity: 1; + } + } + + .draft { + position: fixed; + bottom: -40px; + right: 30px; + background-color: $color-green; + color: white; + padding: 12px 20px; + cursor: pointer; + opacity: 0; + font-size: .9rem; + font-weight: bold; + transition: opacity .3s $cubicSearch, bottom .6s $cubicSearch, box-shadow .2s ease-in-out; + + &.show { + bottom: 30px; + opacity: 1; + + &:hover { + background: lighten($color-green, 5%); + @extend .BoxShadow; + } + } + } + + .markdown-control { + font-family: $font-family; + font-size: .8rem; + -webkit-appearance: none; + + @media (max-width: $xs) { + padding: 5px !important; + } + } + + #topic-title { + padding: .5rem; + font-size: .8rem; + overflow: hidden; + color: #000; + background: #fff; + width: 100%; + } + + select { + position: relative; + border: none; + border-radius: 0; + padding: .5rem; + font-size: .8rem; + overflow: hidden; + color: #000; + background: #fff; + width: 100%; + border: 2px solid #E4E8E9; + + @media (max-width: $xs) { + margin-top: 20px; + } + + &::after { + position: absolute; + display: block; + top: 0; + right: 0; + content: "<"; + color: black; + } + } + + #topic-category { + + option.frontend { + background: #4ea7ff; + color: #fff; + } + + option.core { + background: #ff661b; + color: #fff; + } + + option.azure { + background: #1ed45c; + color: #fff; + } + } + + #topic-submit { + border: none; + background: $color-green; + color: white; + padding: 10px !important; + padding-left: 32px; + width: 100%; + max-width: 140px; + font-family: $font-family; + cursor: pointer; + font-size: 1rem; + + &:hover { + background: lighten($color-green, 5%); + } + } + + #mobile-preview { + border: none; + background: none; + -webkit-appearance: none; + text-align: right; + float: right; + opacity: .4; + cursor: pointer; + @include transition(opacity, .3s); + + i { + font-size: 24px; + display: inline-block; + transform: translate(-3px, 5px); + } + + span { + font-size: 14px; + } + + &:hover { + opacity: 1; + } + + @media (max-width: $xs) { + margin-bottom: 10px; + } + } + + + &.mobile-preview { + + #wmd-preview { + @media (max-width: $md) { + margin-bottom: 4px; + } + } + + #mobile-preview { + color: $color-our; + opacity: 1; + } + } } .wmd-prompt-background { diff --git a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml index 378515a1b8..931c2e5f66 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/TopicForm.cshtml @@ -77,7 +77,7 @@
          -
          +