Skip to content

Commit 177dbd0

Browse files
ArdenButterfieldArdenButterfield
committed
further css
1 parent 3e8f98e commit 177dbd0

5 files changed

Lines changed: 94 additions & 78 deletions

File tree

‎delta-sigma/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ <h2>Reconstructed</h2>
9090
</div>
9191
</div>
9292
<div class="section" id="footer-section">
93-
<img src="/images/CIRMMT_logo.svg" style="margin:auto; display:block" alt="CIRMMT Logo">
93+
<a href="https://www.cirmmt.org"><img style="margin:auto; display:block" src="/images/CIRMMT_logo.svg" alt="CIRMMT Logo"></a>
9494
</div>
9595
</div>
9696
</main>

‎index.html‎

Lines changed: 69 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2,96 +2,91 @@
22
<html>
33
<head>
44

5-
<link rel="stylesheet" type="text/css" href="home_style.css" media="screen" />
5+
<link rel="stylesheet" type="text/css" href="styles.css" media="screen" />
66
<title>DAWb2 (CIRMMT)</title>
77
</head>
88

9-
<body>
10-
<h1>Digital Audio Workbench 2</h1>
9+
<body>
10+
<main>
11+
<div class="timeline">
12+
<div class="section" id="main-title-section">
13+
<h1 class="main-title">Digital Audio Workbench 2</h1>
1114

12-
<small>
13-
By Arden Butterfield, Josh Rohs, Travis J. West & Marcelo M. Wanderley
14-
with contributions by Laurent Tarabout<br>
15+
<p class="credits">
16+
By Arden Butterfield, Josh Rohs, Travis J. West & Marcelo M. Wanderley
17+
with contributions by Laurent Tarabout
18+
</p>
1519

16-
Copyright <a href="https://www.cirmmt.org">CIRMMT</a>/McGill University, 2025, based on the <h ref="https://idmil.github.io/DigitalAudioWorkbench/">Digital Audio Workbench</h>
17-
18-
</small>
19-
20-
<p>
20+
<p class="credits">
21+
Copyright <a href="https://www.cirmmt.org">CIRMMT</a>/McGill University, 2025, based on the <a href="https://idmil.github.io/DigitalAudioWorkbench/">Digital Audio Workbench</a>
22+
</p>
23+
</div>
24+
<div class="section">
25+
<p>
2126
The Digital Audio Workbench 2 builds on the <a href = "https://idmil.github.io/DigitalAudioWorkbench/">Digital Audio Workbench</a>,
22-
developed at The Input Devices and Music Interaction Laboratory (IDMIL) at McGill University.
23-
This project aims to provide a workbench or playground for exploratory learing of antialiasing techniques
24-
in sampling and quantization, as well as delta-sigma modulation for analog to digital conversion.
27+
developed at The Input Devices and Music Interaction Laboratory (IDMIL) at McGill University.
28+
This project aims to provide a workbench or playground for exploratory learing of antialiasing techniques
29+
in sampling and quantization, as well as delta-sigma modulation for analog to digital conversion.
2530

26-
<p>
31+
<p>
2732
Please follow the links below to explore different subsets of the
28-
workbench:
29-
</p>
33+
workbench:
34+
</p>
3035

31-
<ul>
32-
<li><a href="sampling">Tutorial on Sampling and Quantization</a></li>
33-
<li><a href="delta-sigma">Tutorial on Delta-Sigma Modulation</a></li>
34-
</ul>
36+
<ul>
37+
<li><a href="sampling">Tutorial on Sampling and Quantization</a></li>
38+
<li><a href="delta-sigma">Tutorial on Delta-Sigma Modulation</a></li>
39+
</ul>
3540

36-
<p>
41+
<p>
3742
<small>
38-
Detailed information is avaialble in the <a href="README.md">project's README file</a>.
43+
Detailed information is avaialble in the <a href="README.md">project's README file</a>.
3944
</small>
40-
</p>
45+
</p>
46+
</div>
47+
<div class="section">
48+
<small><small>
49+
<p>
50+
This software is licensed under the MIT License.
51+
</p>
4152

42-
<small>
43-
<p>
44-
<b>Disclaimer:</b>
45-
<br>
46-
<i>This is a preliminary version of the tool.</i>
47-
<br><br>
48-
Note that so far we have only tested the project on recent Chromium-based browsers. Furthermore, the display is
49-
not yet adequately responsive for mobile devices and other small screens.
50-
<br><br>
51-
If you have any suggestions, questions or comments, please feel free to <a mailto:mwanderley@acm.org>send us an email</a>.
52-
</p>
53-
</small>
53+
<p>
54+
fft.js copyright (c) 2017 Fedor Indutny <br>
55+
fili.js copyright (c) 2014 Florian Markert <br>
56+
All other files copyright (c) 2023 The Input Devices and Musical
57+
Interaction Laboratory (IDMIL), McGill University <br>
58+
</p>
5459

55-
<hr>
60+
<p>
61+
Permission is hereby granted, free of charge, to any person obtaining a
62+
copy of this software and associated documentation files (the
63+
"Software"), to deal in the Software without restriction, including
64+
without limitation the rights to use, copy, modify, merge, publish,
65+
distribute, sublicense, and/or sell copies of the Software, and to
66+
permit persons to whom the Software is furnished to do so, subject to
67+
the following conditions:
68+
</p>
5669

57-
<small><small>
58-
<p>
59-
This software is licensed under the MIT License.
60-
</p>
61-
62-
<p>
63-
fft.js copyright (c) 2017 Fedor Indutny <br>
64-
fili.js copyright (c) 2014 Florian Markert <br>
65-
All other files copyright (c) 2023 The Input Devices and Musical
66-
Interaction Laboratory (IDMIL), McGill University <br>
67-
</p>
70+
<p>
71+
The above copyright notice and this permission notice shall be included
72+
in all copies or substantial portions of the Software.
73+
</p>
6874

69-
<p>
70-
Permission is hereby granted, free of charge, to any person obtaining a
71-
copy of this software and associated documentation files (the
72-
"Software"), to deal in the Software without restriction, including
73-
without limitation the rights to use, copy, modify, merge, publish,
74-
distribute, sublicense, and/or sell copies of the Software, and to
75-
permit persons to whom the Software is furnished to do so, subject to
76-
the following conditions:
77-
</p>
78-
79-
<p>
80-
The above copyright notice and this permission notice shall be included
81-
in all copies or substantial portions of the Software.
82-
</p>
83-
84-
<p>
85-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
86-
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
87-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
88-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
89-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
90-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
91-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
92-
</p>
93-
</small></small>
75+
<p>
76+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
77+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
78+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
79+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
80+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
81+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
82+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
83+
</p>
84+
</small></small>
9485

95-
<img src="/images/CIRMMT_logo.svg" alt="CIRMMT Logo">
86+
<a href="https://www.cirmmt.org"><img src="/images/CIRMMT_logo.svg" alt="CIRMMT Logo"></a>
87+
</div>
88+
</div>
89+
</main>
90+
<hr>
9691
</body>
9792
</html>

‎sampling/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <h2>Reconstructed</h2>
135135
</div>
136136
</div>
137137
<div class="section" id="footer-section">
138-
<img src="/images/CIRMMT_logo.svg" style="margin:auto; display:block" alt="CIRMMT Logo">
138+
<a href="https://www.cirmmt.org"><img style="margin:auto; display:block" src="/images/CIRMMT_logo.svg" alt="CIRMMT Logo"></a>
139139
</div>
140140
</div>
141141
</main>

‎slider.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ class BitDepthSlider extends RangedSlider {
336336
}
337337
calcDisplayVal(){
338338
// override this with any calculations needed to convert stored variable to display val (%, etc)
339-
return this.settings[this.propName] >= 16 ? "unquantized" : this.settings[this.propName];
339+
return this.settings[this.propName] >= 16 ? "unquantized " : this.settings[this.propName];
340340
}
341341

342342

‎styles.css‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,28 @@ h1 {
77
text-align: center;
88
}
99

10+
h1.main-title {
11+
margin: 0;
12+
font-size: 3em;
13+
color: white;
14+
15+
}
16+
17+
p.credits {
18+
color: white;
19+
text-align: center;
20+
}
21+
22+
p.credits a {
23+
color: lightskyblue;
24+
}
25+
26+
#main-title-section {
27+
padding-top: 2em;
28+
padding-bottom: 2em;
29+
background-color: black;
30+
}
31+
1032
h2 {
1133
font-size: 1em;
1234
text-align: center;
@@ -34,7 +56,6 @@ footer{
3456
main {
3557
background-color: lightgrey;
3658
padding: 10px;
37-
margin-bottom: 10px;
3859
}
3960

4061
.titlebar {

0 commit comments

Comments
 (0)