Merge branch 'master' into test/missing-navigation-testcases

tests/visual/suites/extensions/admonition/docs/index.md

@@ -1,15 +1,20 @@
+<<<<<<< HEAD
 # Suite
 
 For this test, the header is set to `display: none`, as Gemini aligns the
 elements to be captured with the top of the page, thus getting blocked by the
 fixed positioned header.
 
+=======
+>>>>>>> master
 <style>
   .md-header {
     display: none;
   }
 </style>
 
+# Suite
+
 ## Default
 
 !!! note

tests/visual/suites/extensions/admonition/mkdocs.yml

@@ -19,11 +19,15 @@
 # IN THE SOFTWARE.
 
 # Test suite
+<<<<<<< HEAD
 site_name: Test
 pages:
   - Lorem ipsum dolor sit amet: index.md
 
 # Extensions
+=======
+site_name: Test/Admonition
+>>>>>>> master
 markdown_extensions:
   - markdown.extensions.admonition
 

tests/visual/suites/layout/nav/_overflow/docs/index.md

@@ -1,8 +1,11 @@
+<<<<<<< HEAD
 # Suite
 
 All transitions are set to `none` in order to ensure that all elements of
 interest always look the same and are not captured somewhere in the middle.
 
+=======
+>>>>>>> master
 <style>
   *,
   *::before,
@@ -10,3 +13,5 @@ interest always look the same and are not captured somewhere in the middle.
     transition: none !important;
   }
 </style>
+
+# Suite

tests/visual/suites/layout/nav/_overflow/docs/nested.md

@@ -1,8 +1,11 @@
+<<<<<<< HEAD
 # Suite
 
 All transitions are set to `none` in order to ensure that all elements of
 interest always look the same and are not captured somewhere in the middle.
 
+=======
+>>>>>>> master
 <style>
   *,
   *::before,
@@ -10,3 +13,8 @@ interest always look the same and are not captured somewhere in the middle.
     transition: none !important;
   }
 </style>
+<<<<<<< HEAD
+=======
+
+# Suite
+>>>>>>> master

tests/visual/suites/layout/nav/_overflow/mkdocs.yml

@@ -24,8 +24,13 @@ pages:
   - Pneumonoultramicroscopicsilicovolcanoconiosis: index.md
   - Supercalifragilisticexpialidocious:
     - Pseudopseudohypoparathyroidism: nested.md
+<<<<<<< HEAD
     - Floccinaucinihilipilification: _.md
     - Antidisestablishmentarianism: _.md
+=======
+    - Floccinaucinihilipilification: nested.md
+    - Antidisestablishmentarianism: nested.md
+>>>>>>> master
 
 # Reset webfonts because of flaky tests
 extra:

tests/visual/suites/layout/nav/docs/default.md

@@ -0,0 +1,9 @@
+<style>
+  *,
+  *::before,
+  *::after {
+    transition: none !important;
+  }
+</style>
+
+# Suite

tests/visual/suites/layout/nav/docs/index.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Suite
 
 All transitions are set to `none` in order to ensure that all elements of
@@ -7,15 +8,28 @@ Furthermore, the table of contents is hidden for all tests layed out on this
 page, as it is sometimes shown within the drawer though it isn't activated.
 This seems to be a caching-related issue.
 
+=======
+>>>>>>> master
 <style>
   *,
   *::before,
   *::after {
     transition: none !important;
   }
+<<<<<<< HEAD
+=======
+
+  /* Hack: ensure table of contents is hidden, as browser caching sometimes
+     makes it visible by accident, though it was never activated */
+>>>>>>> master
   .md-nav--secondary {
     display: none !important;
   }
 </style>
 
+<<<<<<< HEAD
+=======
+# Suite
+
+>>>>>>> master
 ## Default

tests/visual/suites/layout/nav/docs/nested.md

@@ -1,8 +1,3 @@
-# Suite
-
-All transitions are set to `none` in order to ensure that all elements of
-interest always look the same and are not captured somewhere in the middle.
-
 <style>
   *,
   *::before,
@@ -10,3 +5,5 @@ interest always look the same and are not captured somewhere in the middle.
     transition: none !important;
   }
 </style>
+
+# Suite

tests/visual/suites/layout/nav/mkdocs.yml

@@ -26,9 +26,15 @@ pages:
   - Etiam condimentum lacinia urna id vestibulum: _.md
   - A dapibus turpis iaculis at:
     - Donec tortor sem: nested.md
+<<<<<<< HEAD
     - Scelerisque ut congue id: secondary.md
     - Pretium ac risus: _.md
   - Maecenas tincidunt nulla dui: _.md
+=======
+    - Scelerisque ut congue id: nested.md
+    - Pretium ac risus: nested.md
+  - Maecenas tincidunt nulla dui: default.md
+>>>>>>> master
 
 # Reset webfonts because of flaky tests
 extra:

tests/visual/suites/layout/nav/suite.js

@@ -119,7 +119,7 @@ spec.register(__dirname, {
             ]
           },
 
-          /* 2nd+ level navigation */
+          /* Second-level navigation */
           "md-nav": {
             "url": "/nested",
             "capture": ".md-nav--primary .md-nav",