From 58c0e4f5f7eb10811454ecc2f95ba5bbcef0ccd8 Mon Sep 17 00:00:00 2001 From: Lauren McCarthy Date: Wed, 21 Sep 2016 18:46:23 -0700 Subject: [PATCH 1/4] adding styling --- client/styles/abstracts/_variables.scss | 6 +++--- client/styles/components/_nav.scss | 8 +++++--- client/styles/components/_toolbar.scss | 5 +---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index c9b225dc..e07f734b 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -10,7 +10,7 @@ $themes: ( primary-text-color: #333, secondary-text-color: #6b6b6b, inactive-text-color: #b5b5b5, - background-color: #fdfdfd, + background-color: #fbfbfb, button-background-color: #f4f4f4, button-color: $black, button-border-color: #979797, @@ -20,7 +20,7 @@ $themes: ( button-background-active-color: #f10046, button-hover-color: $white, button-active-color: $white, - modal-background-color: #f4f4f4, + modal-background-color: #fdfdfd, modal-button-background-color: #e6e6e6, modal-border-color: #B9D0E1, icon-color: #8b8b8b, @@ -29,7 +29,7 @@ $themes: ( console-background-color: #eee, console-header-background-color: #d6d6d6, ide-border-color: #f4f4f4, - editor-gutter-color: #f7f7f7, + editor-gutter-color: #f4f4f4, file-selected-color: #f4f4f4, ), dark: ( diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index d73fa441..18775df0 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -1,15 +1,16 @@ .nav { width: 100%; padding: #{10 / $base-font-size}rem #{70 / $base-font-size}rem; - padding-left: #{170 / $base-font-size}rem; + padding-left: #{33 / $base-font-size}rem; display: flex; flex-direction: row; justify-content: space-between; + font-size: #{12 / $base-font-size}rem; } .nav__items-left, .nav__items-right { @include themify() { - border-bottom: 2px dashed map-get($theme-map, 'inactive-text-color'); + border-bottom: 1px dashed map-get($theme-map, 'inactive-text-color'); } list-style: none; display: flex; @@ -20,9 +21,10 @@ .nav__item { & + & { - margin-left: #{20 / $base-font-size}rem; + margin-left: #{0 / $base-font-size}rem; } position: relative; + min-width: #{72 / $base-font-size}rem; } .nav__dropdown { diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss index f66ef02a..2e59b545 100644 --- a/client/styles/components/_toolbar.scss +++ b/client/styles/components/_toolbar.scss @@ -42,15 +42,12 @@ } .toolbar { - padding: #{20 / $base-font-size}rem #{60 / $base-font-size}rem; + padding: #{15 / $base-font-size}rem #{34 / $base-font-size}rem; display: flex; align-items: center; } .toolbar__project-name-container { - @include themify() { - border-left: 2px dashed map-get($theme-map, 'inactive-text-color'); - } margin-left: #{10 / $base-font-size}rem; padding-left: #{10 / $base-font-size}rem; height: 70%; From 4d6cb433307d4db90faaa22d6adfff9d38f34670 Mon Sep 17 00:00:00 2001 From: Lauren McCarthy Date: Sat, 1 Oct 2016 16:04:40 -0700 Subject: [PATCH 2/4] changing interval to 100ms --- client/modules/IDE/components/PreviewFrame.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/modules/IDE/components/PreviewFrame.js b/client/modules/IDE/components/PreviewFrame.js index 5dd60e0e..68c27b8b 100644 --- a/client/modules/IDE/components/PreviewFrame.js +++ b/client/modules/IDE/components/PreviewFrame.js @@ -77,7 +77,7 @@ function hijackConsoleLogsScript() { arguments: args, source: 'sketch' }, '*'); - }, 250); + }, 100); }); `; return s; From ee6c5e94aab4888c36ec49b0f69739ff392fc8f8 Mon Sep 17 00:00:00 2001 From: Lauren McCarthy Date: Sat, 1 Oct 2016 16:25:00 -0700 Subject: [PATCH 3/4] only update console when expanded --- client/modules/IDE/components/Console.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/modules/IDE/components/Console.js b/client/modules/IDE/components/Console.js index 52b33d58..177f53cc 100644 --- a/client/modules/IDE/components/Console.js +++ b/client/modules/IDE/components/Console.js @@ -25,7 +25,7 @@ class Console extends React.Component { componentWillReceiveProps(nextProps) { if (nextProps.isPlaying && !this.props.isPlaying) { this.children = []; - } else if (nextProps.consoleEvent !== this.props.consoleEvent) { + } else if (nextProps.isExpanded && nextProps.consoleEvent !== this.props.consoleEvent) { const args = nextProps.consoleEvent.arguments; const method = nextProps.consoleEvent.method; const nextChild = ( From dfdbc35b74fbdaebedad7a6cc5d7f41dcabf653b Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 5 Oct 2016 14:02:46 -0400 Subject: [PATCH 4/4] fix small css bug --- client/styles/components/_nav.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index 18775df0..72344517 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -20,11 +20,9 @@ } .nav__item { - & + & { - margin-left: #{0 / $base-font-size}rem; - } position: relative; min-width: #{72 / $base-font-size}rem; + text-align: center; } .nav__dropdown {