From e440d616522eef32ba7ddd9a03ec32fa1fe7220e Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Sun, 6 Jan 2019 21:33:07 -0600 Subject: [PATCH 1/2] Moved menu html into partials and updated icon --- assets/icons/show-sidebar.svg | 1 + assets/templates/_menu_button.phtml | 6 ++++++ assets/templates/_menu_modal.php | 8 ++++++++ assets/templates/credits.phtml | 16 ++-------------- assets/templates/default.phtml | 16 ++-------------- assets/templates/index.phtml | 18 +++--------------- assets/templates/installing-php.phtml | 27 +++++++-------------------- 7 files changed, 29 insertions(+), 63 deletions(-) create mode 100644 assets/icons/show-sidebar.svg create mode 100644 assets/templates/_menu_button.phtml create mode 100644 assets/templates/_menu_modal.php diff --git a/assets/icons/show-sidebar.svg b/assets/icons/show-sidebar.svg new file mode 100644 index 0000000..dd00642 --- /dev/null +++ b/assets/icons/show-sidebar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/templates/_menu_button.phtml b/assets/templates/_menu_button.phtml new file mode 100644 index 0000000..8dff1e5 --- /dev/null +++ b/assets/templates/_menu_button.phtml @@ -0,0 +1,6 @@ +
+ +
diff --git a/assets/templates/_menu_modal.php b/assets/templates/_menu_modal.php new file mode 100644 index 0000000..f06ddc7 --- /dev/null +++ b/assets/templates/_menu_modal.php @@ -0,0 +1,8 @@ +
+
+ + +
+
diff --git a/assets/templates/credits.phtml b/assets/templates/credits.phtml index 5cb59d6..13e538c 100644 --- a/assets/templates/credits.phtml +++ b/assets/templates/credits.phtml @@ -1,12 +1,7 @@ 'PHP Apprentice - Credits']) ?>
-
- -
+

Credits

@@ -41,13 +36,6 @@
-
-
- - -
-
+ diff --git a/assets/templates/default.phtml b/assets/templates/default.phtml index f62c0d2..3cfd6b6 100644 --- a/assets/templates/default.phtml +++ b/assets/templates/default.phtml @@ -1,12 +1,7 @@ $title, 'subtitle' => $subtitle]) ?>
-
- -
+

@@ -29,13 +24,6 @@
-
-
- - -
-
+ diff --git a/assets/templates/index.phtml b/assets/templates/index.phtml index c33f77b..abb7cca 100644 --- a/assets/templates/index.phtml +++ b/assets/templates/index.phtml @@ -1,12 +1,8 @@ 'PHP Apprentice']) ?>
-
- -
+ +
@@ -34,13 +30,5 @@
-
-
- - -
-
- + diff --git a/assets/templates/installing-php.phtml b/assets/templates/installing-php.phtml index 2187771..3ac0522 100644 --- a/assets/templates/installing-php.phtml +++ b/assets/templates/installing-php.phtml @@ -1,12 +1,7 @@ 'PHP Apprentice - Installing PHP']) ?>
-
- -
+

Installing PHP

@@ -15,28 +10,20 @@
  • Download PHP from the PHP For Windows site. I recommend downloading the non-thread safe PHP 7.1 or 7.2 (unless you want to use Apache and you know if you do). You will also need to choose 32 bit (x86) or 64 bit (x64) depending on your version of Windows.
  • Download the corresponding Visual C++ Redistributable from the same site. For PHP 7.1, it is VC14 and for PHP 7.2, it is VC15.
  • Install the VC redistrubutable using the downloaded executable.
    • -
  • The PHP download comes in a zip folder. Extract the zip folder into your user directory in a folder named "php". The path should look like "C:\Users\username\php".
    • +
  • The PHP download comes in a zip folder. Extract the zip folder into your user directory in a folder named php. The path should look like C:\Users\username\php.
  • Next, we need to add PHP to your environment variables path. Open "System" under "Control Panel". Go to the "Advanced" tab and select "Environment Variables". In the "User variables" section, select "Path" and click the "Edit" button. You will see a list of different folder paths. Add the PHP path to the list using the "Add" button. The PHP path is the same folder where you extracted PHP.
    • -
  • Now, you can open PowerShell or Command Prompt and type "php -v" to verify PHP was installed correctly. It will return the installed version of PHP on your system.
    • +
  • Now, you can open PowerShell or Command Prompt and type php -v to verify PHP was installed correctly. It will return the installed version of PHP on your system.

    • MacOS

    -

    Good news! Each version of MacOS comes with PHP by default. However, if you are running an older version of MacOS or OS X, then you will need to manually install a new version of PHP. To check your current version, open Terminal and type "php -v". You will need at least PHP 7.1 on your computer to use all the features in these tutorials.

    +

    Good news! Each version of MacOS comes with PHP by default. However, if you are running an older version of MacOS or OS X, then you will need to manually install a new version of PHP. To check your current version, open Terminal and type php -v. You will need at least PHP 7.1 on your computer to use all the features in these tutorials.

    1. Install Homebrew.
      2. -
    2. Run "brew install php" in Terminal.
      3. -
    3. Check your version is correct by running "php -v" in Terminal.
      4. +
    4. Run brew install php in Terminal.
      5. +
    5. Check your version is correct by running php -v in Terminal.
    -
    -
    - - -
    -
    - + From b1cb18961cb6fc11f0dd5a963ffa28dd795f05cc Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Sun, 6 Jan 2019 22:51:23 -0600 Subject: [PATCH 2/2] Changes to 404 page styles --- assets/css/site.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/site.css b/assets/css/site.css index ed104ba..f52ac05 100644 --- a/assets/css/site.css +++ b/assets/css/site.css @@ -250,11 +250,11 @@ button:hover .icon svg { max-height: 200px; } .toc-404 { - max-width: 250px; + max-width: 200px; margin: 0 auto; } .message-404 { font-size: 2em; - margin: 0 auto; + margin: 1em auto; text-align: center; }