Skip to content

Commit

Permalink
Merge branch 'main' into workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Licini authored Dec 6, 2023
2 parents 4421e1a + f2b2bab commit e646ca2
Show file tree
Hide file tree
Showing 487 changed files with 7,406 additions and 6,086 deletions.
10 changes: 6 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ end_of_line = crlf
[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2

[*.rst]
indent_size = 4

[Makefile]
indent_style = tab
indent_size = 4

[*.yml]
indent_style = space
indent_size = 2

[LICENSE]
insert_final_newline = false
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,5 @@ dev

NOTES

src/compas_blender/conversions/__temp/
src/compas_blender/conversions/__temp/
docs/reference/__old/
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Added `compas.geometry.Torus.to_brep()`.
* Added `compas.brep.Brep.from_iges()`.
* Added `compas.brep.Brep.to_iges()`.
* Added `compas.scene.Scene`.

### Changed

Expand All @@ -26,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Changed `compas.brep.Brep.from_step_file` to `from_step`.
* Moved `compas.brep` to `compas.geometry.brep`.
* Updated `compas-actions.docs` workflow to `v3`.
* `Artists` classes are renamed to `SceneObject` classes and now under `compas.scene`, `compas_rhino.scene`, `compas_ghpython.scene`, `compas_blender.scene`.


### Removed
Expand All @@ -38,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Added `Frame.axes`
* Added `compas.datastructures.TreeNode` and `compas.datastructures.Tree` classes.
* Added `EllipseArtist` to `compas_rhino` and `compas_ghpython`.
* Added `compas.scene.Scene`.

### Changed

Expand Down
Binary file added docs/_images/ghpython_custom.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_images/vscode_git.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 15 additions & 51 deletions docs/_static/compas.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@ body {
font-weight: 300;
}

@media (min-width: 960px) {
.bd-page-width {
max-width: 106rem;
}
.bd-sidebar-primary {
width: 20%;
}
.bd-main {
flex-grow: 1;
}
.bd-main .bd-content .bd-article-container {
max-width: 66rem;
}
}

.bd-header {
box-shadow: none;
border-bottom: 1px solid var(--pst-color-shadow);
Expand All @@ -25,48 +40,10 @@ body {
display: none;
}

/* .bd-sidebar-primary {
width: 20%;
} */

/* .bd-content {
flex-grow: 1;
max-width: 100%;
}
.bd-page-width {
max-width: 100%;
}
.bd-sidebar-primary {
padding-top: 1rem;
} */

.bd-sidebar-primary .toctree-l3 {
font-size: 0.8rem;
}

@media (min-width: 960px) {
/* .bd-sidebar-primary {
max-width: 20%;
} */
/* html[data-theme="light"] .bd-sidebar-primary {
background-color: var(--pst-color-surface);
} */
}

/* html[data-theme="light"] .bd-header {
background-color: var(--pst-color-primary);
}
html[data-theme="light"] .bd-header .navbar-nav .nav-link {
color: rgba(255, 255, 255, 0.5);
}
html[data-theme="light"] .bd-header .navbar-nav > .active > .nav-link {
color: rgba(255, 255, 255, 1);
} */

.navbar-brand img {
height: 32px;
}
Expand All @@ -82,15 +59,6 @@ dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.
margin-top: 1rem;
}

/* .bd-header-announcement::after {
background-color: var(--pst-color-attention);
} */

.lead {
font-size: 1rem !important;
font-weight: unset;
}

.highlight pre {
line-height: 150% !important;
/* font-size: 0.75rem; */
Expand All @@ -99,7 +67,3 @@ dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.
.bd-footer-article {
margin-top: 2rem;
}

/* .bd-breadcrumbs {
margin-top: 1rem;
} */
21 changes: 6 additions & 15 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def get_latest_version():
".md": "markdown",
}
templates_path = sphinx_compas_theme.get_autosummary_templates_path() + ["_templates"]
exclude_patterns = ["_build", "**.ipynb_checkpoints", "_notebooks", "**/__temp"]
exclude_patterns = ["_build", "**.ipynb_checkpoints", "_notebooks", "**/__temp", "**/__old"]

# pygments_style = "sphinx"
# pygments_dark_style = "monokai"
Expand All @@ -59,11 +59,10 @@ def get_latest_version():
"sphinx.ext.doctest",
"sphinx.ext.intersphinx",
"sphinx.ext.mathjax",
# "sphinx.ext.linkcode",
"sphinx.ext.linkcode",
"sphinx.ext.extlinks",
"sphinx.ext.githubpages",
"sphinx.ext.coverage",
# "sphinx.ext.inheritance_diagram",
"sphinx.ext.graphviz",
"matplotlib.sphinxext.plot_directive",
"sphinx.ext.autodoc.typehints",
Expand All @@ -72,8 +71,8 @@ def get_latest_version():
"sphinx_togglebutton",
"sphinx_remove_toctrees",
"sphinx_copybutton",
# "sphinxcontrib.bibtex",
"numpydoc",
"sphinx.ext.viewcode",
]

# remove_from_toctrees = ["api/generated/*"]
Expand Down Expand Up @@ -285,29 +284,22 @@ def visit_reference(self, node):
"navbar_center": ["navbar-nav"],
"navbar_end": [
"version-switcher",
# "theme-switcher",
"theme-switcher",
"navbar-icon-links",
],
"navbar_persistent": ["search-button"],
"navbar_align": "content",
"article_header_start": [
# "breadcrumbs"
],
"article_header_start": ["breadcrumbs"],
"article_header_end": [],
"primary_sidebar_end": [
# "sidebar-ethical-ads"
],
"primary_sidebar_end": [],
"secondary_sidebar_items": ["page-toc", "edit-this-page", "sourcelink"],
"article_footer_items": ["prev-next.html"],
"show_prev_next": True,
# "content_footer_items": [],
"footer_start": ["copyright", "sphinx-version"],
"footer_end": ["theme-version"],
# navigation and links
"external_links": [
# {"name": "Changelog", "url": "https://github.com/compas-dev/compas/releases"},
{"name": "COMPAS Framework", "url": "https://compas.dev"},
# {"name": "COMPAS Association", "url": "https://compas.dev/association"},
],
"header_links_before_dropdown": 5,
"icon_links": [
Expand Down Expand Up @@ -362,7 +354,6 @@ def visit_reference(self, node):
html_sidebars = {
"**": [
"sidebar-nav-bs",
# "sidebar-ethical-ads",
],
}

Expand Down
Loading

0 comments on commit e646ca2

Please sign in to comment.