From dd97731a334b53f1172fc835e94c399c0b8c3192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Poumi=C3=A1n?= <fpoumian@gmail.com> Date: Sat, 7 Oct 2017 12:08:18 -0600 Subject: [PATCH 1/3] Fix border-radius for CodeEditor component in medium size screens. --- src/components/CodeEditor/CodeEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CodeEditor/CodeEditor.js b/src/components/CodeEditor/CodeEditor.js index 6a99c715..cfb3122e 100644 --- a/src/components/CodeEditor/CodeEditor.js +++ b/src/components/CodeEditor/CodeEditor.js @@ -105,7 +105,7 @@ class CodeEditor extends Component { overflow: 'hidden', borderRadius: '10px 0 0 10px', - [media.lessThan('small')]: { + [media.lessThan('medium')]: { borderRadius: '10px 10px 0 0', }, }}> From 27994d5fa039a7c7778c9b0f59621e7384517097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Poumi=C3=A1n?= <fpoumian@gmail.com> Date: Sat, 7 Oct 2017 12:30:22 -0600 Subject: [PATCH 2/3] Fix margin and border-radius in CodeEditor result and error section. --- src/components/CodeEditor/CodeEditor.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/CodeEditor/CodeEditor.js b/src/components/CodeEditor/CodeEditor.js index cfb3122e..08c045ca 100644 --- a/src/components/CodeEditor/CodeEditor.js +++ b/src/components/CodeEditor/CodeEditor.js @@ -127,6 +127,9 @@ class CodeEditor extends Component { paddingLeft: '0 !important', marginRight: '0 !important', paddingRight: '0 !important', + [media.lessThan('medium')]: { + marginBottom: '0 !important', + }, '& pre.prism-code[contenteditable]': { maxHeight: '280px !important', @@ -150,7 +153,7 @@ class CodeEditor extends Component { fontSize: 12, lineHeight: 1.5, - [media.lessThan('small')]: { + [media.lessThan('medium')]: { borderRadius: '0 0 10px 10px', }, }}> @@ -186,7 +189,7 @@ class CodeEditor extends Component { border: `1px solid ${colors.divider}`, borderRadius: '0 10px 10px 0', - [media.lessThan('small')]: { + [media.lessThan('medium')]: { borderRadius: '0 0 10px 10px', }, }}> From 4e0ab5622c1589d9b749f40b26d8b02b2ae2d769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Poumi=C3=A1n?= <fpoumian@gmail.com> Date: Sat, 7 Oct 2017 12:31:47 -0600 Subject: [PATCH 3/3] Format CodeEditor.js with prettier. --- src/components/CodeEditor/CodeEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CodeEditor/CodeEditor.js b/src/components/CodeEditor/CodeEditor.js index 08c045ca..f9b79392 100644 --- a/src/components/CodeEditor/CodeEditor.js +++ b/src/components/CodeEditor/CodeEditor.js @@ -134,7 +134,7 @@ class CodeEditor extends Component { '& pre.prism-code[contenteditable]': { maxHeight: '280px !important', outline: 0, - overflow : 'auto', + overflow: 'auto', marginRight: '0 !important', marginBottom: '0 !important', },