aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbob <bcz@cs.brown.edu>2019-12-09 16:03:26 -0500
committerbob <bcz@cs.brown.edu>2019-12-09 16:03:26 -0500
commitc9c91b0e74934e36514916786da8822b1f3c05f3 (patch)
tree2c4dac47f8186363e07c998c5c310b4bd97ea1ac /src
parent78a65a6d871ce89f3dfed76035e379df631757a8 (diff)
from last
Diffstat (limited to 'src')
-rw-r--r--src/client/views/GlobalKeyHandler.ts2
-rw-r--r--src/client/views/nodes/FormattedTextBox.scss30
2 files changed, 14 insertions, 18 deletions
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index edc7df12a..bce33531d 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -108,7 +108,7 @@ export default class KeyManager {
let preventDefault = false;
switch (keyname) {
- case " ":
+ case "~":
DictationManager.Controls.listen({ useOverlay: true, tryExecute: true });
stopPropagation = true;
preventDefault = true;
diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss
index 8256cffac..ed320bdcd 100644
--- a/src/client/views/nodes/FormattedTextBox.scss
+++ b/src/client/views/nodes/FormattedTextBox.scss
@@ -238,23 +238,19 @@ footnote::after {
margin-left: 1em;
font-family: inherit;
}
- p {
- display: inline;
- font-family: inherit;
- }
-
- .decimal1-ol { counter-reset: deci1; margin-left: 0; }
- .decimal2-ol { counter-reset: deci2; font-size: smaller; padding-left: 1em;}
- .decimal3-ol { counter-reset: deci3; font-size: smaller; padding-left: 2em;}
- .decimal4-ol { counter-reset: deci4; font-size: smaller; padding-left: 3em;}
- .decimal5-ol { counter-reset: deci5; font-size: smaller; }
- .decimal6-ol { counter-reset: deci6; font-size: smaller; }
- .decimal7-ol { counter-reset: deci7; font-size: smaller; }
-
- .multi1-ol { counter-reset: multi1; margin-left: 0; padding-left: 1.2em }
- .multi2-ol { counter-reset: multi2; font-size: smaller; padding-left: 1.4em;}
- .multi3-ol { counter-reset: multi3; font-size: smaller; padding-left: 2em;}
- .multi4-ol { counter-reset: multi4; font-size: smaller; padding-left: 3.4em;}
+
+ .decimal1-ol { counter-reset: deci1; p {display: inline; font-family: inherit} margin-left: 0; }
+ .decimal2-ol { counter-reset: deci2; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 1em;}
+ .decimal3-ol { counter-reset: deci3; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 2em;}
+ .decimal4-ol { counter-reset: deci4; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 3em;}
+ .decimal5-ol { counter-reset: deci5; p {display: inline; font-family: inherit} font-size: smaller; }
+ .decimal6-ol { counter-reset: deci6; p {display: inline; font-family: inherit} font-size: smaller; }
+ .decimal7-ol { counter-reset: deci7; p {display: inline; font-family: inherit} font-size: smaller; }
+
+ .multi1-ol { counter-reset: multi1; p {display: inline; font-family: inherit} margin-left: 0; padding-left: 1.2em }
+ .multi2-ol { counter-reset: multi2; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 1.4em;}
+ .multi3-ol { counter-reset: multi3; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 2em;}
+ .multi4-ol { counter-reset: multi4; p {display: inline; font-family: inherit} font-size: smaller; padding-left: 3.4em;}
.decimal1:before { transition: 0.5s;counter-increment: deci1; display: inline-block; margin-left: -1em; width: 1em; content: counter(deci1) ". "; }
.decimal2:before { transition: 0.5s;counter-increment: deci2; display: inline-block; margin-left: -2.1em; width: 2.1em; content: counter(deci1) "."counter(deci2) ". "; }