We will go with Default theme instead of Simple theme

2025-08-15 17:44:17 +02:00 · 2018-12-19 18:23:17 +03:00
parent 0c157a1cac
commit 6c50d0feae
20 changed files with 29 additions and 11 deletions
--- a/site/themes/default/assets/dist/css/bootstrap.min.css
+++ b/site/themes/default/assets/dist/css/bootstrap.min.css
--- a/site/themes/default/assets/dist/css/simple.min.css
+++ b/site/themes/default/assets/dist/css/simple.min.css
@@ -0,0 +1 @@
+body,button,html,input,p,select,textarea{font-family:Helvetica,arial,sans-serif;color:#000}body,html{font-size:16px;height:100%;background:#fff}body,button,input,p,select,textarea{font-weight:400}body,p{line-height:24px}pre{background:#f0f0f0;padding:20px}.content{padding-top:40px}.navbar-brand{letter-spacing:3px;text-transform:uppercase}.powered{padding-top:30px}
--- a/site/themes/default/assets/dist/js/simple.min.js
+++ b/site/themes/default/assets/dist/js/simple.min.js
--- a/site/themes/default/assets/scss/base/main.scss
+++ b/site/themes/default/assets/scss/base/main.scss
--- a/site/themes/default/assets/scss/components/footer.scss
+++ b/site/themes/default/assets/scss/components/footer.scss
--- a/site/themes/default/assets/scss/components/nav.scss
+++ b/site/themes/default/assets/scss/components/nav.scss
--- a/site/themes/default/assets/scss/generic/variables.scss
+++ b/site/themes/default/assets/scss/generic/variables.scss
--- a/site/themes/default/assets/scss/objects/container.scss
+++ b/site/themes/default/assets/scss/objects/container.scss
--- a/site/themes/default/assets/scss/simple.scss
+++ b/site/themes/default/assets/scss/simple.scss
--- a/site/themes/default/blueprints/default.yaml
+++ b/site/themes/default/blueprints/default.yaml
@@ -1,3 +1,4 @@
+title: Default
 fields:
  title:
    title: "admin_pages_title"
--- a/site/themes/default/default.yaml
+++ b/site/themes/default/default.yaml
--- a/site/themes/default/gulpfile.js
+++ b/site/themes/default/gulpfile.js
--- a/site/themes/default/package.json
+++ b/site/themes/default/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "flextype",
+  "name": "Default",
  "version": "1.0.0",
  "devDependencies": {
    "es6-promise": "^4.2.4",
--- a/site/themes/default/settings.yaml
+++ b/site/themes/default/settings.yaml
@@ -1,6 +1,6 @@
-name: Simple
+name: Default
 version: 1.0.0
-description: Simple theme for Flextype
+description: Default theme for Flextype
 author:
  name: Sergey Romanenko
  email: awilum@yandex.ru
--- a/site/themes/default/views/partials/footer.php
+++ b/site/themes/default/views/partials/footer.php
@@ -1,7 +1,5 @@
 <?php namespace Flextype; ?>
-
-    <?php Themes::view('partials/tail')->display(); ?>
-
+    <?= Themes::view('partials/tail') ?>
    <div class="powered">
      Powered by <a href="http://flextype.org">Flextype</a>
    </div>
--- a/site/themes/default/views/partials/head.php
+++ b/site/themes/default/views/partials/head.php
@@ -29,5 +29,5 @@
    <?php Event::dispatch('onThemeHeader'); ?>
  </head>
  <body>
-  <?php Themes::view('partials/navigation')->display(); ?>
+  <?= Themes::view('partials/navigation') ?>
  <main role="main" class="container content">
--- a/site/themes/default/views/partials/navigation.php
+++ b/site/themes/default/views/partials/navigation.php
--- a/site/themes/default/views/partials/tail.php
+++ b/site/themes/default/views/partials/tail.php
--- a/site/themes/default/views/templates/default.php
+++ b/site/themes/default/views/templates/default.php
@@ -0,0 +1,4 @@
+<?php namespace Flextype; ?>
+<?= Themes::view('partials/head') ?>
+<?= $page['content'] ?>
+<?= Themes::view('partials/footer') ?>
--- a/site/themes/simple/views/templates/default.php
+++ b/site/themes/simple/views/templates/default.php
@@ -1,4 +0,0 @@
-<?php namespace Flextype; ?>
-<?php Themes::view('partials/head')->display(); ?>
-<?= $page['content'] ?>
-<?php Themes::view('partials/footer')->display(); ?>
				`@@ -0,0 +1 @@`
				`body,button,html,input,p,select,textarea{font-family:Helvetica,arial,sans-serif;color:#000}body,html{font-size:16px;height:100%;background:#fff}body,button,input,p,select,textarea{font-weight:400}body,p{line-height:24px}pre{background:#f0f0f0;padding:20px}.content{padding-top:40px}.navbar-brand{letter-spacing:3px;text-transform:uppercase}.powered{padding-top:30px}`