Skip to content

Commit 1c22343

Browse files
committed
Merge branch 'main' into cyl_and_sph_avg_quantities
2 parents e747d52 + 8d6857b commit 1c22343

File tree

113 files changed

+1477
-539
lines changed

Some content is hidden

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

113 files changed

+1477
-539
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ jobs:
1010
uses: actions/checkout@v2
1111

1212
- name: Set up Conda
13-
uses: conda-incubator/setup-miniconda@v2
13+
uses: conda-incubator/setup-miniconda@v3
1414
with:
1515
activate-environment: myenv
16-
# mamba-version: "*"
1716
channels: conda-forge, defaults
1817

1918
- name: Create Conda environment

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ instance/
6464
.scrapy
6565

6666
# Sphinx documentation
67-
docs/_build/
67+
docs/*/_build/
68+
docs/*/_static/
69+
docs/*/_templates/
6870

6971
# PyBuilder
7072
target/

docs/environment.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ dependencies:
66
- fenics
77
- matplotlib==3.7.1
88
- pip>=20.1
9-
- sphinx==7
9+
- sphinx==7.4.3
1010
- folium
1111
- numpy==1.24
12-
- pip:
13-
- sympy
14-
- sphinx_book_theme==1.1.2
15-
- sphinx-design==0.5.0
16-
- sphinxcontrib-bibtex
17-
- sphinx-copybutton
18-
- pillow
19-
- sphinxcontrib-images
12+
- sympy
13+
- sphinx-book-theme
14+
- sphinx-design
15+
- sphinxcontrib-bibtex
16+
- sphinx-copybutton
17+
- pillow
18+
- sphinxcontrib-images

docs/source/_static/style.css

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;0,900;1,400;1,700;1,900&family=Open+Sans:ital,wght@0,400;0,600;1,400;1,600&display=swap');
2+
3+
body {
4+
font-family: 'Open Sans', sans-serif;
5+
}
6+
7+
h1 {
8+
font-family: "Lato", sans-serif;
9+
}
10+
11+
pre,
12+
code {
13+
font-size: 100%;
14+
line-height: 155%;
15+
}
16+
17+
/* Main page overview cards */
18+
19+
.sd-card {
20+
border-radius: 0;
21+
padding: 30px 10px 20px 10px;
22+
margin: 10px 0px;
23+
}
24+
25+
.sd-card .sd-card-header {
26+
text-align: center;
27+
}
28+
29+
.sd-card .sd-card-title {
30+
text-align: center;
31+
}
32+
33+
.sd-card .sd-card-header .sd-card-text {
34+
margin: 0px;
35+
}
36+
37+
.sd-card .sd-card-img-top {
38+
height: 52px;
39+
width: 52px;
40+
margin-left: auto;
41+
margin-right: auto;
42+
}
43+
44+
.sd-card .sd-card-header {
45+
border: none;
46+
font-size: var(--pst-font-size-h5);
47+
font-weight: bold;
48+
padding: 2.5rem 0rem 0.5rem 0rem;
49+
}
50+
51+
52+
/*
53+
SPHINX-BOOK-THEME HOTFIX (top-right icons):
54+
https://github.com/executablebooks/sphinx-book-theme/issues/879
55+
*/
56+
.header-article__inner .header-article-items__end,
57+
.header-article__inner .header-article-items__start {
58+
align-items: start;
59+
display: flex;
60+
gap: .5rem;
61+
}
62+
63+
/*
64+
SPHINX-BOOK-THEME HOTFIX (right column vertical stretching fix):
65+
https://github.com/executablebooks/sphinx-book-theme/issues/879
66+
*/
67+
.toc-entry a.nav-link {
68+
padding: .125rem 0 .125rem 1rem;
69+
}
70+
71+
/*
72+
h3 font weight fix (from extra heavy to normal):
73+
https://github.com/executablebooks/sphinx-book-theme/issues/879
74+
*/
75+
h3 {
76+
font-size: 125%;
77+
font-weight: normal;
78+
}

docs/source/api/exports.rst

Lines changed: 0 additions & 4 deletions

docs/source/api/meshing.rst

Lines changed: 0 additions & 4 deletions

docs/source/devguide/index.rst

Lines changed: 86 additions & 8 deletions

docs/source/images/gmsh_tut_1.png

615 KB

docs/source/images/gmsh_tut_2.png

462 KB

docs/source/images/gmsh_tut_3.png

931 KB

0 commit comments

Comments
 (0)