Skip to content

Commit

Permalink
Merge branch 'main' into services-overhaul
Browse files Browse the repository at this point in the history
* main: (43 commits)
  Fixed 404 links
  Added accso slides
  Typo
  Removes the deepl check
  Ignores the .github folder in workflow (#46)
  References more compact
  Adds a blog article about png2webp (#43)
  Update mannheim-business-school-2023-01-17.md
  Translation fix
  Removed DE event list
  Translation logic added (#44)
  Typo
  Added new Meetups
  Changed TGWF image to green-coding.io and removed white line in footer (#45)
  All the pngs to webps (#42)
  Better wording in chart
  Unit Joules added
  Name change in imprint
  Moved domain from .berlin to .io (#41)
  Added dynamic social media images + CPU Power capping image (#40)
  ...
  • Loading branch information
ArneTR committed Jan 30, 2024
2 parents d26ce39 + 9f3dbd0 commit 5c038e8
Show file tree
Hide file tree
Showing 261 changed files with 2,982 additions and 1,407 deletions.
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ All files in this repository that do not explicitly tell otherwise
are to be assumed of being copyrighted.

If you want to copy or modify any file in this repository and are unsure about the licensing
and copyright issues please contact: info@green-coding.berlin
and copyright issues please contact: info@green-coding.io

As stated in the Github Terms this repository may be forked, but is not necessarily allowed to be run, modified or distributed.
20 changes: 18 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Caveats of Hugo
## Caveats of HUGO

- When you have an article under content that is in form of markdown page
and it has a "date" value set in the future it will NOT render out.
Expand All @@ -15,4 +15,20 @@ bundling code is visible. Add new files to the bundle there

## Template
This site uses the Candy Flat Theme.
(Internal: It is in the company Shared Drive.)
(Internal: It is in the company Shared Drive.)

## Multi-Language
HUGO offers two forms of multi-language support:
- Filename extension based
- subfolder based
See detailed documentation here: https://gohugo.io/content-management/multilingual/

We decided to implement the filename extension route. Reason being that it is quicker to determine if an article
has already been translated by just seeing if a same-named copy is located next to it in the filesystem tree.
Also the language coding for layouts still works through filename extensions and it is more cohrent to have
content AND layouts use the same mechanism.

When localizing a template in the `layouts` folder there are two options:
- Creating a new template with the `.de.md` extension. (Beware, you must restart the `hugo server` for it to show. It does not support hot reload)
- Using the `i18n` feature of *HUGO*. All strings are in the *i18n* folder either in the *en.yaml* or *de.yaml*.
+ See documentation here: https://gohugo.io/content-management/multilingual/#translation-of-strings
6 changes: 3 additions & 3 deletions assets/css/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
================================================== */

/* Smaller than standard 960 (devices and browsers) */
@media only screen and (max-width: 1150px) {
@media only screen and (max-width: 1250px) {
.header-container {padding: 0 30px;}

}

@media only screen and (max-width: 959px) {
@media only screen and (max-width: 1050px) {
#ancla1,#ancla2,#ancla3,#ancla4,#ancla5,#ancla6{position: absolute; top: -100px;}
.menu-select{display: none;}
.profile1{font-size: 22px !important;}
Expand All @@ -42,7 +42,7 @@
.logosection.contact {background: url(../img/contact_header_02.png) no-repeat;}
.navigation_resp {
border-radius: 0;
background: url("../img/menu.png") no-repeat;
background: url("../img/menu.webp") no-repeat;
visibility: visible;
display: block;
position: absolute;
Expand Down
76 changes: 45 additions & 31 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
.footer-line{
width: 100%;
height: 13px;
background: url("../img/footer_pattern.png") repeat-x;
background: url("../img/footer_pattern.webp") repeat-x;
}

.newsletter{display: inline-table; margin-top: 55px;}
Expand Down Expand Up @@ -173,7 +173,7 @@ textarea {
.img-project:hover .close{display:block;}

.img-prev{
background: url("../img/arrow_prev.png") no-repeat;
background: url("../img/arrow_prev.webp") no-repeat;
width: 66px;
height: 66px;
position: absolute;
Expand All @@ -182,7 +182,7 @@ textarea {
cursor: pointer;
}
.img-next{
background: url("../img/arrow_next.png") no-repeat;
background: url("../img/arrow_next.webp") no-repeat;
width: 66px;
height: 66px;
position: absolute;
Expand Down Expand Up @@ -347,15 +347,15 @@ nav li a{text-decoration: none;}
text-transform: uppercase;
float: left;
padding-top: 11px;
background: url(../img/logo_alt.png) no-repeat;
background: url(../img/logo_alt.webp) no-repeat;
background-position-y: bottom;
text-indent: 28px;
} .company-name span{color: #AAA;
}

.content-logo{width: auto; height: auto;float: left;margin-top: 34px;text-decoration:none; border:0px;}

.logo{background: url(../img/logo_alt.png) no-repeat; width: 26px; height: 26px; float: left; margin: 0 7px 0 0;}
.logo{background: url(../img/logo_alt.webp) no-repeat; width: 26px; height: 26px; float: left; margin: 0 7px 0 0;}


.menubtn{
Expand All @@ -375,8 +375,8 @@ nav li a{text-decoration: none;}

/* Last Projects Controller */
.controller{height: 40px; width: auto; display: inline-table;}
.prev{ background: #46b7a0; border-radius: 5px 0 0 5px; height: 40px; width: 45px; float: left; background-image: url(../img/controller_prev.png); background-repeat: no-repeat; cursor: pointer; }.prev:hover{background-image: url(../img/controller_prev_roll.png);}
.next{ background: #46b7a0; border-radius: 0 5px 5px 0; height: 40px; width: 45px; float: left; background-image: url(../img/controller_next.png); background-repeat: no-repeat; cursor: pointer; }.next:hover{background-image: url(../img/controller_next_roll.png);}
.prev{ background: #46b7a0; border-radius: 5px 0 0 5px; height: 40px; width: 45px; float: left; background-image: url(../img/controller_prev.webp); background-repeat: no-repeat; cursor: pointer; }.prev:hover{background-image: url(../img/controller_prev_roll.webp);}
.next{ background: #46b7a0; border-radius: 0 5px 5px 0; height: 40px; width: 45px; float: left; background-image: url(../img/controller_next.webp); background-repeat: no-repeat; cursor: pointer; }.next:hover{background-image: url(../img/controller_next_roll.webp);}
.bullets{ background: #46b7a0; border-left: solid 2px #a3dbd0; border-right: solid 2px #a3dbd0; height: 40px; width: auto; float: left;}
.bullets ul{padding-top: 13px;}
.bullets ul li{
Expand Down Expand Up @@ -457,7 +457,6 @@ nav li a{text-decoration: none;}
/*margin-top: 370px;*/
z-index: 9998;
width: 100%;
height: 375px;
background: #2b3e50;
}

Expand Down Expand Up @@ -540,18 +539,18 @@ nav li a{text-decoration: none;}
}

.sc-fb {background:url(../img/social/facebook.png);}
.sc-tw{background: url(../img/social/twitter.png);}
.sc-tw{background: url(../img/social/twitter.webp);}
.sc-print{background: url(../img/social/printerest.png);}
.sc-rss{background: url(../img/social/rss.png);}
.sc-rss{background: url(../img/social/rss.webp);}
.sc-glg{background: url(../img/social/google.png);}

.media a{width: 39px; height: 39px; float: left; margin: 0 5px; cursor: pointer;}
.media a:hover{opacity: 0.8;}
.media a:first-child{margin-left: 0;}
.media a:last-child{margin-right: 0;}

.twitter{ background: url("../img/twitter.png") no-repeat;}
.rss{background: url("../img/rss.png") no-repeat;}
.twitter{ background: url("../img/twitter.webp") no-repeat;}
.rss{background: url("../img/rss.webp") no-repeat;}
.facebook{background: url("../img/facebook.png") no-repeat;}
.pinterest{background: url("../img/pinterest.png") no-repeat;}

Expand Down Expand Up @@ -700,7 +699,7 @@ nav li a{text-decoration: none;}
position: absolute;
top: 0px;
padding-top: 12px;
background:url(../img/follow.jpg) no-repeat center 6px #fa5c5c;
background:url(../img/follow.webp) no-repeat center 6px #fa5c5c;
}
.plus-btn span{
display: inline-block;
Expand Down Expand Up @@ -741,10 +740,10 @@ nav li a{text-decoration: none;}
margin-bottom: 53px;
}

.ico-one{background:url(../img/ico-one.png) no-repeat;}
.ico-two{background:url(../img/ico-two.png) no-repeat;}
.ico-three{background:url(../img/ico-three.png) no-repeat;}
.ico-four{background:url(../img/ico-four.png) no-repeat;}
.ico-one{background:url(../img/ico-one.webp) no-repeat;}
.ico-two{background:url(../img/ico-two.webp) no-repeat;}
.ico-three{background:url(../img/ico-three.webp) no-repeat;}
.ico-four{background:url(../img/ico-four.webp) no-repeat;}

/* ------------------------ PROGRESS BAR ---------------------------*/

Expand Down Expand Up @@ -859,7 +858,7 @@ nav li a{text-decoration: none;}
}

.email{
background: url(../img/email.png) no-repeat;
background: url(../img/email.webp) no-repeat;
width: 64px;
height: 62px;
margin: 15px 0px 0px 35px;
Expand Down Expand Up @@ -983,9 +982,9 @@ nav li a{text-decoration: none;}



.element-1{background: url(../img/about_ico_01.png) no-repeat;}
.element-2{background: url(../img/about_ico_02.png) no-repeat;}
.element-3{background: url(../img/about_ico_03.png) no-repeat;}
.element-1{background: url(../img/about_ico_01.webp) no-repeat;}
.element-2{background: url(../img/about_ico_02.webp) no-repeat;}
.element-3{background: url(../img/about_ico_03.webp) no-repeat;}

/*.profile-element:hover{background-position: 0 -212px; cursor: pointer;}*/

Expand Down Expand Up @@ -1614,7 +1613,7 @@ padding-bottom: 20px;
.dir-left{
width: 47px;
height: 47px;
background: url(../img/direction_nav_prev.png) no-repeat;
background: url(../img/direction_nav_prev.webp) no-repeat;
cursor: pointer;
position: absolute;
bottom: 265px;
Expand All @@ -1624,7 +1623,7 @@ padding-bottom: 20px;
.dir-right{
width: 47px;
height: 47px;
background: url(../img/direction_nav_next.png) no-repeat;
background: url(../img/direction_nav_next.webp) no-repeat;
cursor: pointer;
position: absolute;
bottom: 265px;
Expand All @@ -1638,7 +1637,7 @@ padding-bottom: 20px;
.close {
width: 29px;
height: 29px;
background: url(../img/close.png) no-repeat;
background: url(../img/close.webp) no-repeat;
position: absolute;
right: 25px;
top: 8px;
Expand All @@ -1653,8 +1652,8 @@ padding-bottom: 20px;
right: -50%;
}
.dotsmenu2{height: 14px; width: auto; margin: auto;}
.dotsmenu2 li.activo2{background: url(../img/dotin2.png) no-repeat;}
.dotsmenu2 li{background: url(../img/dotout2.png) no-repeat; width: 14px; height: 14px; float: left; margin: 10px 3px;}
.dotsmenu2 li.activo2{background: url(../img/dotin2.webp) no-repeat;}
.dotsmenu2 li{background: url(../img/dotout2.webp) no-repeat; width: 14px; height: 14px; float: left; margin: 10px 3px;}
.dotsmenu2 li:hover{cursor: pointer;}

.project-window{
Expand Down Expand Up @@ -1691,7 +1690,7 @@ padding-bottom: 20px;
.btn-prev {
width: auto;
height: 26px;
background: url(../img/w-prev.png) left no-repeat;
background: url(../img/w-prev.webp) left no-repeat;
cursor: pointer;
color: #44a390;
font-family: 'Lato', Arial, sans-serif;
Expand All @@ -1703,7 +1702,7 @@ padding-bottom: 20px;
.btn-next {
width: auto;
height: 26px;
background: url(../img/w-next.png) right no-repeat;
background: url(../img/w-next.webp) right no-repeat;
cursor: pointer;
color: #44a390;
font-family: 'Lato', Arial, sans-serif;
Expand Down Expand Up @@ -1899,12 +1898,12 @@ body .date{

.foliomenu .all-btn:hover{color: #ffffff;}

.t-twitter {float: left;background: url(../img/t-twitter.png) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}
.t-twitter {float: left;background: url(../img/t-twitter.webp) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}
.t-fb {float: left; background: url(../img/t-fb.png) no-repeat; width: 28px; height: 27px; margin: 0px 4px;}
.t-flickr {float: left;background: url(../img/t-flickr.png) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}
.t-mail {float: left;background: url(../img/t-mail.png) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}
.t-mail {float: left;background: url(../img/t-mail.webp) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}
.t-fb:hover, .t-twitter:hover, .t-flickr:hover, .t-mail:hover{background-position: 0 -27px; cursor: pointer;}
.t-linkedin {float: left;background: url(../img/t-linkedin.png) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}
.t-linkedin {float: left;background: url(../img/t-linkedin.webp) no-repeat;width: 28px;height: 27px;margin: 0px 4px;}

.social{width: 150px;padding-top: 20px;margin: auto;text-align: center;}
.social.member1{margin-left: 55px;}
Expand Down Expand Up @@ -2392,4 +2391,19 @@ a.project-item > i.icon {
float:right;
font-size: 14px;
font-style: italic;
}

#footer-images {
margin: 0;
padding: 0;
display: block;
}

#footer-images * {
padding: 0;
margin: 0;
}

#references img {
max-width: 200px;
}
25 changes: 22 additions & 3 deletions config.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
baseURL = 'https://www.green-coding.berlin/'
languageCode = 'de-en'
title = 'green-coding.berlin'
baseURL = 'https://www.green-coding.io/'
title = 'green-coding.io'

defaultContentLanguageInSubdir = false

paginate = 10
paginatePath = "page"

summaryLength = 30

defaultContentLanguage = "en"
[languages]
[languages.en]
disabled = false
languageCode = "de-EN"
languageDirection = 'ltr'
languageName = 'English'
weight = 1

[languages.de]
languageCode = "de-DE"
disabled = false
languageDirection = 'ltr'
languageName = 'Deutsch'
weight = 2



# Minify removes also the "" (quotes) from the HTML tags. This breaks bing site validation and
# also maybe some SEO features.
[minify]
Expand Down
7 changes: 0 additions & 7 deletions content/_index.md

This file was deleted.

Loading

0 comments on commit 5c038e8

Please sign in to comment.