diff --git a/README.md b/README.md index 8916f84a..d60fff54 100644 --- a/README.md +++ b/README.md @@ -33,19 +33,16 @@ For example, `index.md` starts with: ``` --- title: FEniCSx -subtitle: fenicsxversion image: assets/img/headers/design.jpg -layout: with_twitter_sidebar -permalink: /fenics/ --- ``` The `title` is displayed at the top of the page, with the `subtitle` (optional) below it. The `image` will be used as the background of the header; if no image is given, a default image will -be used. The `layout` is used to select which layout the page uses: this can be `default` (for a -default style page) or `with_twitter_sidebar` (for a page with a twitter sidebar). If `layout` -is not set, then `default` will be used. `permalink` sets the url of the page: in this example, -the page would be available at `https://fenicsproject.org/fenics/`. +be used. The `layout` is used to select which layout the page uses: this can currently only be `default` +(for a default style page). If `layout` +is not set, then `default` will be used. `permalink` sets the url of the page: for example, if set to +`/fenics/`, the page would be available at `https://fenicsproject.org/fenics/`. ### Assets Files in the `assets` folder will be included as part of the website. Images and other files can diff --git a/_config.yml b/_config.yml index 2a21359e..395b765b 100644 --- a/_config.yml +++ b/_config.yml @@ -4,8 +4,8 @@ title: FEniCS Project description: Open-source finite element library fenicsversion: 2019.1.0 fenicsversiondate: April 2019 -fenicsxversion: 0.6 -fenicsxversiondate: January 2023 +fenicsxversion: 0.7 +fenicsxversiondate: October 2023 defaults: - diff --git a/_data/navbar.yml b/_data/navbar.yml index 79ea1316..94f389ec 100644 --- a/_data/navbar.yml +++ b/_data/navbar.yml @@ -1,6 +1,6 @@ # Site navigation links -- title: FEniCS 2023 - page: /fenics-2023 +- title: FEniCS 2024 + page: /fenics-2024 - title: Download page: /download - title: Documentation diff --git a/_layouts/with_twitter_sidebar.html b/_layouts/with_twitter_sidebar.html deleted file mode 100644 index 3e9a3c9b..00000000 --- a/_layouts/with_twitter_sidebar.html +++ /dev/null @@ -1,19 +0,0 @@ -{% include _head.html %} - -{% include _header.html %} - - -
- Tweets by fenicsproject -
-
-
- {{ title }} - {{ content }} -
-
- -{% include _footer.html %} - - - diff --git a/_test/test_code.py b/_test/test_code.py index 84aed600..f1a6ac4e 100644 --- a/_test/test_code.py +++ b/_test/test_code.py @@ -13,6 +13,7 @@ "import ufl\n" "import dolfinx\n" "import dolfinx.fem\n" + "import dolfinx.fem.petsc\n" "import dolfinx.mesh\n" "from mpi4py import MPI\n" "from ufl import inner, grad, dx, div, dot\n" diff --git a/assets/css/customsty.css b/assets/css/customsty.css index 8e14a9ed..3506d287 100644 --- a/assets/css/customsty.css +++ b/assets/css/customsty.css @@ -102,13 +102,6 @@ h1, h2, h3, h4, h5, h6 background-color: #FFFFFFCC; } -@media (max-width:1330px){ - #twitter { display:none } -} -@media (min-width:1330px){ - #twitter { display:block } -} - #footer_wrap {background-color:#FFFFFF} body { diff --git a/assets/img/fenics2024/oslo.jpg b/assets/img/fenics2024/oslo.jpg new file mode 100644 index 00000000..b59e2077 Binary files /dev/null and b/assets/img/fenics2024/oslo.jpg differ diff --git a/conference/2024.md b/conference/2024.md new file mode 100644 index 00000000..651b9e7b --- /dev/null +++ b/conference/2024.md @@ -0,0 +1,27 @@ +--- +title: FEniCS 2024 +subtitle: Olso, Norway, 12-14 June 2023 +image: assets/img/fenics2024/oslo.jpg +permalink: /fenics-2024/ +--- + +## Description + +The FEniCS 2024 conference is an opportunity for all those interested in +the FEniCS Project and related projects to exchange ideas, communicate +their results and network with the automated scientific computing +community. + +We welcome developers, existing and potential users of the +FEniCS ecosystem as well as mathematicians, computer scientists and +application domain specialists interested in numerical methods, their +implementation and applications. + +The FEniCS 2024 conference will emphasize an open and inclusive +atmosphere, contributed talks from a diverse range of scientific areas, +and dedicated time for discussions and coding. + +Links to previous FEniCS conferences can be found [here](index.md). + + +More information about the conference will appear here soon. diff --git a/conference/index.md b/conference/index.md index 912f3e57..4ad3bd5c 100644 --- a/conference/index.md +++ b/conference/index.md @@ -4,6 +4,7 @@ permalink: /conference/ --- The FEniCS conference is held in a different location each year. +- [FEniCS 2024 (Oslo)](2024.md) - [FEniCS 2023 (Pula, Cagliari)](2023.md) - [FEniCS 2022 (San Diego)](2022.md) - [FEniCS 2021 (online)](2021.md) diff --git a/index.md b/index.md index f479a888..9b601e02 100644 --- a/index.md +++ b/index.md @@ -1,7 +1,6 @@ --- title: FEniCSx image: assets/img/headers/design.jpg -layout: with_twitter_sidebar --- ## The FEniCSx computing platform