From e483055e17f3bf9014a15b89bdbd55fa08c354fc Mon Sep 17 00:00:00 2001 From: squidfunk Date: Sun, 12 Feb 2017 18:44:44 +0100 Subject: [PATCH] Fixed build errors --- .../suites/extensions/admonition/docs/index.md | 5 ----- .../visual/suites/extensions/admonition/mkdocs.yml | 4 ---- .../suites/layout/nav/_overflow/docs/index.md | 5 ----- .../suites/layout/nav/_overflow/docs/nested.md | 8 -------- .../visual/suites/layout/nav/_overflow/mkdocs.yml | 5 ----- tests/visual/suites/layout/nav/docs/default.md | 9 --------- tests/visual/suites/layout/nav/docs/index.md | 14 -------------- tests/visual/suites/layout/nav/docs/nested.md | 7 +++++-- tests/visual/suites/layout/nav/mkdocs.yml | 6 ------ 9 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 tests/visual/suites/layout/nav/docs/default.md diff --git a/tests/visual/suites/extensions/admonition/docs/index.md b/tests/visual/suites/extensions/admonition/docs/index.md index c0d05adb8..12a953654 100644 --- a/tests/visual/suites/extensions/admonition/docs/index.md +++ b/tests/visual/suites/extensions/admonition/docs/index.md @@ -1,20 +1,15 @@ -<<<<<<< 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 -# Suite - ## Default !!! note diff --git a/tests/visual/suites/extensions/admonition/mkdocs.yml b/tests/visual/suites/extensions/admonition/mkdocs.yml index bc7e257ad..ac0213157 100644 --- a/tests/visual/suites/extensions/admonition/mkdocs.yml +++ b/tests/visual/suites/extensions/admonition/mkdocs.yml @@ -19,15 +19,11 @@ # 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 diff --git a/tests/visual/suites/layout/nav/_overflow/docs/index.md b/tests/visual/suites/layout/nav/_overflow/docs/index.md index e6626b57a..20b8c4bc8 100644 --- a/tests/visual/suites/layout/nav/_overflow/docs/index.md +++ b/tests/visual/suites/layout/nav/_overflow/docs/index.md @@ -1,11 +1,8 @@ -<<<<<<< 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 - -# Suite diff --git a/tests/visual/suites/layout/nav/_overflow/docs/nested.md b/tests/visual/suites/layout/nav/_overflow/docs/nested.md index 434aeef70..20b8c4bc8 100644 --- a/tests/visual/suites/layout/nav/_overflow/docs/nested.md +++ b/tests/visual/suites/layout/nav/_overflow/docs/nested.md @@ -1,11 +1,8 @@ -<<<<<<< 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 -<<<<<<< HEAD -======= - -# Suite ->>>>>>> master diff --git a/tests/visual/suites/layout/nav/_overflow/mkdocs.yml b/tests/visual/suites/layout/nav/_overflow/mkdocs.yml index 8b29291f9..6e8ae7915 100644 --- a/tests/visual/suites/layout/nav/_overflow/mkdocs.yml +++ b/tests/visual/suites/layout/nav/_overflow/mkdocs.yml @@ -24,13 +24,8 @@ 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: diff --git a/tests/visual/suites/layout/nav/docs/default.md b/tests/visual/suites/layout/nav/docs/default.md deleted file mode 100644 index 5d6242378..000000000 --- a/tests/visual/suites/layout/nav/docs/default.md +++ /dev/null @@ -1,9 +0,0 @@ - - -# Suite diff --git a/tests/visual/suites/layout/nav/docs/index.md b/tests/visual/suites/layout/nav/docs/index.md index cf537b74d..24260448e 100644 --- a/tests/visual/suites/layout/nav/docs/index.md +++ b/tests/visual/suites/layout/nav/docs/index.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Suite All transitions are set to `none` in order to ensure that all elements of @@ -8,28 +7,15 @@ 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 -<<<<<<< HEAD -======= -# Suite - ->>>>>>> master ## Default diff --git a/tests/visual/suites/layout/nav/docs/nested.md b/tests/visual/suites/layout/nav/docs/nested.md index 5d6242378..20b8c4bc8 100644 --- a/tests/visual/suites/layout/nav/docs/nested.md +++ b/tests/visual/suites/layout/nav/docs/nested.md @@ -1,3 +1,8 @@ +# 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. + - -# Suite diff --git a/tests/visual/suites/layout/nav/mkdocs.yml b/tests/visual/suites/layout/nav/mkdocs.yml index 264dbe08c..c6b4859d8 100644 --- a/tests/visual/suites/layout/nav/mkdocs.yml +++ b/tests/visual/suites/layout/nav/mkdocs.yml @@ -26,15 +26,9 @@ 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: