Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b534236

Browse files
kintelkintel
committed
Merge branch 'master' of github.com:openscad/openscad.github.com
2 parents fe35191 + e0bf9e9 commit b534236

File tree

7 files changed

+91
-34
lines changed

7 files changed

+91
-34
lines changed

‎about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h1>About</h1>
115115
<article>
116116
<section id="about" class="entry">
117117
<h1>About OpenSCAD</h1>
118-
<p>OpenSCAD is a software for creating solid 3D CAD models. It is free software and available for Linux/UNIX, Windows and Mac OS X. Unlike most free software for creating 3D models (such as Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.</p>
118+
<p>OpenSCAD is software for creating solid 3D CAD models. It is free software and available for Linux/UNIX, Windows and Mac OS X. Unlike most free software for creating 3D models (such as Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.</p>
119119
<p>OpenSCAD is not an interactive modeller. Instead it is something like a 3D-compiler that reads in a script file that describes the object and renders the 3D model from this script file. This gives you (the designer) full control over the modelling process and enables you to easily change any step in the modelling process or make designs that are defined by configurable parameters.</p>
120120
<p>OpenSCAD provides two main modelling techniques: First there is constructive solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data exchange format format for this 2D outlines Autocad DXF files are used. In addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats.</p>
121121
</section>

‎assets/css/style.css‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ border: none !important;
160160
opacity:0.8;
161161
}
162162

163-
164163
#page-content {
165-
position:relative; background:#f2f2ee; padding:20px 20px 0px 20px;
164+
background:#ffffe5; /* #FFFFE5 BACKGROUND_COLOR - pale yellow/cream from colormap.cc */
165+
position:relative; padding:20px 20px 0px 20px;
166166
-moz-box-shadow: 1px 1px 12px 2px #aaa; -webkit-box-shadow: 1px 1px 12px 2px #aaa; box-shadow: 1px 1px 12px 2px #aaa;
167167
border-radius:0px 0px 12px 12px;
168168
}
@@ -225,10 +225,25 @@ h5 {font-size:11px; line-height:150%; padding-bottom:2px;}
225225

226226

227227
header h1 {font-size:28px; margin:0px; padding:0px; font-weight:600; line-height:140%;}
228-
header h2 {font-size:20px; margin:0px; padding:0px; font-weight:500; line-height:100%;}
228+
header h2 {font-size:20px; margin:0px; padding:0px; font-weight:600; line-height:100%;}
229229
header h3 {font-size:16px; margin:0px; padding:0px; font-weight:600; line-height:100%;}
230230
header h4 {font-size:12px; margin:0px; padding:0px; font-weight:500; line-height:100%;}
231231

232+
/* colour the header 'Open' & 'SCAD' and make bolder and chunky
233+
like the cornfield default scheme from colormap.cc
234+
Open - #9dcb51;} OPENCSG_FACE_BACK_COLOR - green
235+
SCAD - #f9d72c;} OPENCSG_FACE_FRONT_COLOR - yellow
236+
- for reference #FFFFE5;} BACKGROUND_COLOR - pale yellow/cream, used above
237+
*/
238+
header h1.title {color:#f9d72c; letter-spacing:-1px; font-weight:700;}
239+
header h1 span.green {color:#9dcb51; letter-spacing:0px;}
240+
241+
header h2.subtitle {color:black; letter-spacing:-1px;}
242+
243+
/* colour OPEN & SCAD in the home sub-page heading the same*/
244+
section h1 strong {color:#f9d72c; font-weight:700; letter-spacing:-1px;}
245+
section h1 strong span.green {color:#9dcb51; letter-spacing:0px;}
246+
232247
.clear {clear:both;}
233248
.left {float:left;}
234249
.right {float:right;}

‎downloads.html‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -346,25 +346,48 @@ <h3 id="WIN64_SNAPSHOT3_NAME">OpenSCAD</h3>
346346

347347
<div id="snapshots-linux" class="subsection">
348348
<h2>Linux</h2>
349-
<!-- Stand-alone binaries not currently being built
350349
<p>Please try the automatically built snapshots first if you are running a supported distribution
351-
(see <a href="#snapshots-linux-auto">below</a>).</p>
350+
(see <a href="#snapshots-linux-auto">below</a>), the following AppImage builds are still
351+
experimental.</p>
352352

353-
<a id="LIN32_SNAPSHOT_URL" href="http://files.openscad.org">
353+
<table>
354+
<tr>
355+
<td align="center">
356+
<!-- <a id="LIN32_SNAPSHOT_URL" href="http://files.openscad.org"> -->
354357
<button class="left, download-button">
355-
<h3 id="LIN32_SNAPSHOT_NAME">OpenSCAD</h3>
356-
<small>x86 (32-bit) - tgz archive - </small><small id="LIN32_SNAPSHOT_SIZE">?? MB</small>
358+
<strike><h3 id="LIN32_SNAPSHOT_NAME">OpenSCAD</h3></strike>
359+
<strike><small>x86 (32-bit) - </small><small id="LIN32_SNAPSHOT_SIZE">?? MB</small></strike>
357360
</button>
358-
</a>
361+
<!-- </a> -->
362+
</td>
363+
<td align="center">
359364
<a id="LIN64_SNAPSHOT_URL" href="http://files.openscad.org">
360365
<button class="download-button">
361366
<h3 id="LIN64_SNAPSHOT_NAME">OpenSCAD</h3>
362-
<small>x64 (64-bit) - tgz archive -</small><small id="LIN64_SNAPSHOT_SIZE">?? MB</small>
367+
<small>x64 (64-bit) - </small><small id="LIN64_SNAPSHOT_SIZE">?? MB</small>
363368
</button>
364369
</a>
365-
-->
366-
367-
<div id="snapshots-linux" class="subsection">
370+
</td>
371+
</tr>
372+
<tr>
373+
<td align="center">
374+
<a id="ARM32_SNAPSHOT_URL" href="http://files.openscad.org">
375+
<button class="download-button">
376+
<h3 id="ARM32_SNAPSHOT_NAME">OpenSCAD</h3>
377+
<small>ARM (32-bit/armv7l) - </small><small id="ARM32_SNAPSHOT_SIZE">?? MB</small>
378+
</button>
379+
</a>
380+
</td>
381+
<td align="center">
382+
<a id="ARM64_SNAPSHOT_URL" href="http://files.openscad.org">
383+
<button class="download-button">
384+
<h3 id="ARM64_SNAPSHOT_NAME">OpenSCAD</h3>
385+
<small>ARM (64-bit/aarch64) - </small><small id="ARM64_SNAPSHOT_SIZE">?? MB</small>
386+
</button>
387+
</a>
388+
</td>
389+
</tr>
390+
</table>
368391
<p>The packages are automatically built based on the <a href="https://github.com/openscad/openscad/tree/master">master branch</a>
369392
on github.</p>
370393
<p>Note: The packages are called "<b>openscad-nightly</b>" so it's possible to install the development
@@ -397,6 +420,11 @@ <h3>Debian 9 (Stretch)</h3>
397420
<small><code>deb http://download.opensuse.org/repositories/home:/t-paul/Debian_9.0/ ./</code></small>
398421
</pre>
399422

423+
<h3>Debian Testing</h3>
424+
<pre>
425+
<small><code>deb http://download.opensuse.org/repositories/home:/t-paul/Debian_Testing_standard/ ./</code></small>
426+
</pre>
427+
400428
<h3>Ubuntu 16.04</h3>
401429
<pre>
402430
<small><code>deb http://download.opensuse.org/repositories/home:/t-paul/xUbuntu_16.04/ ./</code></small>
@@ -412,6 +440,11 @@ <h3>Ubuntu 17.04</h3>
412440
<small><code>deb http://download.opensuse.org/repositories/home:/t-paul/xUbuntu_17.04/ ./</code></small>
413441
</pre>
414442

443+
<h3>Ubuntu 17.10</h3>
444+
<pre>
445+
<small><code>deb http://download.opensuse.org/repositories/home:/t-paul/xUbuntu_17.10/ ./</code></small>
446+
</pre>
447+
415448
<h2>openSUSE packages built on <a href="https://build.opensuse.org/">OpenSUSE build service</a></h2>
416449

417450
<h3>openSUSE Leap 42.2</h3>

‎inc/linux_snapshot_links.js‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
fileinfo['LIN32_SNAPSHOT_URL'] = 'http://files.openscad.org/snapshots/openscad-2014.10.02.x86-32.tar.gz';
2-
fileinfo['LIN32_SNAPSHOT_NAME'] = 'OpenSCAD 2014.10.02';
3-
fileinfo['LIN32_SNAPSHOT_SIZE'] = '36.8 MB';
1+
fileinfo['LIN32_SNAPSHOT_URL'] = '';
2+
fileinfo['LIN32_SNAPSHOT_NAME'] = 'OpenSCAD AppImage';
3+
fileinfo['LIN32_SNAPSHOT_SIZE'] = '16.9 MB';
44

5-
fileinfo['LIN64_SNAPSHOT_URL'] = 'http://files.openscad.org/snapshots/openscad-2014.10.02.x86-64.tar.gz';
6-
fileinfo['LIN64_SNAPSHOT_NAME'] = 'OpenSCAD 2014.10.02';
7-
fileinfo['LIN64_SNAPSHOT_SIZE'] = '35.9 MB';
5+
fileinfo['LIN64_SNAPSHOT_URL'] = 'https://download.opensuse.org/repositories/home:/t-paul/AppImage/OpenSCAD-latest-x86_64.AppImage';
6+
fileinfo['LIN64_SNAPSHOT_NAME'] = 'OpenSCAD AppImage';
7+
fileinfo['LIN64_SNAPSHOT_SIZE'] = '17.3 MB';
8+
9+
fileinfo['ARM32_SNAPSHOT_URL'] = 'https://download.opensuse.org/repositories/home:/t-paul/AppImage.arm/OpenSCAD-latest-armv7l.AppImage';
10+
fileinfo['ARM32_SNAPSHOT_NAME'] = 'OpenSCAD AppImage';
11+
fileinfo['ARM32_SNAPSHOT_SIZE'] = '15.6 MB';
12+
13+
fileinfo['ARM64_SNAPSHOT_URL'] = 'https://download.opensuse.org/repositories/home:/t-paul/AppImage.arm/OpenSCAD-latest-aarch64.AppImage';
14+
fileinfo['ARM64_SNAPSHOT_NAME'] = 'OpenSCAD AppImage';
15+
fileinfo['ARM64_SNAPSHOT_SIZE'] = '16.9 MB';

‎inc/static-gallery.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
{"id":2,"name":"Prusa Mendel iteration3","public_url":"https://github.com/josefprusa/Prusa3","thumbnail":"assets/img/gallery-prusa-i3.png","creator":{"name":"Josef Prusa", "public_url":"http://josefprusa.cz"}},
33
{"id":3,"name":"Metamáquina 2","public_url":"https://github.com/Metamaquina/Metamaquina2","thumbnail":"assets/img/gallery-MM2.png","creator":{"name":"Metamáquina ", "public_url":"http://metamaquina.com.br"}},
44
{"id":4,"name":"Cyclone PCB Factory","public_url":"https://github.com/carlosgs/Cyclone-PCB-Factory/","thumbnail":"assets/img/gallery-cyclone.png","creator":{"name":"Carlos García Saura", "public_url":"http://carlosgs.es"}},
5-
{"id":5,"name":"Tapster - Mobile Automation Robot","public_url":"https://github.com/hugs/tapsterbot","thumbnail":"https://camo.githubusercontent.com/3ead8996912fa34265cd92ef0a700714f9e2a0cd/687474703a2f2f687567732e6769746875622e696f2f696d672f746170737465722d322d6465736b2e6a7067","creator":{"name":"Jason Huggins", "public_url":"https://twitter.com/hugs"}}]
5+
{"id":5,"name":"Tapster - Mobile Automation Robot","public_url":"https://github.com/hugs/tapsterbot","thumbnail":"https://camo.githubusercontent.com/3ead8996912fa34265cd92ef0a700714f9e2a0cd/687474703a2f2f687567732e6769746875622e696f2f696d672f746170737465722d322d6465736b2e6a7067","creator":{"name":"Jason Huggins", "public_url":"https://twitter.com/hugs"}},
6+
{"id":6,"name":"ShimonBox - 3D printable cases for development boards","public_url":"https://github.com/ubitux/shimonbox/","thumbnail":"https://raw.githubusercontent.com/ubitux/shimonbox/master/pics/small/orangepi_zero.jpg","creator":{"name":"Clément Bœsch", "public_url":"http://blog.pkh.me/"}}]

‎inc/win_snapshot_links.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
fileinfo['WIN64_SNAPSHOT1_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.01.20-x86-64-Installer.exe'
2-
fileinfo['WIN64_SNAPSHOT2_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.01.20-x86-64.zip'
1+
fileinfo['WIN64_SNAPSHOT1_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.11.12-x86-64-Installer.exe'
2+
fileinfo['WIN64_SNAPSHOT2_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.11.12-x86-64.zip'
33
fileinfo['WIN64_SNAPSHOT3_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-Tests-2014.07.22-x86-64.zip'
4-
fileinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD 2017.01.20'
5-
fileinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD 2017.01.20'
4+
fileinfo['WIN64_SNAPSHOT1_NAME'] = 'OpenSCAD 2017.11.12'
5+
fileinfo['WIN64_SNAPSHOT2_NAME'] = 'OpenSCAD 2017.11.12'
66
fileinfo['WIN64_SNAPSHOT3_NAME'] = 'OpenSCAD Tests 2014.07.22'
7-
fileinfo['WIN64_SNAPSHOT1_SIZE'] = '15 MB'
8-
fileinfo['WIN64_SNAPSHOT2_SIZE'] = '15 MB'
7+
fileinfo['WIN64_SNAPSHOT1_SIZE'] = '16 MB'
8+
fileinfo['WIN64_SNAPSHOT2_SIZE'] = '16 MB'
99
fileinfo['WIN64_SNAPSHOT3_SIZE'] = '19 MB'
10-
fileinfo['WIN32_SNAPSHOT1_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.01.20-x86-32-Installer.exe'
11-
fileinfo['WIN32_SNAPSHOT2_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.01.20-x86-32.zip'
10+
fileinfo['WIN32_SNAPSHOT1_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.11.12-x86-32-Installer.exe'
11+
fileinfo['WIN32_SNAPSHOT2_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-2017.11.12-x86-32.zip'
1212
fileinfo['WIN32_SNAPSHOT3_URL'] = 'http://files.openscad.org/snapshots/OpenSCAD-Tests-2014.07.22-x86-32.zip'
13-
fileinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD 2017.01.20'
14-
fileinfo['WIN32_SNAPSHOT2_NAME'] = 'OpenSCAD 2017.01.20'
13+
fileinfo['WIN32_SNAPSHOT1_NAME'] = 'OpenSCAD 2017.11.12'
14+
fileinfo['WIN32_SNAPSHOT2_NAME'] = 'OpenSCAD 2017.11.12'
1515
fileinfo['WIN32_SNAPSHOT3_NAME'] = 'OpenSCAD Tests 2014.07.22'
16-
fileinfo['WIN32_SNAPSHOT1_SIZE'] = '15 MB'
17-
fileinfo['WIN32_SNAPSHOT2_SIZE'] = '15 MB'
16+
fileinfo['WIN32_SNAPSHOT1_SIZE'] = '16 MB'
17+
fileinfo['WIN32_SNAPSHOT2_SIZE'] = '16 MB'
1818
fileinfo['WIN32_SNAPSHOT3_SIZE'] = '19 MB'

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h1>Recent News</h1>
105105
<article>
106106

107107
<section>
108-
<h1><strong><span class="green">Open</span>SCAD</strong> is a software for creating solid 3D CAD objects.</h1>
108+
<h1><strong><span class="green">Open</span>SCAD</strong> is software for creating solid 3D CAD objects.</h1>
109109
<h1 class="normal">It is free software and available for Linux/UNIX, MS Windows and Mac OS X.</h1>
110110

111111
<img src="assets/img/screenshot.png"/>

0 commit comments

Comments
 (0)