Skip to content

Commit 6aec8df

Browse files
rockyrocky
committed
Reorganize: Add Three.js, fold in screenshots
Revise content.
1 parent 47d6c67 commit 6aec8df

File tree

2 files changed

+66
-72
lines changed

2 files changed

+66
-72
lines changed

‎assets/css/main.css‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ h6 {
283283
line-height: 1em;
284284
margin: 0 0 1em 0;
285285
letter-spacing: -0.0125em;
286+
text-align: left;
286287
}
287288

288289
h1 a,
@@ -3928,5 +3929,3 @@ table.alt tbody tr td {
39283929
padding: 3em 1.5em 1em 1.5em;
39293930
}
39303931
}
3931-
3932-

‎index.html‎

Lines changed: 65 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -50,61 +50,22 @@ <h2>
5050
</header>
5151
</section>
5252

53-
<!-- Features -->
54-
<section id="features" class="wrapper">
55-
<div class="inner alt">
56-
<section class="spotlight">
57-
<div class="image">
58-
<img src="images/gpl.svg" alt="GPLv3 logo" />
59-
</div>
60-
<div class="content">
61-
<h3>Free software</h3>
62-
<p> Mathics is licensed under
63-
<a
64-
href="https://github.com/mathics/Mathics/blob/master/COPYING.txt"/>
65-
GPLv3</a> and is developed by an active community of
66-
volunteers. Its source code is freely available in the Github organizations
67-
<a href="https://github.com/mathics">Mathics</a> and
68-
<a href="https://github.com/Mathics3">Mathics3</a> repositories.
69-
</p>
70-
</div>
71-
</section>
72-
<section class="spotlight">
73-
<div class="image">
74-
<img src="images/python-logo.svg" alt="Python logo" />
75-
</div>
76-
<div class="content">
77-
<h3>Python</h3>
78-
Since Mathics is a collection of Python packages. It is intended to be used as a collection or from other Python packages and code.
79-
</p>
80-
</div>
81-
</section>
82-
<section class="spotlight">
83-
<div class="image">
84-
<img src="images/cli.png" alt="mathicsscript screenshot" />
85-
</div>
86-
<div class="content">
87-
<h3>Clients</h3>
88-
<p>Front-end clients are currently <a href="https://pypi.org/project/mathicsscript/">
89-
mathicsscript</a>, a command-line client, and
90-
<a href="https://github.com/Mathics3/mathics-django">
91-
mathics-django</a>, a Django-based web interface. We are also
92-
working on a Jupyter kernel for Mathics.
93-
</div>
94-
</section>
95-
</div>
96-
</section>
97-
98-
<!-- Installation -->
53+
<!-- Components -->
9954
<section id="install" class="wrapper style2 special">
100-
<h2>Installation</h2>
55+
<h2>Components</h2>
10156
<div class="inner align-left">
10257
<p>
10358
Mathics is broken up into a number of pieces in order to
104-
facilitate using the parts of you desire. This can also reduce the
105-
vast number of dependencies to those that you need and the
106-
footprint to run. The pieces are described next with the
107-
components' OS and Python-package dependencies.
59+
facilitate using the parts of you desire. This also
60+
reduces the vast number of dependencies to those that you
61+
need and the footprint to run. However if you want to run
62+
everything we have a docker container
63+
on <a href="https://hub.docker.com/r/mathicsorg/mathics">dockerhub</a>
64+
that has everything.
65+
</p>
66+
67+
<p>The pieces are described next with the
68+
components' OS and Python-package dependencies.
10869
</p>
10970

11071
<h3><a href="https://github.com/mathics/Mathics">Mathics Core</a></h3>
@@ -119,6 +80,14 @@ <h3><a href="https://github.com/mathics/Mathics">Mathics Core</a></h3>
11980
</p>
12081

12182
<h3><a href="https://pypi.org/project/mathics-django/">mathicsscript</a></h3>
83+
<p>
84+
<dd>
85+
<div class="image">
86+
<img src="images/mathicsscript1.gif"
87+
alt="mathicsscript screenshot" />
88+
</div>
89+
</dd>
90+
</p>
12291
<p>
12392
mathicsscript is a CLI client for Mathics. It features:
12493
</p>
@@ -163,11 +132,18 @@ <h3><a href="https://pypi.org/project/mathics-django/">mathicsscript</a></h3>
163132
<h3><a href="https://pypi.org/project/mathics-django/">Mathics-Django</a></h3>
164133

165134
<p>
166-
If you prefer, as many do, browser-based interaction with nicely
167-
formatted graphics and MathML-formatted output. The github repository is
135+
There is a browser-based webserver that has
136+
MathML-formatted formatted output using <a href="https://threejs.org/">three.js</a>
137+
graphics. The github repository is
168138
<a href="https://github.com/Mathics/mathics-django">here</a>.
169139
</p>
170140

141+
<p>
142+
<div class="image">
143+
<img src="images/mathicsserver.png"
144+
alt="Mathics-Django screenshot" />
145+
</div>
146+
</p>
171147
<p>
172148
It features:
173149
</p>
@@ -179,7 +155,7 @@ <h3><a href="https://pypi.org/project/mathics-django/">Mathics-Django</a></h3>
179155
</li>
180156

181157
<li>
182-
Integrated graphics and MathML mathematics output via MathJax
158+
Integrated graphics and MathML mathematics output via MathJax and Three.js.
183159
</li>
184160

185161
<li>
@@ -261,6 +237,38 @@ <h2>Contributing</h2>
261237
</div>
262238
</section>
263239

240+
<!-- Features -->
241+
<section id="features" class="wrapper">
242+
<div class="inner alt">
243+
<section class="spotlight">
244+
<div class="image">
245+
<img src="images/gpl.svg" alt="GPLv3 logo" />
246+
</div>
247+
<div class="content">
248+
<h3>Free software</h3>
249+
<p> Mathics is licensed under
250+
<a
251+
href="https://github.com/mathics/Mathics/blob/master/COPYING.txt"/>
252+
GPLv3</a> and is developed by an active community of
253+
volunteers. Its source code is freely available in the Github organizations
254+
<a href="https://github.com/mathics">Mathics</a> and
255+
<a href="https://github.com/Mathics3">Mathics3</a> repositories.
256+
</p>
257+
</div>
258+
</section>
259+
<section class="spotlight">
260+
<div class="image">
261+
<img src="images/python-logo.svg" alt="Python logo" />
262+
</div>
263+
<div class="content">
264+
<h3>Python</h3>
265+
Since Mathics is a collection of Python packages. It is intended to be used as a collection or from other Python packages and code.
266+
</p>
267+
</div>
268+
</section>
269+
</div>
270+
</section>
271+
264272
<!-- On the Shoulders of Giants -->
265273
<section id="on_the_shoulders_of_giants" class="wrapper style2 special">
266274
<h2>On the Shoulders of Giants</h2>
@@ -278,31 +286,17 @@ <h2>On the Shoulders of Giants</h2>
278286
<li><a href="https://github.com/numba/llvmlite">llvmlite</a></li>
279287
<li><a href="https://www.djangoproject.com/">Django</a></li>
280288
<li><a href="https://www.mathjax.org/">MathJax</a></li>
289+
<li><a href="https://threejs.org/">three.js</a></li>
281290
<li><a href="https://asymptote.sourceforge.io/">Asymptote</a></li>
282291
<li><a href="https://SciPy.org/">SciPy</a> (which also includes a number of the above)</li>
283292
</ul>
284293
</div>
285294
</section>
286295

287-
<!-- Screenshots -->
296+
<!-- Screenshots
288297
<section id="screenshots" class="wrapper style2 special">
289298
<header class="inner major">
290299
<h2>Screenshots</h2>
291-
<dl>
292-
<dt>mathicsscript</dt>
293-
<dd>
294-
<div class="image">
295-
<img src="images/mathicsscript1.gif"
296-
alt="mathicsscript screenshot" />
297-
</div>
298-
</dd>
299-
<dt>mathicsscript</dt>
300-
<dd>
301-
<div class="image">
302-
<img src="images/mathicsscript2.gif"
303-
alt="mathicsscript screenshot" />
304-
</div>
305-
</dd>
306300
<dt>mathicsserver</dt>
307301
<dd>
308302
<div class="image">
@@ -312,6 +306,7 @@ <h2>Screenshots</h2>
312306
</dd>
313307
</header>
314308
</section>
309+
-->
315310

316311
<!-- Footer -->
317312
<footer id="footer">

0 commit comments

Comments
 (0)