Skip to content

Commit d045965

Browse files
author
Fabian Morón Zirfas
committed
feat(gallery): lots of imporovments to many to track
1 parent 423ac7e commit d045965

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2058
-155
lines changed

‎README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ To develop in this run:
3636
bundle update
3737
bundle exec jekyll serve --livereload
3838

39+
## Recipes
40+
41+
Resize and crop multiple images using [`mogrify`](https://www.imagemagick.org/script/mogrify.php)
42+
43+
```
44+
mogrify -resize 320x180^ -gravity Center -extent 320x180 -quality 100 -format png ./*/thumbnail.jpg
45+
46+
```
3947
## License
4048

4149
Copyright (c) 2013-2019 Basil.js

‎_source/_includes/aside-left.html

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,36 @@
11
<aside>
2-
<a href="/"><div class="logo" id="logo"></div></a>
3-
<div class="nav-o-meter"><ul class="bars"><li></li><li></li><li></li></ul></div>
2+
<a href="/">
3+
<div class="logo" id="logo"></div>
4+
</a>
5+
<div class="nav-o-meter">
6+
<ul class="bars">
7+
<li></li>
8+
<li></li>
9+
<li></li>
10+
</ul>
11+
</div>
412
<nav class="main-menu">
5-
<ul>
6-
<!--
13+
<ul>
14+
<!--
715
loop all pages
816
exclude all entry layouts
917
include all default and the reference
1018
exclude the root path
1119
-->
1220
{% assign pages = site.pages | sort: 'order' %}
1321
{% for item in pages %}{% if item.layout != 'entry' %}{%if item.layout == 'default' or item.layout == 'reference' %}{% if item.url != '/' %}
14-
<li class="menu-item {% if item.title == page.title %}active{% endif %}"><a href="{{item.url}}" class="textgrow menu-link">{{item.title}}</a></li>
15-
{% endif %}{% endif %}{% endif %}{% endfor %}
22+
<li class="menu-item {% if item.title == page.title %}active{% endif %}"><a href="{{item.url}}"
23+
class="textgrow menu-link">{{item.title}}</a></li>
24+
{% endif %}{% endif %}{% endif %}{% endfor %}
1625

17-
</ul>
18-
<div class="tweet">
19-
<div class="message"></div>
20-
<div class="tweettime"></div>
21-
<div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
22-
</div>
23-
</nav>
24-
<div class="fhnw-logo">
25-
<a href="http://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
26-
</div>
26+
</ul>
27+
<div class="tweet">
28+
<div class="message"></div>
29+
<div class="tweettime"></div>
30+
<div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
31+
</div>
32+
<div class="fhnw-logo">
33+
<a href="http://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
34+
</div>
35+
</nav>
2736
</aside>

‎_source/_layouts/gallery-item.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33
---
44
<section>
55
<h1 class="textshrink">{{page.title}}</h1>
6-
<p>{{page.description}}</p>
7-
{%- for author in page.authors -%}
6+
<p class="project-authors"><span>by </span>{%- for author in page.authors -%}
87
{%- if author.url != null -%}
9-
<a href="{{author.url}}">{{author.name}}</a><span>, </span>
8+
<a href="{{author.url}}">{{author.name}}</a>
9+
{%- if forloop.last == false -%}
10+
<span>{% if forloop.rindex0 != 1 %}, {% else %} and {% endif %}</span>
11+
{%- endif -%}
1012
{%- else -%}
11-
{{author.name}}</a><span>, </span>
13+
{{author.name}}
14+
{%- if forloop.last == false -%}
15+
<span>{% if forloop.rindex0 != 1 %}, {% else %} and {% endif %}</span>
16+
{%- endif -%}
1217
{%- endif -%}
1318
{%- endfor -%}
19+
</p>
20+
<p class="project-description">{{page.description}}</p>
1421
</section>
15-
1622
<main>
1723
{{content}}
1824
</main>

‎_source/_sass/_basil.scss renamed to ‎_source/_sass/_basil-old.scss

File renamed without changes.

‎_source/_sass/_gridlines.scss renamed to ‎_source/_sass/_gridlines-old.scss

File renamed without changes.

‎_source/_sass/_guidelines.scss

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
2+
$bottom-lines: 5;
3+
$right-lines: 3;
4+
5+
.guidelines {
6+
.bottom_lines {
7+
@for $i from 1 through $bottom-lines {
8+
.line_#{$i} {
9+
width: 100% - $i * 10;
10+
position: absolute;
11+
left: $i * 5px;
12+
height: 1px;
13+
background-color: #FC2FFF;
14+
bottom: $i * 3px;
15+
}
16+
}
17+
}
18+
19+
.right_lines {
20+
@for $i from 1 through $right-lines {
21+
.line_#{$i} {
22+
height: 100% - $i * 10;
23+
position: absolute;
24+
right: $i * 5px;
25+
width: 1px;
26+
background-color: #8100FB;
27+
top: $i * 3px;
28+
}
29+
}
30+
}
31+
32+
.page_lines {
33+
@include media($phone) {
34+
display: none;
35+
}
36+
37+
38+
.line {
39+
background-color: #21FFFF;
40+
position: absolute;
41+
42+
&.line_1 {
43+
height: 1px;
44+
top: 25px;
45+
left: 0px;
46+
width: 100%;
47+
}
48+
49+
&.line_2 {
50+
right: 115px;
51+
top: 0px;
52+
width: 1px;
53+
height: 100%;
54+
}
55+
56+
&.line_3 {
57+
height: 1px;
58+
bottom: 25px;
59+
left: 0px;
60+
width: 100%;
61+
}
62+
63+
&.line_4 {
64+
height: 100%;
65+
top: 0px;
66+
left: 25px;
67+
width: 1px;
68+
}
69+
}
70+
}
71+
}

‎_source/assets/css/styles.scss

Lines changed: 39 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ body {
6969
float: left;
7070

7171
.main-menu {
72+
73+
padding-bottom: 1em;
74+
75+
ul{
76+
list-style: none;
77+
margin-left: 0;
78+
padding-left: 0;
79+
}
7280
li {
7381
margin-bottom: 0.75em;
7482
height: 40px;
@@ -184,7 +192,29 @@ body {
184192
}
185193
}
186194

187-
// //////////////// edits fabian moron zirfas
195+
// ////////////////////// gallery
196+
197+
.gallery-overview-item-wrapper {
198+
width: 50%;
199+
200+
.gallery-overview-item{
201+
.heading-container{
202+
height: 4em;
203+
}
204+
205+
img.gallery-thumbnail{
206+
width: 256px;
207+
height: 144px;
208+
}
209+
210+
}
211+
212+
}
213+
214+
p.project-authors, p.project-description{
215+
font-size: 1.2em;
216+
font-style: italic;
217+
}
188218

189219
p {
190220
code {
@@ -196,10 +226,10 @@ p {
196226
}
197227

198228
.fhnw-logo {
199-
padding-left: 25px;
229+
// padding-left: 25px;
200230
a {
201231
img {
202-
width: 125px;
232+
width: 150px;
203233
}
204234
}
205235
}
@@ -216,7 +246,7 @@ p {
216246
cursor: pointer;
217247
width: 46px;
218248
height: 37px;
219-
border: 2px solid #2AFFFF;
249+
// border: 2px solid #2AFFFF;
220250
background-color: #fff;
221251
border-radius: 2px;
222252

@@ -226,7 +256,7 @@ p {
226256
padding: 0px;
227257
list-style-type: none;
228258
width: 30px;
229-
height: 2px;
259+
height: 1px;
230260
background-color: #2AFFFF;
231261
position: absolute;
232262
margin-top: -1px;
@@ -316,9 +346,9 @@ li {
316346
}
317347

318348
ul {
319-
list-style: none;
320-
margin-left: 0;
321-
padding-left: 0;
349+
// list-style: none;
350+
// margin-left: 0;
351+
// padding-left: 0;
322352
}
323353

324354
.index {
@@ -387,76 +417,7 @@ pre {
387417
padding: 1.2em;
388418
}
389419

390-
$bottom-lines: 5;
391-
$right-lines: 3;
392-
393-
.guidelines {
394-
.bottom_lines {
395-
@for $i from 1 through $bottom-lines {
396-
.line_#{$i} {
397-
width: 100% - $i * 10;
398-
position: absolute;
399-
left: $i * 5px;
400-
height: 1px;
401-
background-color: #FC2FFF;
402-
bottom: $i * 3px;
403-
}
404-
}
405-
}
406-
407-
.right_lines {
408-
@for $i from 1 through $right-lines {
409-
.line_#{$i} {
410-
height: 100% - $i * 10;
411-
position: absolute;
412-
right: $i * 5px;
413-
width: 1px;
414-
background-color: #8100FB;
415-
top: $i * 3px;
416-
}
417-
}
418-
}
419-
420-
.page_lines {
421-
@include media($phone) {
422-
display: none;
423-
}
424-
425-
426-
.line {
427-
background-color: #21FFFF;
428-
position: absolute;
429-
430-
&.line_1 {
431-
height: 1px;
432-
top: 25px;
433-
left: 0px;
434-
width: 100%;
435-
}
436-
437-
&.line_2 {
438-
right: 115px;
439-
top: 0px;
440-
width: 1px;
441-
height: 100%;
442-
}
443-
444-
&.line_3 {
445-
height: 1px;
446-
bottom: 25px;
447-
left: 0px;
448-
width: 100%;
449-
}
450420

451-
&.line_4 {
452-
height: 100%;
453-
top: 0px;
454-
left: 25px;
455-
width: 1px;
456-
}
457-
}
458-
}
459-
}
460421

461422
//-------media queries
462423

@@ -527,7 +488,7 @@ a.textgrow {
527488
}
528489
}
529490

530-
@import "reference", "changelog";
491+
@import "guidelines", "reference", "changelog";
531492

532493
// ------------------------
533494
// old basil css. Overwrite new settings

0 commit comments

Comments
 (0)