Merge pull request #82 from cliffparnitzky-forks/feature/contao4

Update to Contao 4.4
contao · Oct 6, 2017 · cd2f600 · cd2f600
2 parents 057ceff + 7dab3ee
commit cd2f600
Show file tree

Hide file tree

Showing 5 changed files with 627 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -4,8 +4,8 @@
     "description": "Contao Official Demo",
     "license": "CC-BY-SA-4.0",
     "require": {
-        "contao/core": "3.5.*",
-        "contao-community-alliance/composer-plugin": "~2.0"
+        "contao/core-bundle":"~4.4",
+        "contao-community-alliance/composer-plugin":"~3.0"
     },
     "replace": {
         "contao-legacy/official_demo": "self.version"
@@ -14,7 +14,7 @@
         "contao": {
             "sources": {
                 "src/files/contaodemo": "files/contaodemo",
-                "src/templates/codv3.5.0_contao_3.5.2.sql": "templates/codv3.5.0_contao_3.5.2.sql",
+                "src/templates/codv4.0.0_contao_4.4.3.sql": "templates/codv4.0.0_contao_4.4.3.sql",
                 "src/templates/contaodemo": "templates/contaodemo"
             }
         }

diff --git a/src/files/contaodemo/.public b/src/files/contaodemo/.public
diff --git a/src/files/contaodemo/contao_official_demo.cto b/src/files/contaodemo/contao_official_demo.cto
diff --git a/src/files/contaodemo/theme/scss/modules/_navigation.scss b/src/files/contaodemo/theme/scss/modules/_navigation.scss
@@ -13,13 +13,13 @@
 .nav-main > ul > li > .active,
 .nav-main > ul > li > .trail,
 .nav-left a,
-.nav-left span.active,
-.nav-left span.trail,
+.nav-left strong.active,
+.nav-left strong.trail,
 .nav-left a.trail,
 .pagination a,
-.pagination span,
+.pagination strong,
 .mod_booknav a,
-.mod_booknav span {
+.mod_booknav strong {
     display:block;
     padding:8px;
     border:1px solid;
@@ -60,11 +60,11 @@
 /* Unified Active Status for Navigation Items */
 .nav-main > ul > li > .active,
 .nav-main > ul > li > .trail,
-.nav-left span.active,
-.nav-left span.trail,
+.nav-left strong.active,
+.nav-left strong.trail,
 .nav-left a.trail,
-.pagination span,
-.mod_booknav span {
+.pagination strong,
+.mod_booknav strong {
     border-color: $navOnBorder;
     color: $navOnColor;
     /* Old browsers */
@@ -103,7 +103,6 @@
     &.dropdown {
         > ul > li.submenu:hover > a,
         > ul > li.submenu:hover > .active {
-            padding-bottom:15px;
             border-bottom: none;
         }
 
@@ -145,7 +144,7 @@
 
         /* style the buttons */
         .level_2 a,
-        .level_2 span {
+        .level_2 strong {
             clear:both;
             display:block;
             padding:8px;
@@ -157,7 +156,7 @@
             border-bottom-color: $navSubItemBorderBottom;
         }
         .level_2 a.last,
-        .level_2 span.last {
+        .level_2 strong.last {
             border-bottom: none;
         }
     }
@@ -200,24 +199,24 @@
     border-color: $navOffBorder;
 
     a,
-    span.active,
-    span.trail,
+    strong.active,
+    strong.trail,
     a.trail {
         padding:10px;
         border-top: none;
         border-left: none;
         border-right: none;
     }
 
-    span.active,
-    span.trail,
+    strong.active,
+    strong.trail,
     a.trail {
         border-top: 1px solid $navOnBorder;
     }
 
     .last a,
-    .last span.active,
-    span.trail {
+    .last strong.active,
+    strong.trail {
         border-bottom: none;
     }
 }
@@ -241,7 +240,7 @@
     }
 
     a,
-    span {
+    strong {
         display:inline-block;
         margin-right:2px;
         padding:5px 10px;
@@ -266,7 +265,7 @@
     }
 
     a,
-    span {
+    strong {
         margin-right:2px;
         padding:5px;
     }