From fca5c54a031bbdd101376d8c4e571d97193fe4f2 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:02:12 -0800 Subject: [PATCH 01/10] give some visual depth to the mini editor live in harmony with the current look and feel --- themes/Atom - Dark/editor.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css index 6581aaa59..8e18a0ed9 100644 --- a/themes/Atom - Dark/editor.css +++ b/themes/Atom - Dark/editor.css @@ -4,6 +4,10 @@ .editor.mini { height: auto; + line-height: 20px; + border: 1px solid rgba(0, 0, 0, 0.2); + border-bottom: 1px solid rgba(180, 180, 180, 0.2); + border-right: 1px solid rgba(180, 180, 180, 0.2); } .editor .gutter .line-number { From 783efa0969c25cb430f587f1d32dc9f881d79494 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:10:22 -0800 Subject: [PATCH 02/10] atom light mini editor styles --- themes/Atom - Light/editor.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css index ebdf4ad12..fe207870d 100644 --- a/themes/Atom - Light/editor.css +++ b/themes/Atom - Light/editor.css @@ -4,6 +4,12 @@ .editor.mini { height: auto; + line-height: 20px; + border: 1px solid rgba(0, 0, 0, 0.2); + border-bottom: 1px solid rgba(180, 180, 180, 0.3); + border-right: 1px solid rgba(180, 180, 180, 0.3); + background-color: #7e8692; + color: #fff; } .editor .gutter .line-number { From 707f6b5dfd026fe803a5384ba88bf68cf3a41de0 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:10:34 -0800 Subject: [PATCH 03/10] fix position of prompt icon --- themes/Atom - Dark/command-panel.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/Atom - Dark/command-panel.css b/themes/Atom - Dark/command-panel.css index dfc7f225b..5e129e7cc 100644 --- a/themes/Atom - Dark/command-panel.css +++ b/themes/Atom - Dark/command-panel.css @@ -84,7 +84,7 @@ content: '\f078'; font-family: 'Octicons Regular'; position: relative; - top: -5px; + top: 0; left: -5px; -webkit-font-smoothing: antialiased; } From 4c8972e2e1a256d182923eb6a08169d022b7e6ea Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:30:07 -0800 Subject: [PATCH 04/10] tweak select list colors so global mini editor styles hold up --- themes/Atom - Dark/editor.css | 2 +- themes/Atom - Dark/select-list.css | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css index 8e18a0ed9..9b29481cf 100644 --- a/themes/Atom - Dark/editor.css +++ b/themes/Atom - Dark/editor.css @@ -4,7 +4,7 @@ .editor.mini { height: auto; - line-height: 20px; + line-height: 25px; border: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(180, 180, 180, 0.2); border-right: 1px solid rgba(180, 180, 180, 0.2); diff --git a/themes/Atom - Dark/select-list.css b/themes/Atom - Dark/select-list.css index 29aac3f03..b0ffac596 100644 --- a/themes/Atom - Dark/select-list.css +++ b/themes/Atom - Dark/select-list.css @@ -1,6 +1,6 @@ .select-list { - background-color: #484848; - border: 1px solid #444; + background-color: #303030; + border: 1px solid #404040; color: #d2d2d2; box-shadow: 0 0 10px #000; border-bottom-left-radius: 3px; @@ -15,7 +15,7 @@ .select-list ol li { background-color: #292929; - border-bottom: 1px solid #212121; + border-bottom: 1px solid #1e1e1e; padding: 5px; } From 42e7a711ff735a0956772188cefa9f7f106e6e69 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:45:38 -0800 Subject: [PATCH 05/10] tweak light select list styles so mini editor looks good --- themes/Atom - Light/command-palette.css | 2 +- themes/Atom - Light/select-list.css | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/themes/Atom - Light/command-palette.css b/themes/Atom - Light/command-palette.css index 272b6b806..a3a00caf7 100644 --- a/themes/Atom - Light/command-palette.css +++ b/themes/Atom - Light/command-palette.css @@ -29,6 +29,6 @@ } .command-palette ol .event-name { - background: rgba(0, 0, 0, .2); + background: rgba(0, 0, 0, .3); color: #fff; } \ No newline at end of file diff --git a/themes/Atom - Light/select-list.css b/themes/Atom - Light/select-list.css index 6142a4c13..99de4fd06 100644 --- a/themes/Atom - Light/select-list.css +++ b/themes/Atom - Light/select-list.css @@ -1,5 +1,5 @@ .select-list { - background-color: #eeeeee; + background-color: #e5e5e5; border: 1px solid #c6c6c6; color: #323232; box-shadow: 0 0 10px #555; @@ -9,18 +9,13 @@ cursor: pointer; } -.select-list .editor { - border: 1px solid #afafaf; - box-shadow: inset 0 0 2px #ccc; -} - .select-list ol { border: 1px solid #d2d2d2; } .select-list ol li { background-color: #f5f5f5; - border-bottom: 1px solid #e6e6e6; + border-bottom: 1px solid #ccc; padding: 5px; } @@ -37,7 +32,7 @@ } .select-list ol .selected { - background-color: #e1e1e1; + background-color: #e0e0e0; } .select-list .error { From 72fde3b521da848756ea3aab58f71d9fa51ffae5 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:46:04 -0800 Subject: [PATCH 06/10] bump mini editor line height a little more so it's consistent with other row height --- themes/Atom - Light/editor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css index fe207870d..c691a3bca 100644 --- a/themes/Atom - Light/editor.css +++ b/themes/Atom - Light/editor.css @@ -4,7 +4,7 @@ .editor.mini { height: auto; - line-height: 20px; + line-height: 25px; border: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(180, 180, 180, 0.3); border-right: 1px solid rgba(180, 180, 180, 0.3); From b2ccc38a04de40c815da49d99bd859f705b697f2 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 10:48:13 -0800 Subject: [PATCH 07/10] 2 shades of grey --- themes/Atom - Light/editor.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css index c691a3bca..a71102f71 100644 --- a/themes/Atom - Light/editor.css +++ b/themes/Atom - Light/editor.css @@ -8,8 +8,8 @@ border: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(180, 180, 180, 0.3); border-right: 1px solid rgba(180, 180, 180, 0.3); - background-color: #7e8692; - color: #fff; + background-color: #aaa; + color: #333; } .editor .gutter .line-number { From 10d7b3ab9f5b71f225dfbd1078940c84ebb70bb6 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 11:00:06 -0800 Subject: [PATCH 08/10] cursor styles for mini editor --- themes/Atom - Light/editor.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/themes/Atom - Light/editor.css b/themes/Atom - Light/editor.css index a71102f71..9326721b9 100644 --- a/themes/Atom - Light/editor.css +++ b/themes/Atom - Light/editor.css @@ -12,6 +12,13 @@ color: #333; } +.editor.mini .cursor { + background: #333; + width: 2px; + line-height: 20px; + margin-top: 2px; +} + .editor .gutter .line-number { padding-right: 1.3em; min-width: 35px; From 52c62433109e5175d5d5e8787edcdf37054359a9 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 11:00:46 -0800 Subject: [PATCH 09/10] dark cursor styles for mini editor --- themes/Atom - Dark/editor.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/themes/Atom - Dark/editor.css b/themes/Atom - Dark/editor.css index 9b29481cf..a9a8429d7 100644 --- a/themes/Atom - Dark/editor.css +++ b/themes/Atom - Dark/editor.css @@ -10,6 +10,12 @@ border-right: 1px solid rgba(180, 180, 180, 0.2); } +.editor.mini .cursor { + width: 2px; + line-height: 20px; + margin-top: 2px; +} + .editor .gutter .line-number { padding-right: 1.3em; min-width: 35px; From 72fd744330a1f1b9e65c5ec54bce86bb0d3cf403 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Tue, 29 Jan 2013 11:05:35 -0800 Subject: [PATCH 10/10] style key binding to match atom dark --- themes/Atom - Light/command-palette.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/themes/Atom - Light/command-palette.css b/themes/Atom - Light/command-palette.css index a3a00caf7..2e7dedd0c 100644 --- a/themes/Atom - Light/command-palette.css +++ b/themes/Atom - Light/command-palette.css @@ -31,4 +31,8 @@ .command-palette ol .event-name { background: rgba(0, 0, 0, .3); color: #fff; -} \ No newline at end of file +} + +.command-palette ol .key-binding { + background: #fff; +}