Skip to content
Code-Schnipsel Gruppen Projekte
Commit d30d7d1b erstellt von Patrick Müller's avatar Patrick Müller
Dateien durchsuchen

Merge branch 'dev'

Übergeordnete 99f20647 7630d8a6
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"quiqqer\/menu": "2.*|dev-dev|dev-master", "quiqqer\/menu": "2.*|dev-dev|dev-master",
"quiqqer\/unsemantic": "*@dev", "quiqqer\/unsemantic": "*@dev",
"quiqqer\/utils": ">=1.7|dev-dev", "quiqqer\/utils": ">=1.7|dev-dev",
"quiqqer\/page-transition": "dev-master", "quiqqer\/page-transition": "^1.2",
"quiqqer\/pace": ">=1.2.0|dev-master|dev-dev", "quiqqer\/pace": ">=1.2.0|dev-master|dev-dev",
"quiqqer\/buttons": ">=1.0.0|dev-master|dev-dev" "quiqqer\/buttons": ">=1.0.0|dev-master|dev-dev"
}, },
...@@ -33,4 +33,4 @@ ...@@ -33,4 +33,4 @@
"QUI\\TemplateTailwindCss\\": "src\/QUI\/TemplateTailwindCss" "QUI\\TemplateTailwindCss\\": "src\/QUI\/TemplateTailwindCss"
} }
} }
} }
\ No newline at end of file
...@@ -28,15 +28,17 @@ ...@@ -28,15 +28,17 @@
{template_event name="quiqqer::template::body::begin" Template=$Template} {template_event name="quiqqer::template::body::begin" Template=$Template}
{* <!--top bar / navigation--> *} {* <!--top bar / navigation--> *}
{fetch template="template/topBar.html" {if $Template->getAttribute('template-header')}
navBackground=$navBackground {fetch template="template/topBar.html"
MegaMenu=$MegaMenu navBackground=$navBackground
logoUrl=$logoUrl MegaMenu=$MegaMenu
logoText=$logoText logoUrl=$logoUrl
Site=$Site logoText=$logoText
altLogoTargetUrl=$altLogoTargetUrl Site=$Site
logoUrlAlt=$logoUrlAlt altLogoTargetUrl=$altLogoTargetUrl
} logoUrlAlt=$logoUrlAlt
}
{/if}
{template_event name="quiqqer::template::body::afterMenu" Template=$Template} {template_event name="quiqqer::template::body::afterMenu" Template=$Template}
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren