Merge 6e5b993 into 3919435

4teamwork · Apr 30, 2015 · 60639ae · 60639ae
2 parents 3919435 + 6e5b993
commit 60639ae
Show file tree

Hide file tree

Showing 3 changed files with 681 additions and 0 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -2,6 +2,13 @@
 Changelog
 =========
 
+
+1.0.17 (unreleased)
+-------------------
+
+- Move reservation specific styles from plonetheme.onegov to this package.
+  [lknoepfel]
+
 1.0.16
 ------
 

diff --git a/seantis/reservation/configure.zcml b/seantis/reservation/configure.zcml
@@ -8,6 +8,7 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     xmlns:inflator="http://namespaces.zope.org/inflator"
+    xmlns:theme="http://namespaces.zope.org/plonetheme.onegov"
     i18n_domain="plone"
     >
 
@@ -144,4 +145,9 @@ http://groups.google.com/group/zope-core-dev/browse_thread/thread/6c10ebc1602701
 <browser:resourceDirectory name="seantis.reservation.js" directory="js"/>
 <browser:resourceDirectory name="seantis.reservation.css" directory="css"/>
 
+<configure zcml:condition="installed plonetheme.onegov">
+    <include package="plonetheme.onegov" />
+    <theme:add_scss path="reservation.scss" />
+</configure>
+
 </configure>