Skip to content

Commit 3105e26

Browse files
shnizzedyshnizzedy
authored
Merge branch 'source' into patch-1
2 parents e18a019 + 6078af3 commit 3105e26

Some content is hidden

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

48 files changed

+1967
-321
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ commands:
3131
cd /home/circleci/build
3232
python -m venv ~/simple
3333
source ~/simple/bin/activate
34-
pip install cpac
34+
pip install cpac semver
3535
deactivate
3636
3737
run-cpac-commands:

‎404.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<body>
2121
<section id="header">
2222
<div class="inner">
23-
<span><img src="https://fcp-indi.github.io/images/CPAC-CMI.png" width="100%" height="100%" alt="Configurable Pipeline for the Analysis of Connectomes - Child Mind Institute C-PAC"/></span>
23+
<span><img src="https://fcp-indi.github.io/images/cpac_logo.svg" width="100%" height="100%" alt="Configurable Pipeline for the Analysis of Connectomes - Child Mind Institute C-PAC"/></span>
2424

2525
<p>Configurable Pipeline for the Analysis of Connectomes</p>
2626

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,15 @@ Steps to build this documentation locally:
112112
```
113113

114114
where `{width}` and `{height}` are the values already present in the existing `width` and `height` XML attributes.
115-
- Load SVGs in HTML `object` elements with the `raw:: html` directive to preserve hyperlinks and scaling:
115+
- Embed SVGs with the `raw:: html` directive to preserve hyperlinks. Since the `svg-flowchart` container scales SVGs to the page width, add a link below to view them at their original scale:
116116

117117
```rst
118-
.. raw:: html
118+
.. container:: svg-flowchart
119119
120-
<object data="../_static/path/to/chart.svg" type="image/svg+xml"></object>
120+
.. raw:: html
121+
:file: ../_static/path/to/chart.svg
122+
123+
`Open image <../_static/path/to/chart.svg>`_
121124
```
122125

123126
<a id="markdown-tutorials" name="tutorials"></a>

‎bin/build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ ln ${CPAC_DIRECTORY}/resources/configs/pipeline_config_default.yml docs/_sources
88
ln ${CPAC_DIRECTORY}/resources/configs/group_config_template.yml docs/_sources/references/group_config_template.yml || true
99

1010
# build docs
11-
sphinx-build -b html docs/_sources docs/$1
11+
sphinx-build -b html docs/_sources docs/$1

‎docs/_sources/_static/cpac_logo.jpeg‎

-132 KB
Binary file not shown.

‎docs/_sources/_static/cpac_logo.png‎

-58.2 KB
Binary file not shown.

‎docs/_sources/_static/cpac_logo.svg‎

Lines changed: 168 additions & 0 deletions
Loading

‎docs/_sources/_static/cpac_logo_old.jpg‎

-14.9 KB
Binary file not shown.

‎docs/_sources/_static/cpac_logo_vertical.jpeg‎

-147 KB
Binary file not shown.

‎docs/_sources/_static/cpac_logo_vertical.png‎

-54.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)