Merge pull request #1641 from dennisdoomen/Merge/FromMaster

Merge website changes from master

Author: dennisdoomen

docs/_config.yml

@@ -59,7 +59,7 @@ reCaptcha:
 atom_feed:
   path                   : # blank (default) uses feed.xml
 search                   : true # true, false (default)
-search_full_content      : # true, false (default)
+search_full_content      : true #, false (default)
 search_provider          : # lunr (default), algolia
 algolia:
   application_id         : # YOUR_APPLICATION_ID

docs/_pages/about.md

@@ -49,7 +49,7 @@ Because of that Fluent Assertions supports the following minimum platforms.
 
 Fluent Assertions supports the following unit test frameworks:
 
-*   MSTest2 (Visual Studio 2017, Visual Studio 2019)
+*   [MSTest V2](https://github.com/Microsoft/testfx) (Visual Studio 2017, Visual Studio 2019)
 *   [NUnit](http://www.nunit.org/)
 *   [XUnit2](https://github.com/xunit/xunit/releases)
 *   [NSpec](http://nspec.org/)

docs/_sass/minimal-mistakes/_buttons.scss

@@ -44,6 +44,7 @@
   (github, #24292e),
   (stackoverflow, #F48024),
   (patreon, rgb(250, 118, 100)),
+  (github, rgb(217, 85, 169)),
   (google-plus, $google-plus-color),
   (linkedin, $linkedin-color);
 

docs/_sass/minimal-mistakes/_footer.scss

@@ -9,11 +9,6 @@
   margin-right: 0;
   width: 100%;
   clear: both;
-  /* sticky footer fix start */
-  position: absolute;
-  bottom: 0;
-  height: auto;
-  /* sticky footer fix end */
   margin-top: 3em;
   color: $muted-text-color;
   -webkit-animation: $intro-transition;

docs/_sass/minimal-mistakes/_page.scss

@@ -20,6 +20,22 @@
   }
 }
 
+body {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  min-height: 100vh;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: column;
+          flex-direction: column;
+}
+
+.initial-content,
+.search-content {
+  flex: 1 0 auto;
+}
+
 .page {
   @include breakpoint($large) {
     float: right;

docs/assets/js/lunr/lunr-store.js

@@ -18,7 +18,8 @@ var store = [
         "title": {{ doc.title | jsonify }},
         "excerpt":
           {%- if site.search_full_content == true -%}
-            {{ doc.content |
+            {{ doc.content | newline_to_br |
+              replace:"<br />", " " |
               replace:"</p>", " " |
               replace:"</h1>", " " |
               replace:"</h2>", " " |
@@ -28,7 +29,8 @@ var store = [
               replace:"</h6>", " "|
             strip_html | strip_newlines | jsonify }},
           {%- else -%}
-            {{ doc.content |
+            {{ doc.content | newline_to_br |
+              replace:"<br />", " " |
               replace:"</p>", " " |
               replace:"</h1>", " " |
               replace:"</h2>", " " |
@@ -49,4 +51,39 @@ var store = [
           {%- endif -%}
       }{%- unless forloop.last and l -%},{%- endunless -%}
     {%- endfor -%}
+  {%- endfor -%},
+  {%- for doc in site.pages -%}
+  {%- if doc.title and doc.title != "Publications" and doc.title != "People" and doc.title != "News Archive" -%}
+    {%- if forloop.last -%}
+      {%- assign l = true -%}
+    {%- endif -%}
+    {
+      "title": {{ doc.title | jsonify }},
+      "excerpt":
+          {%- if site.search_full_content == true -%}
+            {{ doc.content | newline_to_br |
+              replace:"<br />", " " |
+              replace:"</p>", " " |
+              replace:"</h1>", " " |
+              replace:"</h2>", " " |
+              replace:"</h3>", " " |
+              replace:"</h4>", " " |
+              replace:"</h5>", " " |
+              replace:"</h6>", " "|
+            strip_html | strip_newlines | jsonify }},
+          {%- else -%}
+            {{ doc.content | newline_to_br |
+              replace:"<br />", " " |
+              replace:"</p>", " " |
+              replace:"</h1>", " " |
+              replace:"</h2>", " " |
+              replace:"</h3>", " " |
+              replace:"</h4>", " " |
+              replace:"</h5>", " " |
+              replace:"</h6>", " "|
+            strip_html | strip_newlines | truncatewords: 50 | jsonify }},
+          {%- endif -%}
+        "url": {{ doc.url | absolute_url | jsonify }}
+    }{%- unless forloop.last and l -%},{%- endunless -%}
+  {%- endif -%}
   {%- endfor -%}]

docs/index.html

@@ -6,9 +6,10 @@
   overlay_color: "#373737"
   overlay_filter: "0.7"
   overlay_image: "/assets/images/fluent_assertions_large_horizontal.svg"
-  cta_label: "Get 6.0 now!"
-  cta_url: "/releases/#5100"
-  caption: "Logo by [**IUserName**](https://github.com/IUsername) <br/>Icons  by [**Zlatko Najdenovski**](https://www.flaticon.com/authors/zlatko-najdenovski) from [Flaticon](https://www.flaticon.com/)"
+  cta_label: "6.0 Beta 1 is out and it's huge!"
+  cta_url: "https://github.com/fluentassertions/fluentassertions/blob/release-6.0/docs/_pages/releases.md#600-beta-1"
+  caption: "Logo by [**IUserName**](https://github.com/IUsername) and icons by [**Zlatko Najdenovski**](https://www.flaticon.com/authors/zlatko-najdenovski) from [Flaticon](https://www.flaticon.com/)
+  "
 excerpt: '_"With Fluent Assertions, the assertions look beautiful, natural and, most importantly, extremely readable"_ - [Girish](https://twitter.com/girishracharya) 
  <br />
 ![](https://img.shields.io/nuget/dt/FluentAssertions.svg?style=for-the-badge)
@@ -18,12 +19,12 @@
 '
 intro:
   - excerpt: '
-     [Follow <i class="fab fa-twitter"></i> @ddoomen](https://twitter.com/ddoomen){: .btn .btn--twitter}
-     [Follow <i class="fab fa-twitter"></i> @jnyrup](https://twitter.com/jnyrup){: .btn .btn--twitter}
+     [<i class="fab fa-twitter"></i> @ddoomen](https://twitter.com/ddoomen){: .btn .btn--twitter}
+     [<i class="fab fa-twitter"></i> @jnyrup](https://twitter.com/jnyrup){: .btn .btn--twitter}
+     [<i class="fab fa-github"></i> Github Sponsors](https://github.com/sponsors/dennisdoomen){: .btn .btn--github}
+     [<i class="fab fa-patreon"></i> Patreon](https://www.patreon.com/bePatron?u=9250052&redirect_uri=http%3A%2F%2Ffluentassertions.com%2F&utm_medium=widget){: .btn .btn--patreon}
      [<i class="fab fa-paypal"></i> Tip Us](https://paypal.me/fluentassertions){: .btn .btn--paypal}
      [<i class="fa fa-coffee"></i> Buy us a coffee](https://ko-fi.com/dennisdoomen){: .btn .btn--paypal}
-     [<i class="fab fa-patreon"></i> Sponsor Us](https://www.patreon.com/bePatron?u=9250052&redirect_uri=http%3A%2F%2Ffluentassertions.com%2F&utm_medium=widget){: .btn .btn--patreon}
-     [<i class="fas fa-money-check"></i> Wire Us](mailto:dennis.doomen@avivasolutions.nl?subject=Support%20Fluent%20Assertions){: .btn .btn--rabobank}
      <br/>
      A very extensive set of extension methods that allow you to more naturally specify the expected outcome of a TDD or
      BDD-style unit tests. Targets .NET Framework 4.7, as well as .NET Core 2.1, .NET Core 3.0, .NET Standard 2.0 and 2.1.'
@@ -75,8 +76,8 @@
   - title: "Powered By"
     image_path: /assets/images/gift.svg
     excerpt: '
-    This project is made possible by
-    <a href="https://www.jetbrains.com/rider/"><img src="/assets/images/jetbrainsrider.svg" style="width:150px"/></a> and 
+    This project is supported by [Michaël Hompus](https://hompus.nl/), [Artur Krajewski](https://github.com/krajek), [Matthias Koch](https://ithrowexceptions.com/), [Wouter Huysentruit](https://www.huysentruit.be/) and [Innovensa](https://www.innovensa.co.uk/), with special thanks to our super-sponsors 
+    [Cristian Quirosj](https://github.com/cquirosj), <a href="https://www.jetbrains.com/rider/"><img src="/assets/images/jetbrainsrider.svg" style="width:150px"/></a> and 
     <a href="https://www.semanticmerge.com/"><img src="/assets/images/semantic-merge.png" style="width:150px"/></a>
     '
   - title: "Community Extensions"