Skip to content

Commit e7822d4

Browse files
authored
Merge pull request alshedivat#15 from samfearn/alignfix
Alignfix
2 parents 3835ac3 + c54ca4d commit e7822d4

10 files changed

+66
-58
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 Maruan Al-Shedivat.
3+
Copyright (c) 2018 Maruan Al-Shedivat.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,17 @@ By default, the script uses the `master` branch for the source code and deploys
3939
The optional flag `--user` tells it to deploy to `master` and use `source` for the source code instead.
4040
Using `master` for deployment is a convention for [user and organization pages](https://help.github.com/articles/user-organization-and-project-pages/).
4141

42-
**Note:** when deploying your user or organization page, make the `_config.yml` has `url` and `baseurl` fields as follows.
42+
**Note:** when deploying your user or organization page, make sure the `_config.yml` has `url` and `baseurl` fields as follows.
4343

4444
```
4545
url: # should be empty
4646
baseurl: # should be empty
4747
```
4848

49+
### Usage
50+
51+
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.
52+
4953
## Features
5054

5155
#### Ergonomic Publications
@@ -100,4 +104,4 @@ Style improvements and bug fixes are especially welcome.
100104

101105
## License
102106

103-
MIT
107+
The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

_projects/1_project.markdown

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
1818

1919

2020
<div class="img_row">
21-
<img class="col one" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22-
<img class="col one" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23-
<img class="col one" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
21+
<img class="col one left" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22+
<img class="col one left" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23+
<img class="col one left" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
2424
</div>
2525
<div class="col three caption">
2626
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.
2727
</div>
2828
<div class="img_row">
29-
<img class="col three" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
29+
<img class="col three left" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
3030
</div>
3131
<div class="col three caption">
3232
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
3636

3737

3838
<div class="img_row">
39-
<img class="col two" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40-
<img class="col one" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
39+
<img class="col two left" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40+
<img class="col one left" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
4141
</div>
4242
<div class="col three caption">
4343
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
5050
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:
5151

5252
<div class="img_row">
53-
<img class="col two" src="/img/6.jpg"/>
54-
<img class="col one" src="/img/11.jpg"/>
53+
<img class="col two left" src="/img/6.jpg"/>
54+
<img class="col one left" src="/img/11.jpg"/>
5555
</div>

_projects/2_project.markdown

+10-10
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
1818

1919

2020
<div class="img_row">
21-
<img class="col one" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22-
<img class="col one" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23-
<img class="col one" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
21+
<img class="col one left" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22+
<img class="col one left" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23+
<img class="col one left" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
2424
</div>
2525
<div class="col three caption">
2626
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.
2727
</div>
2828
<div class="img_row">
29-
<img class="col three" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
29+
<img class="col three left" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
3030
</div>
3131
<div class="col three caption">
3232
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
3636

3737

3838
<div class="img_row">
39-
<img class="col two" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40-
<img class="col one" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
39+
<img class="col two left" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40+
<img class="col one left" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
4141
</div>
4242
<div class="col three caption">
4343
You can also have artistically styled 2/3 + 1/3 images, like these.
4444
</div>
4545

4646

47-
<br/><br/><br/>
47+
<br/><br/>
4848

4949

5050
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:
5151

5252
<div class="img_row">
53-
<img class="col two" src="/img/6.jpg"/>
54-
<img class="col one" src="/img/11.jpg"/>
55-
</div>
53+
<img class="col two left" src="/img/6.jpg"/>
54+
<img class="col one left" src="/img/11.jpg"/>
55+
</div>

_projects/3_project.markdown

+10-9
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ To give your project a background in the portfolio page, just add the img tag to
1919

2020

2121
<div class="img_row">
22-
<img class="col one" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
23-
<img class="col one" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
24-
<img class="col one" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
22+
<img class="col one left" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
23+
<img class="col one left" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
24+
<img class="col one left" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
2525
</div>
2626
<div class="col three caption">
2727
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.
2828
</div>
2929
<div class="img_row">
30-
<img class="col three" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
30+
<img class="col three left" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
3131
</div>
3232
<div class="col three caption">
3333
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
3737

3838

3939
<div class="img_row">
40-
<img class="col two" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
41-
<img class="col one" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
40+
<img class="col two left" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
41+
<img class="col one left" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
4242
</div>
4343
<div class="col three caption">
4444
You can also have artistically styled 2/3 + 1/3 images, like these.
4545
</div>
4646

4747

48-
<br/><br/><br/>
48+
<br/><br/>
4949

5050

5151
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:
5252

5353
<div class="img_row">
54-
<img class="col two" src="/img/6.jpg"/>
55-
<img class="col one" src="/img/11.jpg"/>
54+
<img class="col two left" src="/img/6.jpg"/>
55+
<img class="col one left" src="/img/11.jpg"/>
5656
</div>
57+

_projects/4_project.markdown

+10-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
1818

1919

2020
<div class="img_row">
21-
<img class="col one" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22-
<img class="col one" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23-
<img class="col one" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
21+
<img class="col one left" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22+
<img class="col one left" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23+
<img class="col one left" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
2424
</div>
2525
<div class="col three caption">
2626
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.
2727
</div>
2828
<div class="img_row">
29-
<img class="col three" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
29+
<img class="col three left" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
3030
</div>
3131
<div class="col three caption">
3232
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
3636

3737

3838
<div class="img_row">
39-
<img class="col two" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40-
<img class="col one" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
39+
<img class="col two left" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40+
<img class="col one left" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
4141
</div>
4242
<div class="col three caption">
4343
You can also have artistically styled 2/3 + 1/3 images, like these.
4444
</div>
4545

4646

47-
<br/><br/><br/>
47+
<br/><br/>
4848

4949

5050
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:
5151

5252
<div class="img_row">
53-
<img class="col two" src="/img/6.jpg"/>
54-
<img class="col one" src="/img/11.jpg"/>
53+
<img class="col two left" src="/img/6.jpg"/>
54+
<img class="col one left" src="/img/11.jpg"/>
5555
</div>
56+

_projects/5_project.markdown

+10-9
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
1818

1919

2020
<div class="img_row">
21-
<img class="col one" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22-
<img class="col one" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23-
<img class="col one" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
21+
<img class="col one left" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22+
<img class="col one left" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23+
<img class="col one left" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
2424
</div>
2525
<div class="col three caption">
2626
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.
2727
</div>
2828
<div class="img_row">
29-
<img class="col three" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
29+
<img class="col three left" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
3030
</div>
3131
<div class="col three caption">
3232
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
3636

3737

3838
<div class="img_row">
39-
<img class="col two" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40-
<img class="col one" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
39+
<img class="col two left" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40+
<img class="col one left" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
4141
</div>
4242
<div class="col three caption">
4343
You can also have artistically styled 2/3 + 1/3 images, like these.
4444
</div>
4545

4646

47-
<br/><br/><br/>
47+
<br/><br/>
4848

4949

5050
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:
5151

5252
<div class="img_row">
53-
<img class="col two" src="/img/6.jpg"/>
54-
<img class="col one" src="/img/11.jpg"/>
53+
<img class="col two left" src="/img/6.jpg"/>
54+
<img class="col one left" src="/img/11.jpg"/>
5555
</div>
56+

_projects/6_project.markdown

+11-8
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ To give your project a background in the portfolio page, just add the img tag to
1818

1919

2020
<div class="img_row">
21-
<img class="col one" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22-
<img class="col one" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23-
<img class="col one" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
21+
<img class="col one left" src="{{ site.baseurl }}/assets/img/1.jpg" alt="" title="example image"/>
22+
<img class="col one left" src="{{ site.baseurl }}/assets/img/2.jpg" alt="" title="example image"/>
23+
<img class="col one left" src="{{ site.baseurl }}/assets/img/3.jpg" alt="" title="example image"/>
2424
</div>
2525
<div class="col three caption">
2626
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.
2727
</div>
2828
<div class="img_row">
29-
<img class="col three" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
29+
<img class="col three left" src="{{ site.baseurl }}/assets/img/5.jpg" alt="" title="example image"/>
3030
</div>
3131
<div class="col three caption">
3232
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
3636

3737

3838
<div class="img_row">
39-
<img class="col two" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40-
<img class="col one" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
39+
<img class="col two left" src="{{ site.baseurl }}/assets/img/6.jpg" alt="" title="example image"/>
40+
<img class="col one left" src="{{ site.baseurl }}/assets/img/11.jpg" alt="" title="example image"/>
4141
</div>
4242
<div class="col three caption">
4343
You can also have artistically styled 2/3 + 1/3 images, like these.
4444
</div>
4545

4646

47+
<br/><br/>
48+
49+
4750
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:
4851

4952
<div class="img_row">
50-
<img class="col two" src="/img/6.jpg"/>
51-
<img class="col one" src="/img/11.jpg"/>
53+
<img class="col two left" src="/img/6.jpg"/>
54+
<img class="col one left" src="/img/11.jpg"/>
5255
</div>

_sass/_gallery.scss

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ figcaption {
1919
.col {
2020
width: 100%;
2121
height: 100%;
22-
float: left;
2322
object-fit: cover;
2423
box-sizing:border-box;
2524
padding: $img-spacing;

_sass/_profile.scss

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.profile {
2-
float: right !important;
32
img {
43
box-shadow: 0 0 5px $grey-color;
54
width: 100%;

0 commit comments

Comments
 (0)