Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Declare proper doctype on layouts #430

Merged
merged 3 commits into from
Feb 20, 2020
Merged

Declare proper doctype on layouts #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b418a2b
Add doctype declaration as a string when the TypedTag render method run
calvellido Feb 20, 2020
748f33d
Merge branch 'master' into jv-427-doctype
calvellido Feb 20, 2020
19c32ba
Update copyright notice
calvellido Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/microsites/util/MicrositeHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ class MicrositeHelper(config: MicrositeSettings) {
val targetPath = s"$targetDir$jekyllDir/_layouts/$layoutName.html"
createFile(targetPath)

writeContentToFile(layout.render.toString(), targetPath)
writeContentToFile("<!DOCTYPE html>" + layout.render.toString(), targetPath)
targetPath.toFile
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/microsites/DocsLayoutTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2016-2020 47 Degrees, LLC. <http://www.47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/microsites/HomeLayoutTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2016-2020 47 Degrees, LLC. <http://www.47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/microsites/LayoutTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2016-2020 47 Degrees, LLC. <http://www.47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/microsites/MenuPartialLayoutTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2016-2020 47 Degrees, LLC. <http://www.47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/microsites/PageLayoutTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2016-2020 47 Degrees, LLC. <http://www.47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
115 changes: 59 additions & 56 deletions src/test/scala/microsites/util/Arbitraries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016-2019 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2016-2020 47 Degrees, LLC. <http://www.47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -132,61 +132,64 @@ trait Arbitraries {
micrositeFooterText ← Arbitrary.arbitrary[Option[String]]
micrositeEditButton ← micrositeEditButtonArbitrary.arbitrary
micrositeVersionList ← Arbitrary.arbitrary[Seq[String]]
} yield
MicrositeSettings(
MicrositeIdentitySettings(
name,
description,
author,
homepage,
organizationHomepage,
twitter,
twitterCreator,
analytics),
MicrositeVisualSettings(
highlightTheme,
highlightLanguages,
palette,
favicon,
shareOnSocial,
theme),
MicrositeTemplateTexts(
micrositeFooterText
),
micrositeConfigYaml,
MicrositeFileLocations(
micrositeImgDirectory,
micrositeCssDirectory,
micrositeSassDirectory,
micrositeJsDirectory,
micrositeCDNDirectives,
micrositeExternalLayoutsDirectory,
micrositeExternalIncludesDirectory,
micrositeDataDirectory,
micrositeStaticDirectory,
micrositeExtraMdFiles,
micrositeExtraMdFilesOutput,
micrositePluginsDirectory
),
MicrositeUrlSettings(
micrositeUrl,
micrositeBaseUrl,
micrositeDocumentationUrl,
micrositeDocumentationLabelDescription),
MicrositeGitSettings(
githubOwner,
githubRepo,
githubLinks,
gitHostingService,
gitHostingUrl,
gitSidecarChat,
gitSidecarChatUrl),
MicrositeEditButtonSettings(
micrositeEditButton
),
MicrositeMultiversionSettings(
micrositeVersionList
)
} yield MicrositeSettings(
MicrositeIdentitySettings(
name,
description,
author,
homepage,
organizationHomepage,
twitter,
twitterCreator,
analytics
),
MicrositeVisualSettings(
highlightTheme,
highlightLanguages,
palette,
favicon,
shareOnSocial,
theme
),
MicrositeTemplateTexts(
micrositeFooterText
),
micrositeConfigYaml,
MicrositeFileLocations(
micrositeImgDirectory,
micrositeCssDirectory,
micrositeSassDirectory,
micrositeJsDirectory,
micrositeCDNDirectives,
micrositeExternalLayoutsDirectory,
micrositeExternalIncludesDirectory,
micrositeDataDirectory,
micrositeStaticDirectory,
micrositeExtraMdFiles,
micrositeExtraMdFilesOutput,
micrositePluginsDirectory
),
MicrositeUrlSettings(
micrositeUrl,
micrositeBaseUrl,
micrositeDocumentationUrl,
micrositeDocumentationLabelDescription
),
MicrositeGitSettings(
githubOwner,
githubRepo,
githubLinks,
gitHostingService,
gitHostingUrl,
gitSidecarChat,
gitSidecarChatUrl
),
MicrositeEditButtonSettings(
micrositeEditButton
),
MicrositeMultiversionSettings(
micrositeVersionList
)
)
}
}