diff --git a/assets/scss/screen.scss b/assets/scss/screen.scss index d16273ab..47dbab09 100644 --- a/assets/scss/screen.scss +++ b/assets/scss/screen.scss @@ -18,7 +18,7 @@ main { $leading: 1.5; $inter-paragraph-space: 1rem; -$text-font: Helvetica, sans-serif; +$text-font: Helvetica, sans-serif; $text-size: 100%; $banner-title-size: 3rem; $banner-subtitle-size: 2rem; @@ -50,25 +50,44 @@ body { } main { - p, ul, ol, blockquote { + + p, + ul, + ol, + blockquote { margin: $inter-paragraph-space auto; } - p, ul, ol { + + p, + ul, + ol { padding: 0; } - ul, ol { + + ul, + ol { padding-left: $inter-paragraph-space; } + blockquote { padding: 0 $inter-paragraph-space; } - ol { list-style-type: decimal; } - ul { list-style-type: disc; } + + ol { + list-style-type: decimal; + } + + ul { + list-style-type: disc; + } } header { margin: $inter-paragraph-space 0; - h1 { font-size: $page-title-size; } + + h1 { + font-size: $page-title-size; + } } footer { @@ -80,16 +99,25 @@ footer { padding: .5em; margin: 0; - h1, h2, a { + h1, + h2, + a { font-weight: normal; color: $light; } - h1 { font-size: $banner-title-size; } - h2 { font-size: $banner-subtitle-size; } + + h1 { + font-size: $banner-title-size; + } + + h2 { + font-size: $banner-subtitle-size; + } } -.boxed, .chrome { +.boxed, +.chrome { border-color: $medium; border-width: 1px; background-color: $light; @@ -100,7 +128,9 @@ footer { border-style: solid; } -.centered { text-align: center; } +.centered { + text-align: center; +} .chrome { border-top-style: solid; @@ -116,13 +146,16 @@ footer { .inline { margin-left: 0; display: inline; + li { display: inline; margin-left: 0; } } -.piped li + li::before { content: ' | '; } +.piped li+li::before { + content: ' | '; +} .title { font-weight: bold; @@ -131,7 +164,11 @@ footer { a { text-decoration: none; - &:hover { text-decoration: underline; } + + &:hover { + text-decoration: underline; + } + color: $dark; } @@ -139,14 +176,31 @@ blockquote { border: 1px solid $medium; background-color: $lightest; color: $dark; - p, em em { font-style: italic; } - em, em em em { font-style: normal; } + + p, + em em { + font-style: italic; + } + + em, + em em em { + font-style: normal; + } +} + +em, +em em em { + font-style: italic; } -em, em em em { font-style: italic; } -em em { font-style: normal; } +em em { + font-style: normal; +} -h1, h2, h3, h4 { +h1, +h2, +h3, +h4 { margin: 0; padding: 0; color: $dark; @@ -154,35 +208,62 @@ h1, h2, h3, h4 { section { - h1, h2 { + + h1, + h2 { font-variant: small-caps; } - h1, h2, h3, h4 { + + h1, + h2, + h3, + h4 { margin-top: $leading*1rem; } } -h1 { font-size: $heading-1-size; } -h2 { font-size: $heading-2-size; } +h1 { + font-size: $heading-1-size; +} + +h2 { + font-size: $heading-2-size; +} + h3 { font-size: $heading-3-size; font-style: italic; } -hr { margin: 0; } +hr { + margin: 0; +} img { border: 0; max-width: 100%; } -li { margin: 0; } +li { + margin: 0; +} -ol, ul { list-style: none; } +ol, +ul { + list-style: none; +} -p, li, dt, dd { line-height: $leading; } +p, +li, +dt, +dd { + line-height: $leading; +} -p, ul, ol, blockquote { +p, +ul, +ol, +blockquote { padding: 0; margin-top: 2*$inter-paragraph-space; } @@ -204,15 +285,7 @@ img.faceplate { } img.controls { - padding-left: 10px; - padding-bottom: 10px; - float: right; -} - -img.td-controls { - margin: auto; - text-align: center; - vertical-align: top; + padding-top: 10px; } img.envelope { @@ -220,6 +293,7 @@ img.envelope { width: auto; max-height: 360px; max-width: 100%; + padding-top: 10px; } img.envelope2 { @@ -236,11 +310,12 @@ img.xycloid { max-width: 100%; } -table.curves { +table.curves, +table.techniques { td { vertical-align: middle; text-align: center; - padding: 0; + padding: 5px; margin: 0; } @@ -256,6 +331,14 @@ table.curves { } img { - height: 80px; + width: 40px; + } +} + +table.techniques { + border-collapse: collapse; + + td { + border: 1px solid black; } } diff --git a/content/modules/sequencizer/index.md b/content/modules/sequencizer/_index.md similarity index 100% rename from content/modules/sequencizer/index.md rename to content/modules/sequencizer/_index.md diff --git a/content/modules/sequencizer/user-guide/anchors-constant.png b/content/modules/sequencizer/user-guide/anchors-constant.png index 70ce0d16..72856553 100644 Binary files a/content/modules/sequencizer/user-guide/anchors-constant.png and b/content/modules/sequencizer/user-guide/anchors-constant.png differ diff --git a/content/modules/sequencizer/user-guide/_index.md b/content/modules/sequencizer/user-guide/index.md similarity index 89% rename from content/modules/sequencizer/user-guide/_index.md rename to content/modules/sequencizer/user-guide/index.md index 3b09dc53..6635eed1 100644 --- a/content/modules/sequencizer/user-guide/_index.md +++ b/content/modules/sequencizer/user-guide/index.md @@ -171,7 +171,7 @@ _Sequencizer_ offers great flexibility and control over how a sequence advances from one step to the next. - +
@@ -185,7 +185,7 @@ advances from one step to the next. - + - + @@ -208,7 +208,7 @@ advances from one step to the next. - + - + @@ -229,7 +229,7 @@ advances from one step to the next. - + - +
Technique TRIGany ON ON Advance when the GATE condition is satisfied, regardless of what phase the step is executing. Useful for creating @@ -198,7 +198,7 @@ advances from one step to the next. N/A OFF OFF Advance when the generate phase completes, regardless of the condition of the GATE. Useful for hold stages.any ON OFF Advance when the generate phase completes or when the GATE condition is satisfied, which ever happens first. @@ -219,7 +219,7 @@ advances from one step to the next. any OFF ON Complete the generate phase, then sustain until the GATE condition is satisfied. LOW ON OFF Advance if the GATE is low at the start of the step or becomes low while the step is active. Useful for configuring @@ -243,7 +243,7 @@ advances from one step to the next. LOW any ON Useful to combine decay and sustain in a single step.
@@ -261,7 +261,7 @@ This gives 100 possible combinations. Here are some of the more common configurations. - +
@@ -273,7 +273,7 @@ Here are some of the more common configurations. - + @@ -281,7 +281,7 @@ Here are some of the more common configurations. - + @@ -289,14 +289,14 @@ Here are some of the more common configurations. - + - + @@ -304,7 +304,7 @@ Here are some of the more common configurations. - + - + - - + + - - + + - +
Technique Start AnchorConstant SMPL LEVEL TRACK OUT Emit a specified constant voltage. Useful to create a step sequencer.
Hold SMPL OUT TRACK OUT Hold at the the previous step's final voltage. Useful for envelope sustain and hold stages.
Sample and Hold SMPL any input TRACK OUT Hold at the voltage sampled from an input.
Fixed Ramp or Curve SMPL LEVEL SMPL LEVEL Progress from one specified voltage to another. Useful for an envelope attack stage (0V to 10V).
Continuation Ramp or Curve SMPL OUT SMPL LEVEL Progress from the previous step's final voltage to a specified voltage. Useful for an envelope decay stage (set LEVEL to sustain voltage) @@ -315,27 +315,29 @@ Here are some of the more common configurations. Passthrough TRACK any input TRACK same input Track and emit an input signal.
Fade In SMPL any source TRACK any inputFade from the sampled voltage to the selected input signal.Fade from the previous step's final voltage + to the selected input signal.
Fade Out TRACK any input SMPL any sourceFade from the selected input signal to the sampled voltage.Fade from the selected input signal + to the specified voltage (or other source).
Crossfade TRACK an input TRACK another input Fade from one input signal to another.
@@ -396,7 +398,7 @@ interrupts even an "uninterruptible" step. ### Attack Stage - +
@@ -411,7 +413,7 @@ interrupts even an "uninterruptible" step. If INT and SUST are both off, this setting does not matter. - + @@ -445,7 +447,7 @@ interrupts even an "uninterruptible" step. ### Hold Stage -
Parameter Value
INT
+
@@ -460,7 +462,7 @@ interrupts even an "uninterruptible" step. If INT and SUST are both off, this setting does not matter. - + @@ -492,7 +494,7 @@ interrupts even an "uninterruptible" step. ### Decay Stage -
Parameter Value
INT
+
@@ -507,7 +509,7 @@ interrupts even an "uninterruptible" step. If INT and SUST are both off, this setting does not matter. - + @@ -538,7 +540,7 @@ interrupts even an "uninterruptible" step. ### Sustain Stage -
Parameter Value
INT
+
@@ -549,7 +551,7 @@ interrupts even an "uninterruptible" step. - + @@ -581,7 +583,7 @@ interrupts even an "uninterruptible" step. ### Release Stage -
Parameter ValueTRIG LOW The GATE condition that ends the sustain stage.
INT
+
@@ -596,7 +598,7 @@ interrupts even an "uninterruptible" step. If INT and SUST are both off, this setting does not matter. - + @@ -638,7 +640,7 @@ that holds each level until the _GATE_ rises, configure each step liks this: -
Parameter Value
INT
+
@@ -653,7 +655,7 @@ configure each step liks this: by specifying any condition. And you can use different conditions for different steps. - + @@ -693,7 +695,7 @@ To create a **timer-controlled step sequencer** that holds each level for a specified duration, configure each step like this: -
Parameter Value
INT
+
@@ -705,7 +707,7 @@ configure each step like this: - + @@ -745,7 +747,7 @@ sample-and-hold sequencer where each step advances on a different _GATE_ condition, configure each step liks this: -
Parameter ValueOFF Emit the sampled voltage until the timer expires, ignoring the GATE condition.
SUST
+
@@ -756,7 +758,7 @@ configure each step liks this: - + @@ -796,7 +798,7 @@ To create a multi-step, timer-controlled sample-and-hold sequencer where each step holds for a different duration, configure each step liks this: -
Parameter ValueTRIG any Different steps can advance on different GATE conditions.
INT
+
@@ -808,7 +810,7 @@ configure each step liks this: - + diff --git a/content/modules/xycloid/index.md b/content/modules/xycloid/_index.md similarity index 100% rename from content/modules/xycloid/index.md rename to content/modules/xycloid/_index.md
Parameter ValueOFF Emit the sampled voltage until the timer expires, ignoring the GATE condition.
SUST