From 3675407ca70abdbe47d36e3cde0e6aa38ab2ea33 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 13:51:40 -0800 Subject: [PATCH 1/7] use from-bottom overlay for grammar view --- src/app/grammar-view.coffee | 2 +- static/overlay.css | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/grammar-view.coffee b/src/app/grammar-view.coffee index 3465c45a7..06230c10e 100644 --- a/src/app/grammar-view.coffee +++ b/src/app/grammar-view.coffee @@ -4,7 +4,7 @@ SelectList = require 'select-list' module.exports = class GrammarView extends SelectList - @viewClass: -> "#{super} grammar-view from-top overlay" + @viewClass: -> "#{super} grammar-view from-bottom overlay mini" filterKey: 'name' diff --git a/static/overlay.css b/static/overlay.css index 421b2f71f..4cc97ccf3 100644 --- a/static/overlay.css +++ b/static/overlay.css @@ -1,6 +1,5 @@ .overlay { position: absolute; - top: 0; left: 50%; width: 500px; margin-left: -250px; @@ -26,10 +25,18 @@ .overlay.mini { width: 200px; margin-left: -100px; + font-size: 12px; } .overlay.from-top { + top: 0; border-top: none; border-top-left-radius: 0; border-top-right-radius: 0; +} + +.overlay.from-bottom { + bottom: 0; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } \ No newline at end of file From 124b2c0c074e0183e308eeb7d3fb327f5acf6ab5 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 14:48:33 -0800 Subject: [PATCH 2/7] lets do just mini on the grammar overlay since it originates from the middle --- src/app/grammar-view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/grammar-view.coffee b/src/app/grammar-view.coffee index 06230c10e..1319f979a 100644 --- a/src/app/grammar-view.coffee +++ b/src/app/grammar-view.coffee @@ -4,7 +4,7 @@ SelectList = require 'select-list' module.exports = class GrammarView extends SelectList - @viewClass: -> "#{super} grammar-view from-bottom overlay mini" + @viewClass: -> "#{super} grammar-view from-top overlay mini" filterKey: 'name' From 1f50ca8d16cfee0c2c687bafffc85b2a26890532 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 15:12:22 -0800 Subject: [PATCH 3/7] cleanup statusbar styles --- src/packages/status-bar/stylesheets/status-bar.css | 9 --------- static/status-bar.css | 13 +++++++++++-- themes/atom-dark-ui/status-bar.css | 11 +++++++++-- 3 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 src/packages/status-bar/stylesheets/status-bar.css diff --git a/src/packages/status-bar/stylesheets/status-bar.css b/src/packages/status-bar/stylesheets/status-bar.css deleted file mode 100644 index 3fe635f49..000000000 --- a/src/packages/status-bar/stylesheets/status-bar.css +++ /dev/null @@ -1,9 +0,0 @@ -.status-bar { - position: relative; - -webkit-user-select: none; - cursor: default; -} - -.status-bar .git-branch { - float: right; -} \ No newline at end of file diff --git a/static/status-bar.css b/static/status-bar.css index fe46c8408..4cc898c41 100644 --- a/static/status-bar.css +++ b/static/status-bar.css @@ -1,16 +1,25 @@ .status-bar { - padding: 4px 10px 3px; + padding: 5px 10px; font-size: 11px; line-height: 14px; + position: relative; + -webkit-user-select: none; + cursor: default; +} + +.status-bar .git-branch { + float: right; } .status-bar .cursor-position, .status-bar .grammar-name { - padding-left: 10px; + margin-left: 10px; } .status-bar .grammar-name { cursor: pointer; + border: 1px solid transparent; + padding: 1px 2px; } .status-bar .branch-label { diff --git a/themes/atom-dark-ui/status-bar.css b/themes/atom-dark-ui/status-bar.css index 4ca4f2dc5..1c0af57e0 100644 --- a/themes/atom-dark-ui/status-bar.css +++ b/themes/atom-dark-ui/status-bar.css @@ -1,9 +1,16 @@ .status-bar { - background-color: #303030; - border-top: 1px solid #454545; + background-color: #1b1c1e; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05); + border-top: 1px solid rgba(0, 0, 0, 0.8); color: #969696; } +.status-bar .grammar-name:hover { + color: #fff; + border: 1px solid rgba(255, 255, 255, 0.2); + border-radius: 2px; +} + .status-bar .git-status.octicons.modified-status-icon { color: #f78a46; display: inline-block; From 5ad38c9bc6b441d3e1ca2208c01c6fc8d876efc0 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 15:14:00 -0800 Subject: [PATCH 4/7] bracket matcher animation was kind of annoying when typing between brackets --- .../bracket-matcher/stylesheets/bracket-matcher.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/packages/bracket-matcher/stylesheets/bracket-matcher.css b/src/packages/bracket-matcher/stylesheets/bracket-matcher.css index f598fdf0d..1eeb11bd4 100644 --- a/src/packages/bracket-matcher/stylesheets/bracket-matcher.css +++ b/src/packages/bracket-matcher/stylesheets/bracket-matcher.css @@ -1,12 +1,4 @@ -@-webkit-keyframes bracketmatch { - from { border-bottom-color: transparent; } - to { border-bottom-color: lime; } -} - .bracket-matcher { border-bottom: 1px dotted lime; position: absolute; - -webkit-animation-name: bracketmatch; - -webkit-animation-duration: 0.15s; - -webkit-animation-iteration-count: 2; } From cb4abb201a6d24a0bf489447ba22ebfe02f5bb61 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 16:19:02 -0800 Subject: [PATCH 5/7] pray the gray away --- static/overlay.css | 5 +++-- themes/atom-dark-ui/editor.css | 4 ++-- themes/atom-dark-ui/select-list.css | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/static/overlay.css b/static/overlay.css index 4cc97ccf3..60bd0a88f 100644 --- a/static/overlay.css +++ b/static/overlay.css @@ -3,12 +3,12 @@ left: 50%; width: 500px; margin-left: -250px; - background: #303030; + background: #202123; color: #eee; padding: 10px; z-index: 9999; box-sizing: border-box; - border: 1px solid rgba(255, 255, 255, 0.1); + border: 1px solid rgba(255, 255, 255, 0.05); box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); border-radius: 3px; } @@ -37,6 +37,7 @@ .overlay.from-bottom { bottom: 0; + border-bottom: none; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } \ No newline at end of file diff --git a/themes/atom-dark-ui/editor.css b/themes/atom-dark-ui/editor.css index 3006ed4ef..988ce68c9 100644 --- a/themes/atom-dark-ui/editor.css +++ b/themes/atom-dark-ui/editor.css @@ -1,7 +1,7 @@ .editor.mini { 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); + border-bottom: 1px solid rgba(180, 180, 180, 0.1); + border-right: 1px solid rgba(180, 180, 180, 0.1); } .editor .gutter.drop-shadow { diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 235e604ff..2de49745b 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -1,5 +1,5 @@ .select-list ol li { - background-color: #292929; + background-color: #27292b; border-bottom: 1px solid #1e1e1e; } From efa31b82fac18c9edd41e4d1046256a7b951c1bb Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 16:26:13 -0800 Subject: [PATCH 6/7] adjust command panel colors --- themes/atom-dark-ui/command-panel.css | 10 +++++----- themes/atom-dark-ui/editor.css | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css index f3e8412cd..41a8343e7 100644 --- a/themes/atom-dark-ui/command-panel.css +++ b/themes/atom-dark-ui/command-panel.css @@ -1,15 +1,15 @@ .command-panel { - background-color: #303030; - border: 1px solid #252525; + background-color: #1b1c1e; + border: 1px solid rgba(255, 255, 255, 0.05); color: #dedede; } .command-panel .preview-list { - background-color: #1e1e1e; + background-color: #19191b; color: #C5C8C6; border: 1px solid rgba(0, 0, 0, 0.5); - border-bottom: 1px solid rgba(180, 180, 180, 0.2); - border-right: 1px solid rgba(180, 180, 180, 0.2); + border-bottom: 1px solid rgba(255, 255, 255, 0.05); + border-right: 1px solid rgba(255, 255, 255, 0.05); } .command-panel .preview-count { diff --git a/themes/atom-dark-ui/editor.css b/themes/atom-dark-ui/editor.css index 988ce68c9..27c26d81b 100644 --- a/themes/atom-dark-ui/editor.css +++ b/themes/atom-dark-ui/editor.css @@ -1,7 +1,7 @@ .editor.mini { - border: 1px solid rgba(0, 0, 0, 0.2); - border-bottom: 1px solid rgba(180, 180, 180, 0.1); - border-right: 1px solid rgba(180, 180, 180, 0.1); + border: 1px solid rgba(0, 0, 0, 0.5); + border-bottom: 1px solid rgba(255, 255, 255, 0.05); + border-right: 1px solid rgba(255, 255, 255, 0.05); } .editor .gutter.drop-shadow { From 6395f352d6f468116c81c16b401982f0bcbb3a76 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Wed, 6 Feb 2013 17:13:50 -0800 Subject: [PATCH 7/7] adjust position of command panel stats --- static/command-panel.css | 8 ++++++-- themes/atom-dark-ui/command-panel.css | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/static/command-panel.css b/static/command-panel.css index 5f10228c4..3fa292585 100644 --- a/static/command-panel.css +++ b/static/command-panel.css @@ -1,11 +1,12 @@ .command-panel { padding: 5px; + position: relative; } .command-panel .preview-list { max-height: 300px; overflow: auto; - margin: 0 1px 5px 10px; + margin: 10px 0 10px 10px; position: relative; cursor: default; } @@ -13,7 +14,10 @@ .command-panel .preview-count { font-size: 11px; text-align: right; - padding-bottom: 1px; + position: absolute; + right: 15px; + top: 24px; + z-index: 9999; } .command-panel .preview-list .path { diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css index 41a8343e7..f2c6648ba 100644 --- a/themes/atom-dark-ui/command-panel.css +++ b/themes/atom-dark-ui/command-panel.css @@ -1,7 +1,9 @@ .command-panel { background-color: #1b1c1e; - border: 1px solid rgba(255, 255, 255, 0.05); color: #dedede; + border-top: 1px solid rgba(0, 0, 0, 0.5); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05); + padding: 10px; } .command-panel .preview-list { @@ -14,6 +16,9 @@ .command-panel .preview-count { color: #969696; + background: #161719; + padding: 5px; + border-radius: 3px; } .command-panel .preview-list li.selected, .command-panel .preview-list li.operation:hover {