Skip to content

Commit bdb9872

Browse files
authored
Merge pull request #174 from ASKnetCommunity/main
update 'content' branch with latest changes from 'main'
2 parents 8af860e + 71e8364 commit bdb9872

5 files changed

Lines changed: 34 additions & 5 deletions

File tree

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ _site
66
Gemfile.lock
77
unused
88
bootstrap-reference.html
9-
assets/img/hubs/.directory
10-
.directory
9+
*/.directory

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,6 @@ Fonts used:
132132
- noto-serif-v21-latin-ext_latin-italic.ttf: Copyright 2012 Google Inc. All Rights Reserved.
133133
- noto-serif-v21-latin-ext_latin-700italic.ttf: Copyright 2012 Google Inc. All Rights Reserved.
134134
- noto-serif-v21-latin-ext_latin-700.ttf: Copyright 2012 Google Inc. All Rights Reserved.
135+
136+
137+
[demo-page]: https://asknetcommunity.github.io/ASKnet.Community/

_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{% include head.html %}
88

9-
<body>
9+
<body{% if page.layout == "page" %} class="page-layout"{% endif %}>
1010

1111
{% include header.html %}
1212

assets/scss/_common.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,15 @@ textarea.form-control{
327327

328328
.page-content {
329329
max-width:1000px;
330-
margin: 30px auto;
331-
padding: 0px 15px;
330+
margin: 45px auto;
331+
padding: 15px;
332332
min-height: 55vh;
333333
}
334334

335+
.page-layout { //set background for body tag only on "layout: page" (like imprint etc.)
336+
background: url(../../assets/img/tile-light.jpg);
337+
}
338+
335339
/* /page */
336340

337341
/* footer */

assets/scss/_typography.scss

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,26 @@ h5, .h5{
6161
h6, .h6{
6262
font-size: 14px;
6363
}
64+
65+
.page-layout { //set smaller font sizes for headings only on "layout: page" (like imprint etc.)
66+
67+
h1, .h1{
68+
font-size: 40px;
69+
}
70+
71+
h2, .h2{
72+
font-size: 32px;
73+
}
74+
75+
h3, .h3{
76+
font-size: 22px;
77+
}
78+
79+
h4, .h4{
80+
font-size: 18px;
81+
}
82+
83+
h5, .h5{
84+
font-size: 14px;
85+
}
86+
}

0 commit comments

Comments
 (0)