From d05f8a376760d9a4e62f6f345e69aa8c3e58653f Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Fri, 8 Jun 2018 17:05:46 +0100 Subject: [PATCH 1/8] changed root url from /al-folio to empty --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 58d17b0..adbd54d 100644 --- a/_config.yml +++ b/_config.yml @@ -11,7 +11,7 @@ footer_text: > Photos from Unsplash. url: # the base hostname & protocol for your site -baseurl: /al-folio # the subpath of your site, e.g. /blog/ +baseurl: # the subpath of your site, e.g. /blog/ last_updated: # leave blank if you don't want to display last updated # ----------------------------------------------------------------------------- From d263296c8a16bdecf97b37da7694dc209ea78af9 Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Fri, 8 Jun 2018 17:20:30 +0100 Subject: [PATCH 2/8] added a usage section to the readme describing that an index page is not neccessary, and will overwrite the about page if it exists. Also added a link to the MIT license following the default jekyll theme readme. --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 46457b9..c865e8d 100644 --- a/README.md +++ b/README.md @@ -39,13 +39,17 @@ By default, the script uses the `master` branch for the source code and deploys The optional flag `--user` tells it to deploy to `master` and use `source` for the source code instead. Using `master` for deployment is a convention for [user and organization pages](https://help.github.com/articles/user-organization-and-project-pages/). -**Note:** when deploying your user or organization page, make the `_config.yml` has `url` and `baseurl` fields as follows. +**Note:** when deploying your user or organization page, make sure the `_config.yml` has `url` and `baseurl` fields as follows. ``` url: # should be empty baseurl: # should be empty ``` +### Usage ### + +Note that `_pages/about.md` is built to index.html in the published site. There is therefore no need to have a separate index page for the project. If an index page does exist in the root directory then this will prevent `_pages/about.md` from being added to the built site. + ## Features #### Ergonomic Publications @@ -100,4 +104,4 @@ Style improvements and bug fixes are especially welcome. ## License -MIT +The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT). \ No newline at end of file From dc5205adef13498d8fa8ca4c7347dba689d10778 Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Fri, 8 Jun 2018 17:22:22 +0100 Subject: [PATCH 3/8] Bump license year to 2018 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 475ecfb..34498d6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Maruan Al-Shedivat. +Copyright (c) 2018 Maruan Al-Shedivat. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in From 8c510a8b8e0c9e542c069074c2c24d8754417ef2 Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Mon, 11 Jun 2018 00:49:44 +0100 Subject: [PATCH 4/8] Removed !important flag from profile class alignment --- _sass/_profile.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_sass/_profile.scss b/_sass/_profile.scss index cf71f7d..dd23965 100644 --- a/_sass/_profile.scss +++ b/_sass/_profile.scss @@ -1,5 +1,5 @@ .profile { - float: right !important; + float: right; img { box-shadow: 0 0 5px $grey-color; width: 100%; From 2a2951461dbacc060f669fc285b89a38dfb42157 Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Mon, 11 Jun 2018 00:50:39 +0100 Subject: [PATCH 5/8] Removed align:left from col class --- _sass/_gallery.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/_sass/_gallery.scss b/_sass/_gallery.scss index 54ac67a..1786bbf 100644 --- a/_sass/_gallery.scss +++ b/_sass/_gallery.scss @@ -19,7 +19,6 @@ figcaption { .col { width: 100%; height: 100%; - float: left; object-fit: cover; box-sizing:border-box; padding: $img-spacing; From 2c72ee76c0bdec16eb847e6fb7eac621effc43eb Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Mon, 11 Jun 2018 00:54:05 +0100 Subject: [PATCH 6/8] Added left class to all images --- _projects/1_project.markdown | 16 ++++++++-------- _projects/2_project.markdown | 20 ++++++++++---------- _projects/3_project.markdown | 19 ++++++++++--------- _projects/4_project.markdown | 19 ++++++++++--------- _projects/5_project.markdown | 19 ++++++++++--------- _projects/6_project.markdown | 19 +++++++++++-------- 6 files changed, 59 insertions(+), 53 deletions(-) diff --git a/_projects/1_project.markdown b/_projects/1_project.markdown index bc0c718..a2dd004 100644 --- a/_projects/1_project.markdown +++ b/_projects/1_project.markdown @@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
- - - + + +
Caption photos easily. On the left, a road goes through a tunnel. Middle, leaves artistically fall in a hipster photoshoot. Right, in another hipster photoshoot, a lumberjack grasps a handful of pine needles.
- +
This image can also have a caption. It's like magic. @@ -36,8 +36,8 @@ You can also put regular text between your rows of images. Say you wanted to wri
- - + +
You can also have artistically styled 2/3 + 1/3 images, like these. @@ -50,6 +50,6 @@ You can also put regular text between your rows of images. Say you wanted to wri The code is simple. Just add a col class to your image, and another class specifying the width: one, two, or three columns wide. Here's the code for the last row of images above:
- - + +
diff --git a/_projects/2_project.markdown b/_projects/2_project.markdown index cd75394..65cd6ad 100644 --- a/_projects/2_project.markdown +++ b/_projects/2_project.markdown @@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
- - - + + +
Caption photos easily. On the left, a road goes through a tunnel. Middle, leaves artistically fall in a hipster photoshoot. Right, in another hipster photoshoot, a lumberjack grasps a handful of pine needles.
- +
This image can also have a caption. It's like magic. @@ -36,20 +36,20 @@ You can also put regular text between your rows of images. Say you wanted to wri
- - + +
You can also have artistically styled 2/3 + 1/3 images, like these.
-


+

The code is simple. Just add a col class to your image, and another class specifying the width: one, two, or three columns wide. Here's the code for the last row of images above:
- - -
+ + +
\ No newline at end of file diff --git a/_projects/3_project.markdown b/_projects/3_project.markdown index 240ac9b..4d958c1 100644 --- a/_projects/3_project.markdown +++ b/_projects/3_project.markdown @@ -19,15 +19,15 @@ To give your project a background in the portfolio page, just add the img tag to
- - - + + +
Caption photos easily. On the left, a road goes through a tunnel. Middle, leaves artistically fall in a hipster photoshoot. Right, in another hipster photoshoot, a lumberjack grasps a handful of pine needles.
- +
This image can also have a caption. It's like magic. @@ -37,20 +37,21 @@ You can also put regular text between your rows of images. Say you wanted to wri
- - + +
You can also have artistically styled 2/3 + 1/3 images, like these.
-


+

The code is simple. Just add a col class to your image, and another class specifying the width: one, two, or three columns wide. Here's the code for the last row of images above:
- - + +
+ diff --git a/_projects/4_project.markdown b/_projects/4_project.markdown index e847e19..26558d4 100644 --- a/_projects/4_project.markdown +++ b/_projects/4_project.markdown @@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
- - - + + +
Caption photos easily. On the left, a road goes through a tunnel. Middle, leaves artistically fall in a hipster photoshoot. Right, in another hipster photoshoot, a lumberjack grasps a handful of pine needles.
- +
This image can also have a caption. It's like magic. @@ -36,20 +36,21 @@ You can also put regular text between your rows of images. Say you wanted to wri
- - + +
You can also have artistically styled 2/3 + 1/3 images, like these.
-


+

The code is simple. Just add a col class to your image, and another class specifying the width: one, two, or three columns wide. Here's the code for the last row of images above:
- - + +
+ diff --git a/_projects/5_project.markdown b/_projects/5_project.markdown index 2d6be14..e59e602 100644 --- a/_projects/5_project.markdown +++ b/_projects/5_project.markdown @@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
- - - + + +
Caption photos easily. On the left, a road goes through a tunnel. Middle, leaves artistically fall in a hipster photoshoot. Right, in another hipster photoshoot, a lumberjack grasps a handful of pine needles.
- +
This image can also have a caption. It's like magic. @@ -36,20 +36,21 @@ You can also put regular text between your rows of images. Say you wanted to wri
- - + +
You can also have artistically styled 2/3 + 1/3 images, like these.
-


+

The code is simple. Just add a col class to your image, and another class specifying the width: one, two, or three columns wide. Here's the code for the last row of images above:
- - + +
+ diff --git a/_projects/6_project.markdown b/_projects/6_project.markdown index 24ebf67..9ed4093 100644 --- a/_projects/6_project.markdown +++ b/_projects/6_project.markdown @@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
- - - + + +
Caption photos easily. On the left, a road goes through a tunnel. Middle, leaves artistically fall in a hipster photoshoot. Right, in another hipster photoshoot, a lumberjack grasps a handful of pine needles.
- +
This image can also have a caption. It's like magic. @@ -36,17 +36,20 @@ You can also put regular text between your rows of images. Say you wanted to wri
- - + +
You can also have artistically styled 2/3 + 1/3 images, like these.
+

+ + The code is simple. Just add a col class to your image, and another class specifying the width: one, two, or three columns wide. Here's the code for the last row of images above:
- - + +
From b9cb16473f70b7d945a630fd08e03d8ddbe9603b Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Mon, 11 Jun 2018 01:01:05 +0100 Subject: [PATCH 7/8] Removed profile align property completely --- _sass/_profile.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/_sass/_profile.scss b/_sass/_profile.scss index dd23965..f6d489a 100644 --- a/_sass/_profile.scss +++ b/_sass/_profile.scss @@ -1,5 +1,4 @@ .profile { - float: right; img { box-shadow: 0 0 5px $grey-color; width: 100%; From c54ca4dc63e79ab955c008edaab071d7738f40b7 Mon Sep 17 00:00:00 2001 From: Sam Fearn Date: Sun, 17 Jun 2018 23:31:36 +0100 Subject: [PATCH 8/8] Changed `baseurl` property of `_config.yml` back to /al-folio and minor edit to `README` for consistency with the al-folio master branch --- README.md | 2 +- _config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c865e8d..359a45b 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ url: # should be empty baseurl: # should be empty ``` -### Usage ### +### Usage Note that `_pages/about.md` is built to index.html in the published site. There is therefore no need to have a separate index page for the project. If an index page does exist in the root directory then this will prevent `_pages/about.md` from being added to the built site. diff --git a/_config.yml b/_config.yml index adbd54d..58d17b0 100644 --- a/_config.yml +++ b/_config.yml @@ -11,7 +11,7 @@ footer_text: > Photos from Unsplash. url: # the base hostname & protocol for your site -baseurl: # the subpath of your site, e.g. /blog/ +baseurl: /al-folio # the subpath of your site, e.g. /blog/ last_updated: # leave blank if you don't want to display last updated # -----------------------------------------------------------------------------