From 9562f25fa94364837f2459682810a909eba93d96 Mon Sep 17 00:00:00 2001 From: Kieran Hayes Date: Mon, 30 Jul 2018 15:34:11 +0200 Subject: [PATCH 1/2] add example for output --- rake/dkdeploy-php/db.md | 214 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 195 insertions(+), 19 deletions(-) diff --git a/rake/dkdeploy-php/db.md b/rake/dkdeploy-php/db.md index 423a7d1..494b7b8 100644 --- a/rake/dkdeploy-php/db.md +++ b/rake/dkdeploy-php/db.md @@ -17,14 +17,44 @@ set :migrations_default_arguments, ['--no-interaction'] ### Usage -{% highlight shell %} +{% highlight shell-session %} $ cap dev db:migrations:generate {% endhighlight %} ### Output -{% highlight shell %} - TODO +{% highlight shell-session %} + 00:00 db:migrations:copy_doctrine_to_server + ./vendor/doctrine-migrations.phar found. + Removing old migrations. + 01 rm -rf /var/www/dkdeploy/shared/migrations + ✔ 01 vagrant@dkdeploy-php.dev 0.593s + Creating directories for migrations. + 02 mkdir -p /var/www/dkdeploy/shared/migrations/classes + ✔ 02 vagrant@dkdeploy-php.dev 0.361s + Copying doctrine-migrations.phar to /var/www/dkdeploy/shared/migrations directory. + Uploading ./vendor/doctrine-migrations.phar 10.75% + Uploading ./vendor/doctrine-migrations.phar 20.3% + Uploading ./vendor/doctrine-migrations.phar 31.04% + Uploading ./vendor/doctrine-migrations.phar 40.6% + Uploading ./vendor/doctrine-migrations.phar 50.15% + Uploading ./vendor/doctrine-migrations.phar 60.9% + Uploading ./vendor/doctrine-migrations.phar 70.45% + Uploading ./vendor/doctrine-migrations.phar 81.19% + Uploading ./vendor/doctrine-migrations.phar 90.75% + Uploading ./vendor/doctrine-migrations.phar 100.0% + Copying db-configuration.php to /var/www/dkdeploy/shared/migrations. + Downloading db_settings.dev.yaml 100.0% + Uploading /var/www/dkdeploy/shared/migrations/cli-config.php 100.0% + Uploading /var/www/dkdeploy/shared/migrations/migrations.yml 100.0% + 00:01 db:migrations:generate + Generating new migration. + 01 mkdir -p /var/www/dkdeploy/shared/migrations + ✔ 01 vagrant@dkdeploy-php.dev 0.008s + 02 /usr/bin/php doctrine-migrations.phar migrations:generate --no-interaction + 02 Generated new migration class to "/var/www/dkdeploy/shared/migrations/classes/Version20170419091311.php" + ✔ 02 vagrant@dkdeploy-php.dev 0.055s + Downloading config/migrations/classes/Version20170419091311.php 100.0% {% endhighlight %} ### Additional information @@ -37,14 +67,59 @@ Show migration status ### Usage -{% highlight shell %} +{% highlight shell-session %} $ cap dev db:migrations:status {% endhighlight %} ### Output -{% highlight shell %} - TODO +{% highlight shell-session %} + 00:00 db:migrations:copy_doctrine_to_server + ./vendor/doctrine-migrations.phar found. + Removing old migrations. + 01 rm -rf /var/www/dkdeploy/shared/migrations + ✔ 01 vagrant@dkdeploy-php.dev 0.584s + Creating directories for migrations. + 02 mkdir -p /var/www/dkdeploy/shared/migrations/classes + ✔ 02 vagrant@dkdeploy-php.dev 0.357s + Copying doctrine-migrations.phar to /var/www/dkdeploy/shared/migrations directory. + Uploading ./vendor/doctrine-migrations.phar 10.75% + Uploading ./vendor/doctrine-migrations.phar 20.3% + Uploading ./vendor/doctrine-migrations.phar 31.04% + Uploading ./vendor/doctrine-migrations.phar 40.6% + Uploading ./vendor/doctrine-migrations.phar 50.15% + Uploading ./vendor/doctrine-migrations.phar 60.9% + Uploading ./vendor/doctrine-migrations.phar 70.45% + Uploading ./vendor/doctrine-migrations.phar 81.19% + Uploading ./vendor/doctrine-migrations.phar 90.75% + Uploading ./vendor/doctrine-migrations.phar 100.0% + Copying db-configuration.php to /var/www/dkdeploy/shared/migrations. + Downloading db_settings.dev.yaml 100.0% + Uploading /var/www/dkdeploy/shared/migrations/cli-config.php 100.0% + Uploading /var/www/dkdeploy/shared/migrations/migrations.yml 100.0% + 00:01 db:migrations:copy_migrations_to_server + Uploading migrations to /var/www/dkdeploy/shared/migrations/classes. + 01 rm -rf /var/www/dkdeploy/shared/migrations/classes + ✔ 01 vagrant@dkdeploy-php.dev 0.006s + 00:01 db:migrations:status + Getting status of migrations. + 01 /usr/bin/php doctrine-migrations.phar migrations:status + 01 + 01 == Configuration + 01 + 01 >> Name: Doctrine TYPO3 Migrations + 01 >> Database Driver: pdo_mysql + 01 >> Database Name: dkdeploy_php + 01 >> Configuration Source: /var/www/dkdeploy/shared/migrations/migrations.yml + 01 >> Version Table Name: doctrine_migrations + 01 >> Migrations Namespace: DoctrineMigrations + 01 >> Migrations Directory: /var/www/dkdeploy/shared/migrations/classes + 01 >> Current Version: 0 + 01 >> Latest Version: 0 + 01 >> Executed Migrations: 0 + 01 >> Available Migrations: 0 + 01 >> New Migrations: 0 + ✔ 01 vagrant@dkdeploy-php.dev 0.051s {% endhighlight %} ### Additional information @@ -63,21 +138,79 @@ set :migrations_default_arguments, ['--no-interaction'] ### Usage -{% highlight shell %} +{% highlight shell-session %} $ cap dev db:migrations:migrate {% endhighlight %} ### Output -{% highlight shell %} - TODO +{% highlight shell-session %} +00:00 db:migrations:copy_doctrine_to_server + ./vendor/doctrine-migrations.phar found. + Removing old migrations. + 01 rm -rf /var/www/dkdeploy/shared/migrations + ✔ 01 vagrant@dkdeploy-php.dev 0.379s + Creating directories for migrations. + 02 mkdir -p /var/www/dkdeploy/shared/migrations/classes + ✔ 02 vagrant@dkdeploy-php.dev 0.379s + Copying doctrine-migrations.phar to /var/www/dkdeploy/shared/migrations directory. + Uploading ./vendor/doctrine-migrations.phar 10.75% + Uploading ./vendor/doctrine-migrations.phar 20.3% + Uploading ./vendor/doctrine-migrations.phar 31.04% + Uploading ./vendor/doctrine-migrations.phar 40.6% + Uploading ./vendor/doctrine-migrations.phar 50.15% + Uploading ./vendor/doctrine-migrations.phar 60.9% + Uploading ./vendor/doctrine-migrations.phar 70.45% + Uploading ./vendor/doctrine-migrations.phar 81.19% + Uploading ./vendor/doctrine-migrations.phar 90.75% + Uploading ./vendor/doctrine-migrations.phar 100.0% + Copying db-configuration.php to /var/www/dkdeploy/shared/migrations. + Downloading db_settings.dev.yaml 100.0% + Uploading /var/www/dkdeploy/shared/migrations/cli-config.php 100.0% + Uploading /var/www/dkdeploy/shared/migrations/migrations.yml 100.0% +00:01 db:migrations:copy_migrations_to_server + Uploading migrations to /var/www/dkdeploy/shared/migrations/classes. + 01 rm -rf /var/www/dkdeploy/shared/migrations/classes + ✔ 01 vagrant@dkdeploy-php.dev 0.008s + Uploading migrations for stage dev to /var/www/dkdeploy/shared/migrations/classes. + 02 mkdir -p /var/www/dkdeploy/shared/migrations/classes + ✔ 02 vagrant@dkdeploy-php.dev 0.005s + Uploading config/migrations/stage/dev/Version22222222222222.php 100.0% + Uploading config/migrations/stage/dev/Version33333333333333.php 100.0% +00:01 db:migrations:migrate + Migrating database. + 01 /usr/bin/php doctrine-migrations.phar migrations:migrate --no-interaction + 01 + 01 Doctrine TYPO3 Migrations + 01 + 01 + 01 Migrating up to 33333333333333 from 0 + 01 + 01 ++ migrating 22222222222222 + 01 + 01 Migration 22222222222222 was executed but did not result in any SQL statements. + 01 + 01 ++ migrated (0s) + 01 + 01 ++ migrating 33333333333333 + 01 + 01 Migration 33333333333333 was executed but did not result in any SQL statements. + 01 + 01 ++ migrated (0s) + 01 + 01 ------------------------ + 01 + 01 ++ finished in 0 + 01 ++ 2 migrations executed + 01 ++ 0 sql queries + ✔ 01 vagrant@dkdeploy-php.dev 0.064s + {% endhighlight %} ### Additional information This task will first call copy migration to server and copy doctrine to server, so any configuration options in that task will also affect this one. - ## execute\_down Downgrade database to a previous version @@ -91,17 +224,61 @@ CAUTION: It may not be possible to downgrade cleanly. If e.g. a previous migrati set :migrations_default_arguments, ['--no-interaction'] {% endhighlight %} - ### Usage -{% highlight shell %} +Pass the targeting `migration_version` either as an argument (example in output section) or enter it interactively. + +{% highlight shell-session %} $ cap dev db:migrations:execute_down {% endhighlight %} ### Output -{% highlight shell %} - TODO +{% highlight shell-session %} +$ cap dev db:migrations:execute_down[33333333333333] +00:00 db:migrations:copy_doctrine_to_server + ./vendor/doctrine-migrations.phar found. + Removing old migrations. + 01 rm -rf /var/www/dkdeploy/shared/migrations + ✔ 01 vagrant@dkdeploy-php.dev 0.381s + Creating directories for migrations. + 02 mkdir -p /var/www/dkdeploy/shared/migrations/classes + ✔ 02 vagrant@dkdeploy-php.dev 0.364s + Copying doctrine-migrations.phar to /var/www/dkdeploy/shared/migrations directory. + Uploading ./vendor/doctrine-migrations.phar 10.75% + Uploading ./vendor/doctrine-migrations.phar 20.3% + Uploading ./vendor/doctrine-migrations.phar 31.04% + Uploading ./vendor/doctrine-migrations.phar 40.6% + Uploading ./vendor/doctrine-migrations.phar 50.15% + Uploading ./vendor/doctrine-migrations.phar 60.9% + Uploading ./vendor/doctrine-migrations.phar 70.45% + Uploading ./vendor/doctrine-migrations.phar 81.19% + Uploading ./vendor/doctrine-migrations.phar 90.75% + Uploading ./vendor/doctrine-migrations.phar 100.0% + Copying db-configuration.php to /var/www/dkdeploy/shared/migrations. + Downloading db_settings.dev.yaml 100.0% + Uploading /var/www/dkdeploy/shared/migrations/cli-config.php 100.0% + Uploading /var/www/dkdeploy/shared/migrations/migrations.yml 100.0% +00:00 db:migrations:copy_migrations_to_server + Uploading migrations to /var/www/dkdeploy/shared/migrations/classes. + 01 rm -rf /var/www/dkdeploy/shared/migrations/classes + ✔ 01 vagrant@dkdeploy-php.dev 0.006s + Uploading migrations for stage dev to /var/www/dkdeploy/shared/migrations/classes. + 02 mkdir -p /var/www/dkdeploy/shared/migrations/classes + ✔ 02 vagrant@dkdeploy-php.dev 0.006s + Uploading config/migrations/stage/dev/Version22222222222222.php 100.0% + Uploading config/migrations/stage/dev/Version33333333333333.php 100.0% + Uploading config/migrations/stage/dev/Version44444444444444.php 100.0% + Migrating down to version 33333333333333 + 03 /usr/bin/php doctrine-migrations.phar migrations:execute 33333333333333 --down --no-interaction + 03 + 03 -- reverting 33333333333333 + 03 + 03 Migration 33333333333333 was executed but did not result in any SQL statements. + 03 + 03 -- reverted (0.01s) + ✔ 03 vagrant@dkdeploy-php.dev 0.062s + {% endhighlight %} ## copy\_doctrine\_to\_server @@ -117,7 +294,7 @@ set :doctrine_phar, './vendor/doctrine-migrations.phar' ### Usage -{% highlight shell %} +{% highlight shell-session %} $ cap dev db:migrations:copy_doctrine_to_server {% endhighlight %} @@ -159,14 +336,13 @@ Copies your Doctrine migrations to the server ### Usage -{% highlight shell %} - $ cap dev db:migrations:copy_migrations_to_server +{% highlight shell-session%} +$ cap dev db:migrations:copy_migrations_to_server {% endhighlight %} ### Output {% highlight shell-session %} -db:migrations:copy_migrations_to_server Uploading migrations to {{site.data.constants.deploy.path}}shared/migrations/classes. 01 rm -rf {{site.data.constants.deploy.path}}shared/migrations/classes 01 {{site.data.constants.deploy.user}}@{{site.data.constants.deploy.host}} 0.397s @@ -176,4 +352,4 @@ Uploading migrations for stage {{site.data.constants.deploy.stage}} to {{site.da 02 mkdir -p {{site.data.constants.deploy.path}}shared/migrations/classes 02 {{site.data.constants.deploy.user}}@{{site.data.constants.deploy.host}} 0.008s Uploading config/migrations/stage/{{site.data.constants.deploy.stage}}Version20120109171451.php 100.0% -{% endhighlight %} +{% endhighlight %} \ No newline at end of file From cc6bed2d75f3588f1e4abe999dcb1b4e77faf486 Mon Sep 17 00:00:00 2001 From: Kieran Hayes Date: Fri, 3 Aug 2018 16:56:01 +0200 Subject: [PATCH 2/2] optimize css / fix output of search --- _includes/footer.html | 4 ++-- _includes/header.html | 6 +++++- assets/css/app.css | 12 ++++++++++-- assets/javascript/algolia.js | 2 +- foundation/scss/_base.scss | 1 + foundation/scss/_search.scss | 3 ++- foundation/scss/_submenu.scss | 8 ++++++++ 7 files changed, 29 insertions(+), 7 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 3af99c2..27706ea 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -18,11 +18,11 @@ diff --git a/_includes/header.html b/_includes/header.html index bbf1a42..703edca 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -8,7 +8,11 @@
    -
  • dkdeploy
    • + {% for nav in site.data.navigation %} {% if page.section == nav.section %} {% assign active = "active" %} diff --git a/assets/css/app.css b/assets/css/app.css index 73f8a90..a701312 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -5314,6 +5314,12 @@ li.docs-menu-title { background-color: #ffff99; border-radius: 3px; } +li.dkdeploy-logo { + margin-right: 0; + padding-right: 0; } + li.dkdeploy-logo a { + margin-right: 0; } + h2 { border-bottom: 3px solid #97af05; } @@ -5376,7 +5382,8 @@ ul.menu li.active { border-radius: 0 0 3px 3px; } #toc2select { - border-radius: 3px; } + border-radius: 3px; + font-size: 13px; } #content .hollow, #content .top-bar-left .menu > li a, .top-bar-left .menu > li #content a { border-radius: 3px; } @@ -6777,7 +6784,8 @@ td code.highlighter-rouge { .algolia__result-text { font-size: 0.9rem; } -.algolia__result-link .algolia__result-highlight { +.algolia__result-link .algolia__result-highlight, +.algolia__result-text .ais-Highlight { background-color: #ffff99; } .algolia__result-text .algolia__result-highlight { diff --git a/assets/javascript/algolia.js b/assets/javascript/algolia.js index e991cd3..e3b4318 100644 --- a/assets/javascript/algolia.js +++ b/assets/javascript/algolia.js @@ -80,7 +80,7 @@ $(function(config) { } function scrollPageToSelector(selector) { - var target = $('.page,.post').find(selector); + var target = $('#main-content').find("#"+selector); var targetOffset = target[0].getBoundingClientRect().top + window.pageYOffset - 20; window.setTimeout(function() { window.scroll(0, targetOffset); diff --git a/foundation/scss/_base.scss b/foundation/scss/_base.scss index 98f3fdb..2f2a324 100644 --- a/foundation/scss/_base.scss +++ b/foundation/scss/_base.scss @@ -28,6 +28,7 @@ ul.menu li.active { } #toc2select { border-radius: 3px; + font-size: 13px; } #content { diff --git a/foundation/scss/_search.scss b/foundation/scss/_search.scss index 3bb5e2b..1d548ed 100644 --- a/foundation/scss/_search.scss +++ b/foundation/scss/_search.scss @@ -33,7 +33,8 @@ .algolia__result-text { font-size: 0.9rem; } -.algolia__result-link .algolia__result-highlight { +.algolia__result-link .algolia__result-highlight, +.algolia__result-text .ais-Highlight { background-color: #ffff99; } .algolia__result-text .algolia__result-highlight { diff --git a/foundation/scss/_submenu.scss b/foundation/scss/_submenu.scss index 2c15fd2..4c470b9 100644 --- a/foundation/scss/_submenu.scss +++ b/foundation/scss/_submenu.scss @@ -157,4 +157,12 @@ li.docs-menu-title { .sidebar span.label { background-color: #ffff99; border-radius: 3px; +} + +li.dkdeploy-logo { + margin-right: 0; + padding-right: 0; + a { + margin-right: 0; + } } \ No newline at end of file