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

Disabling kazari in DocsLayout and kazari styles if kazari is not required #242

Merged
merged 1 commit into from
Nov 28, 2017
Merged

Disabling kazari in DocsLayout and kazari styles if kazari is not required #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/scala/microsites/layouts/DocsLayout.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ class DocsLayout(config: MicrositeSettings) extends Layout(config) {
override def render: TypedTag[String] = {
html(
commonHead,
body(cls := "docs", sideBarAndContent, scriptsDocs, kazariEnableScript)
body(
cls := "docs",
sideBarAndContent,
scriptsDocs,
if (config.micrositeKazariSettings.micrositeKazariEnabled) kazariEnableScript else "")
)
}

Expand Down
17 changes: 11 additions & 6 deletions src/main/scala/microsites/layouts/Layout.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ abstract class Layout(config: MicrositeSettings) {
link(rel := "stylesheet", href := css)
}

val kazariStyles = List(
link(rel := "stylesheet", href := s"{{site.baseurl}}/css/kazari-style.css"),
link(
rel := "stylesheet",
href := s"{{site.baseurl}}/css/${config.micrositeKazariSettings.micrositeKazariCodeMirrorTheme}.css")
)

List(
link(
rel := "stylesheet",
Expand All @@ -168,12 +175,10 @@ abstract class Layout(config: MicrositeSettings) {
href := s"{{site.url}}{{site.baseurl}}/highlight/styles/${config.visualSettings.highlightTheme}.css"),
link(rel := "stylesheet", href := s"{{site.baseurl}}/css/style.css"),
link(rel := "stylesheet", href := s"{{site.baseurl}}/css/palette.css"),
link(rel := "stylesheet", href := s"{{site.baseurl}}/css/codemirror.css"),
link(rel := "stylesheet", href := s"{{site.baseurl}}/css/kazari-style.css"),
link(
rel := "stylesheet",
href := s"{{site.baseurl}}/css/${config.micrositeKazariSettings.micrositeKazariCodeMirrorTheme}.css")
) ++ customCssList ++ customCDNList
link(rel := "stylesheet", href := s"{{site.baseurl}}/css/codemirror.css")
) ++ customCssList ++ customCDNList ++ (if (config.micrositeKazariSettings.micrositeKazariEnabled)
kazariStyles
else Nil)
}

def scripts: List[TypedTag[String]] = {
Expand Down