Merge branch 'develop'

praxisnetau · Mar 22, 2018 · e552f6f · e552f6f
2 parents d843e1a + 57bbe95
commit e552f6f
Show file tree

Hide file tree

Showing 6 changed files with 5,180 additions and 4,773 deletions.
diff --git a/app/fixtures/layouts.yml b/app/fixtures/layouts.yml
@@ -1,27 +1,30 @@
-# App Layouts:
-
-SilverWare\Model\Layout:
-  Main:
-    +Section:
-      +Row:
-        +Left:
-          StyleID: PageLayout
-          Span:
-            Medium: fill
-          +SilverWare\Navigation\Components\CrumbNavigation.Crumbs:
-            StyleID: Crumbs
-            HideTopLevel: false
-          +SilverWare\Components\PageComponent.PageLayout:
-        +Right:
-          StyleID: Sidebar
-          Sidebar: true
-          HideEmpty: true
-          Span:
-            Medium: 3
-          +SilverWare\Components\AreaComponent.Sidebar:
-  Home:
-    +Section:
-      +Row:
-        +Column:
-          StyleID: HomePageLayout
-          +SilverWare\Components\PageComponent.PageLayout:
+# App Layouts:
+
+SilverWare\Model\Layout:
+  Main:
+    +Section:
+      +Row:
+        +Left:
+          StyleID: PageLayout
+          Span:
+            Medium: fill
+          +SilverWare\Navigation\Components\CrumbNavigation.Crumbs:
+            StyleID: Crumbs
+            HideTopLevel: false
+          +SilverWare\Components\PageComponent.PageLayout:
+            StyleID: PageComponent
+        +Right:
+          StyleID: Sidebar
+          Sidebar: true
+          HideEmpty: true
+          Span:
+            Medium: 4
+            Large: 3
+          +SilverWare\Components\AreaComponent.Sidebar:
+  Home:
+    +Section:
+      +Row:
+        +Column:
+          StyleID: HomePageLayout
+          +SilverWare\Components\PageComponent.PageLayout:
+            StyleID: PageComponent
diff --git a/app/fixtures/panels.yml b/app/fixtures/panels.yml
@@ -1,14 +1,14 @@
-# App Panels:
-
-SilverWare\Model\Panel:
-  Sidebar:
-    Areas:
-      - =>SilverWare\Components\AreaComponent.Sidebar
-    +SilverWare\Navigation\Components\LevelNavigation.SideNav:
-      StyleID: SideNav
-      UseLevelTitle: true
-      FontIcon: arrow-right
-    +SilverWare\Components\ContentComponent.SideContent:
-      StyleID: SideContent
-      Content: >
-        <p>This is a content component in the sidebar panel.</p>
+# App Panels:
+
+SilverWare\Model\Panel:
+  Sidebar:
+    Areas:
+      - =>SilverWare\Components\AreaComponent.Sidebar
+    +SilverWare\Navigation\Components\LevelNavigation.SideNav:
+      StyleID: SideNav
+      UseLevelTitle: true
+      FontIcon: arrow-right
+    +SilverWare\Components\ContentComponent.SideContent:
+      StyleID: SideContent
+      Content: >
+        <p>This is a content component in the sidebar panel.</p>
diff --git a/app/fixtures/templates.yml b/app/fixtures/templates.yml
@@ -1,57 +1,59 @@
-# App Templates:
-
-SilverWare\Model\Template:
-  Main:
-    +SilverWare\Sections\HeaderSection.Header:
-      StyleID: Header
-      EdgeToEdge: true
-      +Row:
-        NoGutters: true
-        +Column:
-          +SilverWare\Navigation\Components\BarNavigation.NavBar:
-            BrandText: 'SilverWare'
-            +SilverWare\Navigation\Items\NavigationItem.MainNavigation:
-              ShowSubMenus: true
-    +SilverWare\Sections\LayoutSection.Layout:
-      StyleID: Layout
-    +SilverWare\Grid\Section.Widgets:
-      StyleID: Widgets
-      +Row:
-        +Left:
-          +SilverWare\Components\ContentComponent.WidgetContent:
-            StyleID: WidgetContent
-            Content: >
-              <p>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet felis in tortor accumsan
-                rutrum sed eget nunc. Vestibulum facilisis mi vel metus mollis congue sed vel nibh. Phasellus dapibus
-                vitae nisi sit amet porta. Etiam molestie fermentum massa, eget tristique elit.
-              </p>
-        +Center:
-          +SilverWare\Components\ContentComponent.WidgetContent:
-            StyleID: WidgetContent
-            Content: >
-              <p>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet felis in tortor accumsan
-                rutrum sed eget nunc. Vestibulum facilisis mi vel metus mollis congue sed vel nibh. Phasellus dapibus
-                vitae nisi sit amet porta. Etiam molestie fermentum massa, eget tristique elit.
-              </p>
-        +Right:
-          +SilverWare\Components\ContentComponent.WidgetContent:
-            StyleID: WidgetContent
-            Content: >
-              <p>
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet felis in tortor accumsan
-                rutrum sed eget nunc. Vestibulum facilisis mi vel metus mollis congue sed vel nibh. Phasellus dapibus
-                vitae nisi sit amet porta. Etiam molestie fermentum massa, eget tristique elit.
-              </p>
-    +SilverWare\Sections\FooterSection.Footer:
-      StyleID: Footer
-      +Row:
-        +Left:
-          +SilverWare\Components\CopyrightComponent.Copyright:
-            EntityName: 'My Company'
-        +Right:
-          +SilverWare\Components\DeveloperComponent.Developer:
-            DeveloperName: 'My Developer'
-          +SilverWare\Components\ScrollToTopButton.ScrollToTop:
-            ButtonIcon: 'chevron-up'
+# App Templates:
+
+SilverWare\Model\Template:
+  Main:
+    +SilverWare\Sections\HeaderSection.Header:
+      StyleID: Header
+      EdgeToEdge: true
+      +Row:
+        NoGutters: true
+        +Column:
+          +SilverWare\Navigation\Components\BarNavigation.NavBar:
+            StyleID: NavBar
+            BrandText: 'SilverWare'
+            Background: ''
+            +SilverWare\Navigation\Items\NavigationItem.MainNavigation:
+              ShowSubMenus: true
+    +SilverWare\Sections\LayoutSection.Layout:
+      StyleID: Layout
+    +SilverWare\Grid\Section.Widgets:
+      StyleID: Widgets
+      +Row:
+        +Left:
+          +SilverWare\Components\ContentComponent.WidgetContent:
+            StyleID: WidgetContent
+            Content: >
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet felis in tortor accumsan
+                rutrum sed eget nunc. Vestibulum facilisis mi vel metus mollis congue sed vel nibh. Phasellus dapibus
+                vitae nisi sit amet porta. Etiam molestie fermentum massa, eget tristique elit.
+              </p>
+        +Center:
+          +SilverWare\Components\ContentComponent.WidgetContent:
+            StyleID: WidgetContent
+            Content: >
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet felis in tortor accumsan
+                rutrum sed eget nunc. Vestibulum facilisis mi vel metus mollis congue sed vel nibh. Phasellus dapibus
+                vitae nisi sit amet porta. Etiam molestie fermentum massa, eget tristique elit.
+              </p>
+        +Right:
+          +SilverWare\Components\ContentComponent.WidgetContent:
+            StyleID: WidgetContent
+            Content: >
+              <p>
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur sit amet felis in tortor accumsan
+                rutrum sed eget nunc. Vestibulum facilisis mi vel metus mollis congue sed vel nibh. Phasellus dapibus
+                vitae nisi sit amet porta. Etiam molestie fermentum massa, eget tristique elit.
+              </p>
+    +SilverWare\Sections\FooterSection.Footer:
+      StyleID: Footer
+      +Row:
+        +Left:
+          +SilverWare\Components\CopyrightComponent.Copyright:
+            EntityName: 'My Company'
+        +Right:
+          +SilverWare\Components\DeveloperComponent.Developer:
+            DeveloperName: 'My Developer'
+          +SilverWare\Components\ScrollToTopButton.ScrollToTop:
+            ButtonIcon: 'chevron-up'
diff --git a/app/fixtures/types.yml b/app/fixtures/types.yml
@@ -1,9 +1,9 @@
-# App Page Types:
-
-SilverWare\Model\PageType:
-  Page:
-    MyTemplate: =>SilverWare\Model\Template.Main
-    MyLayout: =>SilverWare\Model\Layout.Main
-  SilverWare\App\Pages\HomePage:
-    MyTemplate: =>SilverWare\Model\Template.Main
-    MyLayout: =>SilverWare\Model\Layout.Home
+# App Page Types:
+
+SilverWare\Model\PageType:
+  Page:
+    MyTemplate: =>SilverWare\Model\Template.Main
+    MyLayout: =>SilverWare\Model\Layout.Main
+  SilverWare\App\Pages\HomePage:
+    MyTemplate: =>SilverWare\Model\Template.Main
+    MyLayout: =>SilverWare\Model\Layout.Home
diff --git a/app/package.json b/app/package.json
@@ -33,25 +33,25 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "autoprefixer": "^7.2.4",
+    "autoprefixer": "^8.2.0",
     "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
+    "babel-loader": "^7.1.4",
     "babel-preset-env": "^1.6.1",
-    "clean-webpack-plugin": "^0.1.17",
-    "copy-webpack-plugin": "^4.3.1",
-    "css-loader": "^0.28.7",
+    "clean-webpack-plugin": "^0.1.19",
+    "copy-webpack-plugin": "^4.5.1",
+    "css-loader": "^0.28.11",
     "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^1.1.6",
+    "file-loader": "^1.1.11",
     "node-sass": "^4.7.2",
-    "postcss-loader": "^2.0.9",
-    "resolve-url-loader": "^2.2.1",
-    "sass-loader": "^6.0.6",
-    "style-loader": "^0.19.1",
-    "svgo": "^1.0.3",
+    "postcss-loader": "^2.1.3",
+    "resolve-url-loader": "^2.3.0",
+    "sass-loader": "^6.0.7",
+    "style-loader": "^0.20.3",
+    "svgo": "^1.0.5",
     "svgo-loader": "^2.1.0",
-    "uglifyjs-webpack-plugin": "^1.1.5",
-    "url-loader": "^0.6.2",
-    "webpack": "^3.10.0"
+    "uglifyjs-webpack-plugin": "^1.2.4",
+    "url-loader": "^1.0.1",
+    "webpack": "^3.11.0"
   },
   "babel": {
     "presets": [