diff --git a/404.md b/404.md index 709a614..307403e 100644 --- a/404.md +++ b/404.md @@ -1,9 +1,10 @@ --- title: Page not found -layout: page_serifheader +layout: page description: This page could not be found permalink: "/404.html" banner: true +banner_hide_on_mobile: true --- The page you are looking for is not available. Please navigate through the menu above. diff --git a/_includes/footer.html b/_includes/footer.html index 94b47fb..9ca939b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,7 +3,7 @@
-

{{site.title}}

+ {{site.title}}
    {% assign footermenu = site.data.menus.footer | sort: 'weight' %} {% for item in footermenu %} diff --git a/_includes/header.html b/_includes/header.html index 9ac4af0..788b6dc 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -23,16 +23,13 @@
{% if page.banner %} -
-
-



- banner -
+
+ banner
{% endif %} diff --git a/_layouts/associated.html b/_layouts/associated.html index b06b168..80c6323 100644 --- a/_layouts/associated.html +++ b/_layouts/associated.html @@ -2,55 +2,46 @@ layout: default --- -
-

{{ page.title }}

-
- -
-
-
-
- {{ content }} -
- {% if page.image %} -
- {{ page.title }} -
- {% endif %} +
+
+
+

{{ page.title }}

+
{{content}}
+
+ {% if page.image %} +
+ {{ page.title }}
+ {% endif %}
-
-
-
- {% for associate in site.data.associated %} -
-
-
- {{ feature.title }} -
-

{{ associate.title }}

-
{{ associate.description }}
- {% if associate.link %} -
- Project link -
- {% endif %} +
+
+ {% for associate in site.data.associated %} +
+
+
+ {{ feature.title }} +
+ {{ associate.title }} +
{{ associate.description }}
+ {% if associate.link %} +
+ Project link
+ {% endif %}
- {% endfor %}
+ {% endfor %}
diff --git a/_layouts/capabilities.html b/_layouts/capabilities.html index 2d0b883..1b7af90 100644 --- a/_layouts/capabilities.html +++ b/_layouts/capabilities.html @@ -1,46 +1,37 @@ --- layout: default -bodyClass: "page-capabilities" --- -
-
-
-

{{page.title}}

-
-
{{content}}
-
-
-
+
+

{{page.title}}

+
{{content}}
-
-
-

Examples

-
- {% for capability in site.data.examples %} -
-
- {% if capability.image %} -
- {{ feature.title }} -
- {% endif %} -

{{ capability.title }}

-
{{ capability.description }}
- {% if capability.link %} -
- Project link -
- {% endif %} +
+

Examples

+
+ {% for capability in site.data.examples %} +
+
+ {% if capability.image %} +
+ {{ feature.title }} +
+ {% endif %} + {{ capability.title }} +
{{ capability.description }}
+ {% if capability.link %} +
+ Project link
+ {% endif %}
- {% endfor %}
+ {% endfor %}
diff --git a/_layouts/contact.html b/_layouts/contact.html deleted file mode 100644 index bbe46b0..0000000 --- a/_layouts/contact.html +++ /dev/null @@ -1,16 +0,0 @@ ---- -title: Contact -layout: default -bodyClass: "page-contact" ---- - -
-
-
-
-

{{page.title}}

-
{{content}}
-
-
-
-
diff --git a/_layouts/contributor.html b/_layouts/contributor.html index 7a6e30e..d2054be 100644 --- a/_layouts/contributor.html +++ b/_layouts/contributor.html @@ -1,21 +1,10 @@ --- layout: default -bodyClass: "page-community" -permalink: "/contributor/" --- -
-

{{ page.title }}

-
- -
-
-
-
-
{{content}}
-
-
-
+
+

{{page.title}}

+
{{content}}
@@ -34,7 +23,7 @@

{{ page.title }}

/>
{% endif %} -

{{ institution.name }}

+ {{ institution.name }}
{{ institution.institute }}
 @@ -44,14 +33,17 @@

{{ institution.name }}

-
+

Developer in alphabetical order

-
-
    - {% for dev in site.data.developer %} -
  • {{ dev }}
    • - {% endfor %} -
+
+
+
    + {% for dev in site.data.developer %} +
  • {{ dev }}
    • + {% endfor %} +
+
+
diff --git a/_layouts/default.html b/_layouts/default.html index 1160ae4..d32bcad 100755 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -47,7 +47,7 @@ {% endif %} - + {% include main-menu-mobile.html %}
{% include header.html headerClass='header-extra' %} {{content}} diff --git a/_layouts/home.html b/_layouts/home.html index 81ca96c..14cc2ab 100755 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,73 +1,55 @@ --- layout: default -bodyClass: "page-home" --- -
+

4C: A Comprehensive Multiphysics Simulation Framework

+ {% if page.image %} + {{ page.title }} + {% endif %} +
{{ content }}
-
-
-
-
- {{ content }} -
- {% if page.image %} -
- {{ page.title }} -
- {% endif %} -
-
-
- -
-
-

Featured examples

-
-
-
- {% for capability in site.data.examples %} {% if capability.featured %} -
-
- {% if capability.image %} -
- {{ feature.title }} -
- {% endif %} -

{{ capability.title }}

-
{{ capability.description }}
+
+

Featured examples

+
+ {% for capability in site.data.examples %} {% if capability.featured %} +
+
+ {% if capability.image %} +
+ {{ feature.title }}
+ {% endif %} + {{ capability.title }} +
{{ capability.description }}
- {% endif %} {% endfor %}
-
-
- View All Examples -
+ {% endif %} {% endfor %} +
+
+
+ View All Examples
{% if site.data.institutions %}
-
+
{% for institution in site.data.institutions %}
@@ -82,7 +64,7 @@

{{ capability.title }}

/>
{% endif %} -

{{ institution.name }}

+ {{ institution.name }}
{{ institution.institute }}
diff --git a/_layouts/page.html b/_layouts/page.html index 6a6e96d..7e17713 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,15 +1,8 @@ --- layout: default -bodyClass: "page-basic" --- -
-
-
-
-

{{page.title}}

-
{{content}}
-
-
-
+
+

{{page.title}}

+
{{content}}
diff --git a/_layouts/page_serifheader.html b/_layouts/page_serifheader.html deleted file mode 100644 index 527c7ff..0000000 --- a/_layouts/page_serifheader.html +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -bodyClass: "page-basic" ---- - -
-
-
-

{{page.title}}

-
-
{{content}}
-
-
-
-
diff --git a/_sass/components/_content.scss b/_sass/components/_content.scss index d0783e8..9ec2556 100644 --- a/_sass/components/_content.scss +++ b/_sass/components/_content.scss @@ -19,28 +19,6 @@ line-height: 1.56; color: $steel; } - h1 { - font-family: $font-family-base; - font-size: 34px; - line-height: 1.26; - font-weight: normal; - margin-top: 30px; - margin-bottom: 20px; - } - h2 { - font-family: $font-family-base; - font-size: 26px; - font-weight: normal; - line-height: 1.4; - margin-top: 30px; - } - h3 { - font-family: $font-family-base; - font-size: 20px; - line-height: 1.4; - font-weight: normal; - margin-top: 30px; - } ul, ol { margin-bottom: 20px; @@ -56,11 +34,9 @@ list-style: decimal; } li { - margin-bottom: 5px; line-height: 1.56; - margin-left: 40px; - margin-bottom: 20px; - font-size: 20px; + margin-left: 5px; + margin-bottom: 5px; color: $steel; } hr { diff --git a/_sass/components/_content_serifheader.scss b/_sass/components/_content_serifheader.scss deleted file mode 100644 index c028424..0000000 --- a/_sass/components/_content_serifheader.scss +++ /dev/null @@ -1,95 +0,0 @@ -.content { - a { - text-decoration: underline; - } - img { - max-width: 100%; - height: auto; - margin-top: 20px; - margin-bottom: 20px; - } - strong { - font-width: bold; - } - em { - font-style: italic; - } - p { - font-family: $font-family-base; - line-height: 1.56; - color: $steel; - } - h1 { - font-family: $font-family-heading; - font-size: 34px; - line-height: 1.26; - font-weight: normal; - margin-top: 30px; - margin-bottom: 20px; - } - h2 { - font-family: $font-family-heading; - font-size: 26px; - font-weight: normal; - line-height: 1.4; - margin-top: 30px; - } - h3 { - font-family: $font-family-heading; - font-size: 20px; - line-height: 1.4; - font-weight: normal; - margin-top: 30px; - } - ul, - ol { - margin-bottom: 20px; - ul, - ol { - margin-bottom: 0; - } - } - ul { - list-style: disc; - } - ol { - list-style: decimal; - } - li { - margin-bottom: 5px; - line-height: 1.56; - margin-left: 40px; - margin-bottom: 20px; - font-size: 20px; - color: $steel; - } - hr { - border: none; - border-bottom: 1px solid $white-offset; - } - table { - width: 100%; - margin-top: 30px; - margin-bottom: 30px; - th, - td { - padding: 5px; - vertical-align: top; - border-top: 1px solid $white-offset; - } - thead th { - vertical-align: bottom; - border-bottom: 1px solid $white-offset; - text-align: left; - font-weight: bold; - } - tbody + tbody { - border-top: 1px solid $white-offset; - } - } - blockquote { - padding: 0 1em; - color: $steel; - border-left: 0.25em solid $secondary; - } -} diff --git a/_sass/components/_feature.scss b/_sass/components/_feature.scss index 7247835..d90bd75 100644 --- a/_sass/components/_feature.scss +++ b/_sass/components/_feature.scss @@ -13,7 +13,6 @@ width: auto; height: 100px; display: flex; - margin-bottom: 20px; text-align: center; } img { @@ -21,6 +20,12 @@ height: 100px; } .feature-title { + font-family: $font-family-heading; + font-size: 26px; + font-weight: bold; + line-height: 1.4; + margin-top: 20px; + margin-bottom: 15px; } .feature-content { margin-bottom: 0; diff --git a/_sass/components/_footer.scss b/_sass/components/_footer.scss index 1970d9c..f0f7e83 100644 --- a/_sass/components/_footer.scss +++ b/_sass/components/_footer.scss @@ -19,6 +19,7 @@ font-family: $font-family-heading; font-weight: bold; margin-bottom: 10px; + line-height: 1.4; @include media-breakpoint-up(sm) { margin: 0; } diff --git a/_sass/components/_headings.scss b/_sass/components/_headings.scss new file mode 100644 index 0000000..867f388 --- /dev/null +++ b/_sass/components/_headings.scss @@ -0,0 +1,27 @@ +h1 { + font-family: $font-family-heading; + font-size: 34px; + line-height: 1.26; + font-weight: bold; + margin-top: 30px; + margin-bottom: 30px; +} +h2 { + font-family: $font-family-heading; + font-size: 26px; + font-weight: bold; + line-height: 1.4; + margin-top: 30px; + margin-bottom: 15px; +} +h1 + h2 { + margin-top: 30px; +} +h3 { + font-family: $font-family-heading; + color: $primary; + font-size: 26px; + line-height: 1.4; + font-weight: bold; + margin-top: 15px; +} diff --git a/_sass/components/_image.scss b/_sass/components/_image.scss index fd483df..e27eed5 100644 --- a/_sass/components/_image.scss +++ b/_sass/components/_image.scss @@ -1,11 +1,28 @@ .image { width: 100%; height: auto; - margin-top: -40px; } + .image-hide-mobile { display: none; @include media-breakpoint-up(md) { display: block; } } + +.float-image { + float: right; + width: 300px; + max-width: 40%; + height: auto; + margin: 30px 30px 30px 30px; +} + +@include media-breakpoint-down(md) { + .float-image { + float: none; + display: block; + margin: 0 auto 20px auto; + max-width: 70%; + } +} diff --git a/_sass/components/_intro.scss b/_sass/components/_intro.scss index 5126bc5..68a88fb 100644 --- a/_sass/components/_intro.scss +++ b/_sass/components/_intro.scss @@ -9,56 +9,4 @@ padding-top: 60px; padding-bottom: 60px; } - h1 { - color: $black; - font-size: 42px; - font-weight: bold; - line-height: 1.2; - @include media-breakpoint-up(md) { - width: 80%; - font-size: 48px; - } - @include media-breakpoint-up(lg) { - font-size: 50px; - } - } - h2 { - width: 80%; - font-size: 1.2rem; - line-height: 1.4; - margin-bottom: 30px; - color: $black; - font-family: $font-family-base; - } - p { - font-size: 1.2rem; - font-weight: light; - line-height: 1.5; - color: $steel; - @include media-breakpoint-up(md) { - width: 80%; - } - } - ul, - ol { - margin-bottom: 20px; - ul, - ol { - margin-bottom: 0; - } - } - ul { - list-style: disc; - } - ol { - list-style: decimal; - } - li { - margin-bottom: 5px; - line-height: 1; - margin-left: 40px; - margin-bottom: 20px; - font-size: 20px; - color: $steel; - } } diff --git a/_sass/components/_main-menu.scss b/_sass/components/_main-menu.scss index 7b1f33e..1abc735 100644 --- a/_sass/components/_main-menu.scss +++ b/_sass/components/_main-menu.scss @@ -11,7 +11,7 @@ list-style: none; font-size: 1rem; > a { - padding: 10px 12px 10px 12px; + padding: 30px 12px 10px 12px; display: inline-block; font-weight: normal; text-decoration: none; diff --git a/_sass/components/_strip.scss b/_sass/components/_strip.scss index 8b05066..bdf5a3b 100644 --- a/_sass/components/_strip.scss +++ b/_sass/components/_strip.scss @@ -1,13 +1,10 @@ -.strip { - background: white; - background-repeat: no-repeat; -} .strip-white { background-color: white; } .strip-grey { background-color: $white-offset; } + .strip-diagonal { transform: skewY(5deg); padding-bottom: 50px; diff --git a/_sass/components/_title.scss b/_sass/components/_title.scss index 94ae42a..eb3bb7c 100644 --- a/_sass/components/_title.scss +++ b/_sass/components/_title.scss @@ -1,6 +1,6 @@ .title { color: $black; - font-size: 48px; + font-size: 36px; line-height: 1.2; @include media-breakpoint-up(lg) { font-size: 50px; diff --git a/_sass/components/_type.scss b/_sass/components/_type.scss deleted file mode 100644 index 98188c4..0000000 --- a/_sass/components/_type.scss +++ /dev/null @@ -1,43 +0,0 @@ -p { - line-height: 26px; - color: $steel; - font-family: $font-family-base; - margin-bottom: 20px; -} -h1 { - font-size: 30px; - font-family: $font-family-heading; - line-height: 1.2; - margin-bottom: 20px; - @include media-breakpoint-up(md) { - font-size: 32px; - line-height: 1.2; - } -} -h2 { - font-size: 24px; - font-family: $font-family-heading; - line-height: 1.4; - margin-bottom: 10px; - @include media-breakpoint-up(md) { - font-size: 26px; - line-height: 1.4; - } -} -h3 { - font-size: 16px; - line-height: 1.4; - @include media-breakpoint-up(md) { - font-size: 20px; - line-height: 1.4; - } -} -ul, -ol { - margin: 0; - padding: 0; - li { - padding: 0; - margin: 0; - } -} diff --git a/assets/css/style.scss b/assets/css/style.scss index 2272af8..5eca9dc 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -42,7 +42,7 @@ $sub-footer-text-color: $white; @import "libraries/hamburgers/hamburgers"; // Components -@import "components/type"; +@import "components/headings"; @import "components/page"; @import "components/header"; @import "components/footer"; diff --git a/capabilities.md b/capabilities.md index 0f930c6..e85e0c8 100644 --- a/capabilities.md +++ b/capabilities.md @@ -1,7 +1,7 @@ --- title: Capabilities and examples layout: capabilities -description: Features and examples +description: "Capabilities and examples" permalink: "/capabilities/" banner: true banner_hide_on_mobile: true diff --git a/contact.md b/contact.md index 7b4b161..afcf8e4 100644 --- a/contact.md +++ b/contact.md @@ -1,8 +1,10 @@ --- title: Contact -layout: contact -description: Contact +layout: page +description: "Contact information" permalink: "/contact/" +banner: true +banner_hide_on_mobile: true --- You can become part of the 4C community via the [4C GitHub repository](https://github.com/4C-multiphysics/4C). diff --git a/contributor.md b/contributor.md index ab90c99..fb104da 100644 --- a/contributor.md +++ b/contributor.md @@ -1,7 +1,10 @@ --- title: Contributing institutes layout: contributor +description: "Contributors" permalink: "/contributors/" +banner: true +banner_hide_on_mobile: true --- The project 4C was started in 2002 at the Technical University of Munich under supervision of Prof. W. A. Wall diff --git a/history.md b/history.md index fac5cf0..30226df 100644 --- a/history.md +++ b/history.md @@ -1,6 +1,6 @@ --- title: History -layout: page_serifheader +layout: page description: "The more than 20 year long history of 4C" permalink: "/history/" banner: true diff --git a/index.md b/index.md index 3d66e18..6b1d990 100755 --- a/index.md +++ b/index.md @@ -1,7 +1,7 @@ --- title: 4C layout: home -description: +description: "Home page" banner: true banner_hide_on_mobile: true image: "/images/logo/4C-logo-block_rgb.svg" diff --git a/publications.md b/publications.md index 341bae3..801ae2f 100644 --- a/publications.md +++ b/publications.md @@ -1,9 +1,10 @@ --- title: Publications -layout: page_serifheader -description: Publications -bodyClass: page-community +layout: page +description: "Publications" permalink: "/publications/" +banner: true +banner_hide_on_mobile: true --- ## How to cite 4C @@ -31,23 +32,24 @@ _Note:_ You might need to adapt the BibTeX entry depending on the citation style Remember: It is good scientific practice to include the date, when you've visited that website, into the citation. It's up to you (and your advisor) to include the date, depending on the type of publication. - +## Publications -


-


+Publications in which 4C (formerly BACI) has been used are listed below. -## Publications in which 4C (formerly BACI) has been used - -- [Journals](#journals) -- [PhD theses](#phd-thesis) - -## Journals +
+ + Journals + {% bibliography --file papers %} -

-

+
-## PhD Thesis +
+ + PhD Theses + {% bibliography --file phdtheses %} + +