From 9d0603b6d57bb9fe8c2328d060ea154eea1e2ae6 Mon Sep 17 00:00:00 2001 From: shakti97 Date: Mon, 24 Feb 2020 00:18:16 +0530 Subject: [PATCH 01/22] Feature sidebar toggle shortcut --- client/modules/IDE/pages/IDEView.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx index d9a906d9..3750b7dd 100644 --- a/client/modules/IDE/pages/IDEView.jsx +++ b/client/modules/IDE/pages/IDEView.jsx @@ -156,6 +156,13 @@ class IDEView extends React.Component { } else if (e.keyCode === 49 && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac)) && e.shiftKey) { e.preventDefault(); this.props.setAllAccessibleOutput(true); + } else if (e.keyCode === 66 && ((e.metaKey && this.isMac) || (e.ctrlKey && !this.isMac))) { + e.preventDefault(); + if (!this.props.ide.sidebarIsExpanded) { + this.props.expandSidebar(); + } else { + this.props.collapseSidebar(); + } } } From a8c4cf66b09a82abacfe73274e6eeaf459b28f59 Mon Sep 17 00:00:00 2001 From: shakti97 Date: Sun, 5 Apr 2020 13:41:24 +0530 Subject: [PATCH 02/22] Added Sidebar toggle shortcut in keyboard shortcut overlay --- client/modules/IDE/components/KeyboardShortcutModal.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/modules/IDE/components/KeyboardShortcutModal.jsx b/client/modules/IDE/components/KeyboardShortcutModal.jsx index fbb180b9..7a8e8b58 100644 --- a/client/modules/IDE/components/KeyboardShortcutModal.jsx +++ b/client/modules/IDE/components/KeyboardShortcutModal.jsx @@ -74,6 +74,12 @@ function KeyboardShortcutModal() { Turn off Accessible Output +
  • + + {metaKeyName} + B + + Toggle Sidebar +
    • ); } From 1d1aaccc8e8232f201b56aff180ec40167862566 Mon Sep 17 00:00:00 2001 From: elit-altum Date: Mon, 6 Apr 2020 20:24:39 +0530 Subject: [PATCH 03/22] fix(toolbar): centered the toolbar icons --- client/styles/components/_toolbar.scss | 30 ++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss index 86dec1b2..e4157d8e 100644 --- a/client/styles/components/_toolbar.scss +++ b/client/styles/components/_toolbar.scss @@ -1,6 +1,9 @@ .toolbar__play-button { @include themify() { @extend %toolbar-button; + display: flex; + justify-content: center; + align-items: center; &--selected { @extend %toolbar-button--selected; } @@ -18,8 +21,13 @@ } } margin-right: #{15 / $base-font-size}rem; - & span { - padding-left: #{3 / $base-font-size}rem; + span { + padding-left: #{4 / $base-font-size}rem; + display: flex; + align-items: center; + justify-content: center; + width: 20px; + height: 20px; } } @@ -30,16 +38,29 @@ .toolbar__stop-button { @include themify() { @extend %toolbar-button; + display: flex; + justify-content: center; + align-items: center; margin-right: #{15 / $base-font-size}rem; &--selected { @extend %toolbar-button--selected; } } + span { + display: flex; + align-items: center; + justify-content: center; + width: 20px; + height: 20px; + } } .toolbar__preferences-button { @include themify() { @extend %toolbar-button; + display: flex; + justify-content: center; + align-items: center; line-height: #{52 / $base-font-size}rem; &--selected { @extend %toolbar-button--selected; @@ -50,6 +71,11 @@ margin-left: auto; & span { padding-left: #{1 / $base-font-size}rem; + display: flex; + align-items: center; + justify-content: center; + width: 20px; + height: 20px; } } From 97f02fda55761a04a43936580fbffe3e3962c777 Mon Sep 17 00:00:00 2001 From: elit-altum Date: Thu, 9 Apr 2020 02:33:48 +0530 Subject: [PATCH 04/22] fix(high-contrast-theme): fixed failing WCAG AAA checks --- client/styles/abstracts/_variables.scss | 6 ++-- .../_p5-contrast-codemirror-theme.scss | 34 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index b0fd5a69..05dfcf6e 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -186,7 +186,7 @@ $themes: ( modal-button-color: #333, heading-text-color: #e1e1e1, secondary-text-color: #e1e1e1, - inactive-text-color: #c1c1c1, + inactive-text-color: #f2f2f2, background-color: #333, button-background-color: $white, button-color: $black, @@ -201,14 +201,14 @@ $themes: ( modal-background-color: #444, modal-button-background-color: #C1C1C1, modal-border-color: #949494, - icon-color: #a9a9a9, + icon-color: #d9d9d9, icon-hover-color: $yellow, icon-toast-hover-color: $yellow, shadow-color: rgba(0, 0, 0, 0.16), console-background-color: #4f4f4f, console-color: $black, console-header-background-color: #3f3f3f, - console-header-color: #b5b5b5, + console-header-color: #d9d9d9, console-info-background-color: $lightsteelblue, console-warn-background-color: $orange, console-debug-background-color: $dodgerblue, diff --git a/client/styles/components/_p5-contrast-codemirror-theme.scss b/client/styles/components/_p5-contrast-codemirror-theme.scss index fd289df3..0ad29dc3 100644 --- a/client/styles/components/_p5-contrast-codemirror-theme.scss +++ b/client/styles/components/_p5-contrast-codemirror-theme.scss @@ -31,47 +31,47 @@ $p5-contrast-activeline: #999999; color: $p5-contrast-white; } -.cm-s-p5-contrast .cm-comment { +.cm-s-p5-contrast span .cm-comment { color: $p5-contrast-lightgray; } -.cm-s-p5-contrast .cm-def { +.cm-s-p5-contrast span .cm-def { color: $p5-contrast-blue; } -.cm-s-p5-contrast .cm-string { +.cm-s-p5-contrast span .cm-string { color: $p5-contrast-green; } -.cm-s-p5-contrast .cm-string-2 { +.cm-s-p5-contrast span .cm-string-2 { color: $p5-contrast-green; } -.cm-s-p5-contrast .cm-number { +.cm-s-p5-contrast span .cm-number { color: $p5-contrast-pink; } -.cm-s-p5-contrast .cm-keyword { +.cm-s-p5-contrast span .cm-keyword { color: $p5-contrast-yellow; } -.cm-s-p5-contrast .cm-variable { +.cm-s-p5-contrast span .cm-variable { color: $p5-contrast-white; } -.cm-s-p5-contrast .cm-variable-2 { +.cm-s-p5-contrast span .cm-variable-2 { color: $p5-contrast-white; } -.cm-s-p5-contrast .cm-property { +.cm-s-p5-contrast span .cm-property { color: $p5-contrast-white; } -.cm-s-p5-contrast .cm-atom { +.cm-s-p5-contrast span .cm-atom { color: $p5-contrast-pink; } -.cm-s-p5-contrast .cm-operator { +.cm-s-p5-contrast span .cm-operator { color: $p5-contrast-lightgray; } @@ -79,7 +79,7 @@ $p5-contrast-activeline: #999999; color: $p5-contrast-number; } -.cm-s-p5-contrast .CodeMirror-selected { +.cm-s-p5-contrast div .CodeMirror-selected { background-color: $p5-contrast-selected; } @@ -96,25 +96,25 @@ $p5-contrast-activeline: #999999; color: #f00; } -.cm-s-p5-contrast .CodeMirror-matchingbracket { +.cm-s-p5-contrast span .CodeMirror-matchingbracket { outline: 1px solid $p5-contrast-lightgray; outline-offset: 1px; color: $p5-contrast-white !important; } -.cm-s-p5-contrast .cm-qualifier { +.cm-s-p5-contrast span .cm-qualifier { color: $p5-contrast-yellow; } -.cm-s-p5-contrast .cm-tag { +.cm-s-p5-contrast span .cm-tag { color: $p5-contrast-orange; } -.cm-s-p5-contrast .cm-builtin { +.cm-s-p5-contrast span .cm-builtin { color: $p5-contrast-yellow; } -.cm-s-p5-contrast .cm-attribute { +.cm-s-p5-contrast span .cm-attribute { color: $p5-contrast-white; } From 24e034808c147e0cd0953d773fffa51a63240c0b Mon Sep 17 00:00:00 2001 From: David Date: Wed, 8 Apr 2020 17:11:53 -0500 Subject: [PATCH 05/22] resolve path present assets #1268 --- server/routes/asset.routes.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/routes/asset.routes.js b/server/routes/asset.routes.js index 4e236e7d..db593b6d 100644 --- a/server/routes/asset.routes.js +++ b/server/routes/asset.routes.js @@ -9,6 +9,7 @@ router.get('/full/:project_id/*', getProjectAsset); router.get('/:username/full/:project_id/*', getProjectAsset); router.get('/embed/:project_id/*', getProjectAsset); router.get('/:username/embed/:project_id/*', getProjectAsset); +router.get('/:username/present/:project_id/*', getProjectAsset); router.get('/sketches/:project_id/assets/*?', getFileContent); From a85068b25e0439573f54bd17ae7cb928ffce5e0b Mon Sep 17 00:00:00 2001 From: David Date: Wed, 8 Apr 2020 23:03:59 -0500 Subject: [PATCH 06/22] remove title from nav --- client/components/Nav.jsx | 4 ++-- client/components/NavBasic.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/components/Nav.jsx b/client/components/Nav.jsx index 4a1212c9..8e9cde7a 100644 --- a/client/components/Nav.jsx +++ b/client/components/Nav.jsx @@ -227,7 +227,7 @@ class Nav extends React.PureComponent { renderDashboardMenu(navDropdownState) { return ( -
      +
        • @@ -245,7 +245,7 @@ class Nav extends React.PureComponent { renderProjectMenu(navDropdownState) { return ( -
          +
            • diff --git a/client/components/NavBasic.jsx b/client/components/NavBasic.jsx index 92913add..88c9f313 100644 --- a/client/components/NavBasic.jsx +++ b/client/components/NavBasic.jsx @@ -13,7 +13,7 @@ class NavBasic extends React.PureComponent { render() { return (