From d55e5e25b474aa7a87fd539b6816d48f1664eb2e Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Fri, 1 Feb 2013 15:28:30 -0800 Subject: [PATCH 01/70] kill go-to-line editor style, it's defined elsewhere. --- themes/atom-dark-ui/go-to-line.css | 5 ----- themes/atom-light-ui/go-to-line.css | 5 ----- 2 files changed, 10 deletions(-) diff --git a/themes/atom-dark-ui/go-to-line.css b/themes/atom-dark-ui/go-to-line.css index 4ceec81aa..c1e5ad04e 100644 --- a/themes/atom-dark-ui/go-to-line.css +++ b/themes/atom-dark-ui/go-to-line.css @@ -16,11 +16,6 @@ cursor: pointer; } -.go-to-line .editor { - box-sizing: border-box; - padding: 5px; -} - .go-to-line .message { padding-top: 2px; font-size: 11px; diff --git a/themes/atom-light-ui/go-to-line.css b/themes/atom-light-ui/go-to-line.css index 9f6c3ec8b..70430ddea 100644 --- a/themes/atom-light-ui/go-to-line.css +++ b/themes/atom-light-ui/go-to-line.css @@ -16,11 +16,6 @@ cursor: pointer; } -.go-to-line .editor { - box-sizing: border-box; - padding: 5px; -} - .go-to-line .message { padding-top: 2px; font-size: 11px; From 62e4abf4a05a07fd4691450a8a682f6ea18945bf Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Fri, 1 Feb 2013 15:42:36 -0800 Subject: [PATCH 02/70] generic popover-list class --- src/packages/autocomplete/src/autocomplete-view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/autocomplete/src/autocomplete-view.coffee b/src/packages/autocomplete/src/autocomplete-view.coffee index 1e071ccf3..e77037cd4 100644 --- a/src/packages/autocomplete/src/autocomplete-view.coffee +++ b/src/packages/autocomplete/src/autocomplete-view.coffee @@ -8,7 +8,7 @@ class AutocompleteView extends SelectList rootView.eachEditor (editor) -> new AutocompleteView(editor) if editor.attached and not editor.mini - @viewClass: -> "autocomplete #{super}" + @viewClass: -> "autocomplete #{super} popover-list" editor: null currentBuffer: null From fc6a26c5f14950deaf936e63d736d64bc0c4d159 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Fri, 1 Feb 2013 15:42:51 -0800 Subject: [PATCH 03/70] rename autocomplete css --- themes/atom-dark-ui/{autocomplete.css => popover-list.css} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename themes/atom-dark-ui/{autocomplete.css => popover-list.css} (76%) diff --git a/themes/atom-dark-ui/autocomplete.css b/themes/atom-dark-ui/popover-list.css similarity index 76% rename from themes/atom-dark-ui/autocomplete.css rename to themes/atom-dark-ui/popover-list.css index 290713336..c719d887f 100644 --- a/themes/atom-dark-ui/autocomplete.css +++ b/themes/atom-dark-ui/popover-list.css @@ -1,4 +1,4 @@ -.select-list.autocomplete { +.select-list.popover-list { min-width: 150px; border: 2px solid #222; webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); @@ -6,12 +6,12 @@ width: auto; } -.autocomplete ol { +.popover-list ol { position: relative; overflow-y: scroll; max-height: 200px; } -.autocomplete ol li { +.popover-list ol li { padding: 0.1em 0.2em; } From b64893f9f25cc16f3c6f456a04f810fc8f59d5c0 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Fri, 1 Feb 2013 15:43:17 -0800 Subject: [PATCH 04/70] rename autocomplete to popover-list in package.json files --- themes/atom-dark-ui/package.json | 2 +- themes/atom-light-ui/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 28f90e051..05804295a 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -14,7 +14,7 @@ "command-panel.css", "command-palette.css", "command-logger.css", - "autocomplete.css", + "popover-list.css", "gists.css", "go-to-line.css" ] diff --git a/themes/atom-light-ui/package.json b/themes/atom-light-ui/package.json index 28f90e051..05804295a 100644 --- a/themes/atom-light-ui/package.json +++ b/themes/atom-light-ui/package.json @@ -14,7 +14,7 @@ "command-panel.css", "command-palette.css", "command-logger.css", - "autocomplete.css", + "popover-list.css", "gists.css", "go-to-line.css" ] From 668c66fbe5ed65ceeef1ad88159bc345e032791d Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Fri, 1 Feb 2013 15:44:29 -0800 Subject: [PATCH 05/70] rename autocomplet in ui light --- themes/atom-light-ui/{autocomplete.css => popover-list.css} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename themes/atom-light-ui/{autocomplete.css => popover-list.css} (74%) diff --git a/themes/atom-light-ui/autocomplete.css b/themes/atom-light-ui/popover-list.css similarity index 74% rename from themes/atom-light-ui/autocomplete.css rename to themes/atom-light-ui/popover-list.css index c121407d0..7dd7f60b1 100644 --- a/themes/atom-light-ui/autocomplete.css +++ b/themes/atom-light-ui/popover-list.css @@ -1,16 +1,16 @@ -.select-list.autocomplete { +.select-list.popover-list { min-width: 150px; webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .5); margin-left: 0px; width: auto; } -.autocomplete ol { +.popover-list ol { position: relative; overflow-y: scroll; max-height: 200px; } -.autocomplete ol li { +.popover-list ol li { padding: 0.1em 0.2em; } From f46b4779b5241b992132fa1db9483e7f8b94f505 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 13:44:08 -0800 Subject: [PATCH 06/70] add overlay styles Any element that appears from the edge of the editor --- themes/atom-dark-ui/overlay.css | 20 ++++++++++++++++++++ themes/atom-dark-ui/package.json | 1 + 2 files changed, 21 insertions(+) create mode 100644 themes/atom-dark-ui/overlay.css diff --git a/themes/atom-dark-ui/overlay.css b/themes/atom-dark-ui/overlay.css new file mode 100644 index 000000000..02609a457 --- /dev/null +++ b/themes/atom-dark-ui/overlay.css @@ -0,0 +1,20 @@ +.overlay { + position: absolute; + top: 0; + left: 50%; + width: 400px; + margin-left: -200px; + background: #1e1e1e; + color: #eee; + padding: 10px; + z-index: 9999; + box-sizing: border-box; + border: 1px solid rgba(255, 255, 255, 0.1); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); + border-radius: 3px; +} + +.overlay.mini { + width: 200px; + margin-left: -100px; +} \ No newline at end of file diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 05804295a..03861788c 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -6,6 +6,7 @@ "select-list.css", "tree-view.css", "tabs.css", + "overlay.css", "wrap-guide.css", "status-bar.css", "symbols-view.css", From 867f577a52820c08aedd237f17433d9a6cda8174 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 13:51:20 -0800 Subject: [PATCH 07/70] add type and direction to go-to-line overlay --- src/packages/go-to-line/lib/go-to-line-view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/go-to-line/lib/go-to-line-view.coffee b/src/packages/go-to-line/lib/go-to-line-view.coffee index ce99ece31..f207e11eb 100644 --- a/src/packages/go-to-line/lib/go-to-line-view.coffee +++ b/src/packages/go-to-line/lib/go-to-line-view.coffee @@ -9,7 +9,7 @@ class GoToLineView extends View @activate: (rootView) -> new GoToLineView(rootView) @content: -> - @div class: 'go-to-line', => + @div class: 'go-to-line overlay from-top mini', => @subview 'miniEditor', new Editor(mini: true) @div class: 'message', outlet: 'message' From 3e2edc620a222a388b50da9bcab73e1d0d1cf337 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 13:51:33 -0800 Subject: [PATCH 08/70] kill go-to-line css in atom-ui-dark --- themes/atom-dark-ui/go-to-line.css | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 themes/atom-dark-ui/go-to-line.css diff --git a/themes/atom-dark-ui/go-to-line.css b/themes/atom-dark-ui/go-to-line.css deleted file mode 100644 index c1e5ad04e..000000000 --- a/themes/atom-dark-ui/go-to-line.css +++ /dev/null @@ -1,22 +0,0 @@ -.go-to-line { - position: absolute; - width: 200px; - top: 0; - left: 50%; - margin-left: -100px; - box-sizing: border-box; - z-index: 99; - background-color: #484848; - border: 1px solid #444; - color: #d2d2d2; - box-shadow: 0 0 10px #000; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - padding: 5px; - cursor: pointer; -} - -.go-to-line .message { - padding-top: 2px; - font-size: 11px; -} From f52d27cec52ecf156b4ac56c7fa2db501b2b4adc Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 13:51:44 -0800 Subject: [PATCH 09/70] remove go-to-line in package.json --- themes/atom-dark-ui/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 03861788c..e518e4a69 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -16,7 +16,6 @@ "command-palette.css", "command-logger.css", "popover-list.css", - "gists.css", - "go-to-line.css" + "gists.css" ] } From e8e52d53c18183137ab63f9f46d900038fe94075 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 13:52:09 -0800 Subject: [PATCH 10/70] add message and directional styles directional styles are needed to determine where borders are drawn. --- themes/atom-dark-ui/overlay.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/themes/atom-dark-ui/overlay.css b/themes/atom-dark-ui/overlay.css index 02609a457..0773efba8 100644 --- a/themes/atom-dark-ui/overlay.css +++ b/themes/atom-dark-ui/overlay.css @@ -14,7 +14,18 @@ border-radius: 3px; } +.overlay .message { + padding-top: 5px; + font-size: 11px; +} + .overlay.mini { width: 200px; margin-left: -100px; +} + +.overlay.from-top { + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0; } \ No newline at end of file From 89c64e273cae6002512cc6db8ea1c6e384e0b455 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:01:52 -0800 Subject: [PATCH 11/70] account for empty select lists --- themes/atom-dark-ui/select-list.css | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index b0ffac596..68d1621ee 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -1,18 +1,12 @@ -.select-list { - background-color: #303030; - border: 1px solid #404040; - color: #d2d2d2; - box-shadow: 0 0 10px #000; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - padding: 5px; - cursor: pointer; -} - .select-list ol { border: 1px solid #212121; } +.select-list ol:empty { + margin-bottom: 0; + border: none; +} + .select-list ol li { background-color: #292929; border-bottom: 1px solid #1e1e1e; From 960f4f2111c62bf38b6930260f579a7afa423dda Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:02:05 -0800 Subject: [PATCH 12/70] make the overlay 500px by default --- themes/atom-dark-ui/overlay.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/atom-dark-ui/overlay.css b/themes/atom-dark-ui/overlay.css index 0773efba8..8b44a76b3 100644 --- a/themes/atom-dark-ui/overlay.css +++ b/themes/atom-dark-ui/overlay.css @@ -2,9 +2,9 @@ position: absolute; top: 0; left: 50%; - width: 400px; - margin-left: -200px; - background: #1e1e1e; + width: 500px; + margin-left: -250px; + background: #303030; color: #eee; padding: 10px; z-index: 9999; From 542753275ffa46af690a142ba827d6cb9ff239e5 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:02:28 -0800 Subject: [PATCH 13/70] reuse overlay styles for fuzzy finder --- .../fuzzy-finder/src/fuzzy-finder-view.coffee | 2 +- themes/atom-dark-ui/fuzzy-finder.css | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee index 2365fc4d7..c2637c6be 100644 --- a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee @@ -12,7 +12,7 @@ class FuzzyFinderView extends SelectList @instance = new FuzzyFinderView(rootView) @viewClass: -> - [super, 'fuzzy-finder'].join(' ') + [super, 'fuzzy-finder', 'overlay', 'from-top'].join(' ') allowActiveEditorChange: null maxItems: 10 diff --git a/themes/atom-dark-ui/fuzzy-finder.css b/themes/atom-dark-ui/fuzzy-finder.css index 3d0218083..b3332a581 100644 --- a/themes/atom-dark-ui/fuzzy-finder.css +++ b/themes/atom-dark-ui/fuzzy-finder.css @@ -1,14 +1,3 @@ -.fuzzy-finder ol { - overflow: hidden; - -webkit-user-select: none; - cursor: default; -} - -.fuzzy-finder ol:empty { - margin-bottom: 0; - border: none; -} - .fuzzy-finder .directory { color: #b2b2b2; padding-left: .5em; From 918b3130cb482c3c5f12619a5515263d5931b174 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:07:14 -0800 Subject: [PATCH 14/70] use overlay styles for command pallete --- .../command-palette/src/command-palette-view.coffee | 2 +- themes/atom-dark-ui/command-palette.css | 13 ------------- themes/atom-dark-ui/select-list.css | 4 ++++ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/packages/command-palette/src/command-palette-view.coffee b/src/packages/command-palette/src/command-palette-view.coffee index d723afa54..e5d2ab5ce 100644 --- a/src/packages/command-palette/src/command-palette-view.coffee +++ b/src/packages/command-palette/src/command-palette-view.coffee @@ -9,7 +9,7 @@ class CommandPaletteView extends SelectList @instance = new CommandPaletteView(rootView) @viewClass: -> - "#{super} command-palette" + "#{super} command-palette overlay from-top" filterKey: 'eventDescription' diff --git a/themes/atom-dark-ui/command-palette.css b/themes/atom-dark-ui/command-palette.css index 0cadfbcae..8c19751c8 100644 --- a/themes/atom-dark-ui/command-palette.css +++ b/themes/atom-dark-ui/command-palette.css @@ -1,12 +1,3 @@ -.command-palette { - width: 50%; - margin-left: -25%; -} - -.command-palette ol { - max-height: 300px; -} - .command-palette ol .event-description { float: left; display: inline-block; @@ -14,10 +5,6 @@ margin: 4px 0; } -.command-palette li .right { - float: right; -} - .command-palette ol .event-name, .command-palette ol .key-binding { display: inline-block; margin: 4px 0; diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 68d1621ee..107a1f3df 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -13,6 +13,10 @@ padding: 5px; } +.select-list li .right { + float: right; +} + .select-list ol li:last-child { border-bottom: none; } From c2f030e99c40cf411579aaa82545b8b2cc113c6d Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:18:09 -0800 Subject: [PATCH 15/70] use generic label class for select lists labels --- .../command-palette/src/command-palette-view.coffee | 2 +- themes/atom-dark-ui/command-palette.css | 2 +- themes/atom-dark-ui/select-list.css | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/packages/command-palette/src/command-palette-view.coffee b/src/packages/command-palette/src/command-palette-view.coffee index e5d2ab5ce..7e3cc5456 100644 --- a/src/packages/command-palette/src/command-palette-view.coffee +++ b/src/packages/command-palette/src/command-palette-view.coffee @@ -43,7 +43,7 @@ class CommandPaletteView extends SelectList @li class: 'event', 'data-event-name': eventName, => @div eventDescription, class: 'event-description' @div class: 'right', => - @div eventName, class: 'event-name' + @div eventName, class: 'label' for binding in keyBindings[eventName] ? [] @div binding, class: 'key-binding' @div class: 'clear-float' diff --git a/themes/atom-dark-ui/command-palette.css b/themes/atom-dark-ui/command-palette.css index 8c19751c8..e45458a41 100644 --- a/themes/atom-dark-ui/command-palette.css +++ b/themes/atom-dark-ui/command-palette.css @@ -5,7 +5,7 @@ margin: 4px 0; } -.command-palette ol .event-name, .command-palette ol .key-binding { +.command-palette ol .key-binding { display: inline-block; margin: 4px 0; margin-right: .5em; diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 107a1f3df..305e27066 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -13,6 +13,16 @@ padding: 5px; } +.select-list li .label { + display: inline-block; + margin: 4px 0; + margin-right: .5em; + font-size: 90%; + color: #ddd; + -webkit-border-radius: 3px; + padding: 0 4px; +} + .select-list li .right { float: right; } From 2ecf1d234ee9be7d63d61cac84356a373973d521 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:20:36 -0800 Subject: [PATCH 16/70] reuse classes for symbol list --- src/packages/symbols-view/src/symbols-view.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/symbols-view/src/symbols-view.coffee b/src/packages/symbols-view/src/symbols-view.coffee index c0d019132..a78057230 100644 --- a/src/packages/symbols-view/src/symbols-view.coffee +++ b/src/packages/symbols-view/src/symbols-view.coffee @@ -12,7 +12,7 @@ class SymbolsView extends SelectList @activate: (rootView) -> @instance = new SymbolsView(rootView) - @viewClass: -> "#{super} symbols-view" + @viewClass: -> "#{super} symbols-view overlay from-top" filterKey: 'name' @@ -22,7 +22,7 @@ class SymbolsView extends SelectList itemForElement: ({position, name, file}) -> $$ -> @li => - @div name, class: 'function-name' + @div name, class: 'label' @div class: 'right', => if position text = "Line #{position.row + 1}" From 9f7a71fcda7cd8e567a72ddaf7cc5a35bfcd02bf Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:21:15 -0800 Subject: [PATCH 17/70] :skull: symbols-view css --- themes/atom-dark-ui/package.json | 1 - themes/atom-dark-ui/symbols-view.css | 35 ---------------------------- 2 files changed, 36 deletions(-) delete mode 100644 themes/atom-dark-ui/symbols-view.css diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index e518e4a69..eceecbcd5 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -9,7 +9,6 @@ "overlay.css", "wrap-guide.css", "status-bar.css", - "symbols-view.css", "markdown-preview.css", "fuzzy-finder.css", "command-panel.css", diff --git a/themes/atom-dark-ui/symbols-view.css b/themes/atom-dark-ui/symbols-view.css deleted file mode 100644 index 0cbdbfa53..000000000 --- a/themes/atom-dark-ui/symbols-view.css +++ /dev/null @@ -1,35 +0,0 @@ -.symbols-view { - width: 50%; - margin-left: -25%; -} - -.symbols-view ol { - max-height: 300px; -} - -.symbols-view ol li { - padding: 2px; - border-bottom: 1px solid rgba(255, 255, 255, .05); -} - -.symbols-view ol .function-name { - float: left; - display: inline-block; - margin-right: .5em; - margin: 4px 0; -} - -.symbols-view li .right { - float: right; -} - -.symbols-view ol .function-details { - display: inline-block; - margin: 4px 0; - margin-right: .5em; - font-size: 90%; - color: #ddd; - -webkit-border-radius: 3px; - padding: 0 4px; - background: rgba(0, 0, 0, .2); -} From fe77f1d77e6fc1645ae8af5cafd765c2a877bf63 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sat, 2 Feb 2013 14:26:51 -0800 Subject: [PATCH 18/70] make sure we keep the height sane --- themes/atom-dark-ui/select-list.css | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 305e27066..1d372a419 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -1,5 +1,6 @@ .select-list ol { border: 1px solid #212121; + max-height: 300px; } .select-list ol:empty { From 780357a1f5facca39415d8d6282bc4cb56b6dec3 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:25:23 -0800 Subject: [PATCH 19/70] use kbd element for keyboard binding --- src/packages/command-palette/src/command-palette-view.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/packages/command-palette/src/command-palette-view.coffee b/src/packages/command-palette/src/command-palette-view.coffee index 7e3cc5456..f2a507cac 100644 --- a/src/packages/command-palette/src/command-palette-view.coffee +++ b/src/packages/command-palette/src/command-palette-view.coffee @@ -45,8 +45,7 @@ class CommandPaletteView extends SelectList @div class: 'right', => @div eventName, class: 'label' for binding in keyBindings[eventName] ? [] - @div binding, class: 'key-binding' - @div class: 'clear-float' + @kbd binding, class: 'key-binding' confirmed: ({eventName}) -> @cancel() From 8e4abb9ca7dd4c09874e27295d477a038d943c51 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:26:18 -0800 Subject: [PATCH 20/70] move key bindings to select list styles I anticipate other lists will want to show keyboard bindings --- themes/atom-dark-ui/command-palette.css | 14 -------------- themes/atom-dark-ui/select-list.css | 25 ++++++++++++++++++++----- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/themes/atom-dark-ui/command-palette.css b/themes/atom-dark-ui/command-palette.css index e45458a41..8445dc1e8 100644 --- a/themes/atom-dark-ui/command-palette.css +++ b/themes/atom-dark-ui/command-palette.css @@ -5,20 +5,6 @@ margin: 4px 0; } -.command-palette ol .key-binding { - display: inline-block; - margin: 4px 0; - margin-right: .5em; - font-size: 90%; - color: #ddd; - -webkit-border-radius: 3px; - padding: 0 4px; -} - .command-palette ol .event-name { background: rgba(0, 0, 0, .2); } - -.command-palette ol .key-binding { - background: rgba(255, 255, 255, .1); -} diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 1d372a419..a7c9d65dd 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -14,20 +14,35 @@ padding: 5px; } +.select-list ol li:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + height: 0; +} + .select-list li .label { display: inline-block; - margin: 4px 0; - margin-right: .5em; - font-size: 90%; color: #ddd; - -webkit-border-radius: 3px; - padding: 0 4px; } .select-list li .right { float: right; } +.select-list .key-binding { + float: right; + background: -webkit-linear-gradient( + rgba(0, 0, 0, 1), + rgba(0,0,0, 0.5)); + color: #ccc; + border-radius: 2px; + margin-left: 5px; + padding: 2px 5px; + font-size: 11px; +} + .select-list ol li:last-child { border-bottom: none; } From 138a68c579925b7d9d9ce10b9f7e6beabf0e5af6 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:31:48 -0800 Subject: [PATCH 21/70] buttonish styles for kbd elements --- themes/atom-dark-ui/select-list.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index a7c9d65dd..70a20a637 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -34,13 +34,14 @@ .select-list .key-binding { float: right; background: -webkit-linear-gradient( - rgba(0, 0, 0, 1), - rgba(0,0,0, 0.5)); + rgba(100, 100, 100, 0.5), + rgba(70,70,70, 0.5)); color: #ccc; border-radius: 2px; margin-left: 5px; - padding: 2px 5px; + padding: 3px; font-size: 11px; + -webkit-box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.1); } .select-list ol li:last-child { From b1cbc3b0ada8bfbbb427a4a5d7a35185ad64d283 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:52:25 -0800 Subject: [PATCH 22/70] move event name to title attribute This was causing a bit of a headache because the event names could be really really long. They're also not useful for everyday use, but for package authors, so lets make them less prominent. --- src/packages/command-palette/src/command-palette-view.coffee | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/packages/command-palette/src/command-palette-view.coffee b/src/packages/command-palette/src/command-palette-view.coffee index f2a507cac..90c083d0d 100644 --- a/src/packages/command-palette/src/command-palette-view.coffee +++ b/src/packages/command-palette/src/command-palette-view.coffee @@ -41,9 +41,8 @@ class CommandPaletteView extends SelectList keyBindings = @keyBindings $$ -> @li class: 'event', 'data-event-name': eventName, => - @div eventDescription, class: 'event-description' + @span eventDescription, class: 'label', title: eventName @div class: 'right', => - @div eventName, class: 'label' for binding in keyBindings[eventName] ? [] @kbd binding, class: 'key-binding' From d7f6d0e0d1d3d4b9c7116298a70a48176977a787 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:54:02 -0800 Subject: [PATCH 23/70] tweak select list styles --- themes/atom-dark-ui/select-list.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 70a20a637..da27e8e0a 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -11,7 +11,7 @@ .select-list ol li { background-color: #292929; border-bottom: 1px solid #1e1e1e; - padding: 5px; + padding: 10px; } .select-list ol li:after { @@ -29,10 +29,12 @@ .select-list li .right { float: right; + font-size: 11px; + font-family: courier; + color: #999; } .select-list .key-binding { - float: right; background: -webkit-linear-gradient( rgba(100, 100, 100, 0.5), rgba(70,70,70, 0.5)); From 7004452c9f49eb84b12b965a667489732a953398 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:54:34 -0800 Subject: [PATCH 24/70] remove command-pallete css. It's part of select-list. --- themes/atom-dark-ui/command-palette.css | 10 ---------- themes/atom-dark-ui/package.json | 1 - 2 files changed, 11 deletions(-) delete mode 100644 themes/atom-dark-ui/command-palette.css diff --git a/themes/atom-dark-ui/command-palette.css b/themes/atom-dark-ui/command-palette.css deleted file mode 100644 index 8445dc1e8..000000000 --- a/themes/atom-dark-ui/command-palette.css +++ /dev/null @@ -1,10 +0,0 @@ -.command-palette ol .event-description { - float: left; - display: inline-block; - margin-right: .5em; - margin: 4px 0; -} - -.command-palette ol .event-name { - background: rgba(0, 0, 0, .2); -} diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index eceecbcd5..0b409b555 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -12,7 +12,6 @@ "markdown-preview.css", "fuzzy-finder.css", "command-panel.css", - "command-palette.css", "command-logger.css", "popover-list.css", "gists.css" From e7edf364462e2801813e1a8e36f3af32864a8428 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 07:56:42 -0800 Subject: [PATCH 25/70] move wrap-guide to atom.css --- themes/atom-dark-ui/atom.css | 4 ++++ themes/atom-dark-ui/package.json | 1 - themes/atom-dark-ui/wrap-guide.css | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 themes/atom-dark-ui/wrap-guide.css diff --git a/themes/atom-dark-ui/atom.css b/themes/atom-dark-ui/atom.css index 73a667189..03c1f5992 100644 --- a/themes/atom-dark-ui/atom.css +++ b/themes/atom-dark-ui/atom.css @@ -21,6 +21,10 @@ html, body, -webkit-transition: background 300ms ease-out; } +.wrap-guide { + background: rgba(150, 150, 150, 0.1); +} + .clear-float { clear: both; } diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 0b409b555..44ad9287f 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -7,7 +7,6 @@ "tree-view.css", "tabs.css", "overlay.css", - "wrap-guide.css", "status-bar.css", "markdown-preview.css", "fuzzy-finder.css", diff --git a/themes/atom-dark-ui/wrap-guide.css b/themes/atom-dark-ui/wrap-guide.css deleted file mode 100644 index 8e7837e5d..000000000 --- a/themes/atom-dark-ui/wrap-guide.css +++ /dev/null @@ -1,3 +0,0 @@ -.wrap-guide { - background: rgba(150, 150, 150, 0.1); -} From b2dea312b10a7e5c5d3a58aff55d719877ef7540 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 08:33:58 -0800 Subject: [PATCH 26/70] create generic notification style, kill gists.css --- themes/atom-dark-ui/gists.css | 35 ----------------- themes/atom-dark-ui/notification.css | 57 ++++++++++++++++++++++++++++ themes/atom-dark-ui/package.json | 2 +- 3 files changed, 58 insertions(+), 36 deletions(-) delete mode 100644 themes/atom-dark-ui/gists.css create mode 100644 themes/atom-dark-ui/notification.css diff --git a/themes/atom-dark-ui/gists.css b/themes/atom-dark-ui/gists.css deleted file mode 100644 index dde2dbd25..000000000 --- a/themes/atom-dark-ui/gists.css +++ /dev/null @@ -1,35 +0,0 @@ -.gist-notification { - position: absolute; - top: 6px; - left: 50%; - margin-left: -5%; - z-index: 99; - padding-left: 5px; - padding-right: 10px; - -webkit-box-shadow: 0px 0px 5px 5px #222; - color: #BBB; - background-color: #333; -} - -.gist-notification .message-area { - float: right; - padding-top: 11px; -} - -.gist-notification .message { - font-size: 13px; -} - -.gist-notification .clipboard { - font-size: 11px; -} - -.gist-notification:before { - font-family: 'Octicons Regular'; - font-size: 32px; - width: 32px; - height: 32px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - content: "\f08c"; -} diff --git a/themes/atom-dark-ui/notification.css b/themes/atom-dark-ui/notification.css new file mode 100644 index 000000000..53ac32339 --- /dev/null +++ b/themes/atom-dark-ui/notification.css @@ -0,0 +1,57 @@ +.notification { + position: absolute; + top: 40px; + left: 50%; + margin-left: -5%; + z-index: 9999; + border: 2px solid rgba(0, 0, 0, 0.2); + border-radius: 5px; + box-shadow: + inset 1px 1px 0 rgba(255, 255, 255, 0.05), + 0 0 5px rgba(0, 0, 0, 0.5); + background: -webkit-linear-gradient( + rgba(20, 20, 20, 0.5), + rgba(0, 0, 0, 0.5)); + color: #eee; + width: 300px; +} + +.notification .content { + padding: 10px; + margin-left: 42px; + box-sizing: border-box; +} + +.notification .content:after { + content: "."; + display: block; + clear: both; + visibility: hidden; +} + +.notification .title { + font-size: 12px; + font-weight: bold; + margin-bottom: 3px; +} + +.notification .message { + font-size: 12px; + color: #777; +} + +.notification .icon { + display: inline-block; + float: left; + font-family: 'Octicons Regular'; + font-size: 32px; + width: 32px; + height: 32px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; +} + +/* TODO: Full Octicon Support */ +.icon-gist { + content: "\f20e"; +} diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 44ad9287f..66ac928c9 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -13,6 +13,6 @@ "command-panel.css", "command-logger.css", "popover-list.css", - "gists.css" + "notification.css" ] } From f33132e75c99d7aaaa61824d5edc1a66d70d2d55 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 08:34:07 -0800 Subject: [PATCH 27/70] use notification class names --- src/packages/gists/lib/gists.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/packages/gists/lib/gists.coffee b/src/packages/gists/lib/gists.coffee index 434603636..b46e5beab 100644 --- a/src/packages/gists/lib/gists.coffee +++ b/src/packages/gists/lib/gists.coffee @@ -22,10 +22,10 @@ class Gists success: (response) => pasteboard.write(response.html_url) notification = $$ -> - @div class: 'gist-notification', => - @div class: 'message-area', => - @span "Gist #{response.id} created", class: 'message' - @br() - @span "The url is on your clipboard", class: 'clipboard' + @div class: 'notification', => + @span class: 'icon icon-gist mega-icon' + @div class: 'content', => + @h3 "Gist #{response.id} created", class: 'title' + @p "The url is on your clipboard", class: 'message' @rootView.append(notification.hide()) notification.fadeIn().delay(2000).fadeOut(complete: -> $(this).remove()) From 0a8245435caa01df1f7515e19f94c724b57f79e3 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 14:25:15 -0800 Subject: [PATCH 28/70] fix fuzzy finder directory styles --- src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee | 4 ++-- themes/atom-dark-ui/fuzzy-finder.css | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee index c2637c6be..98fb1a7b2 100644 --- a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee @@ -46,9 +46,9 @@ class FuzzyFinderView extends SelectList typeClass = 'pdf-name' else typeClass = 'text-name' - @span fs.base(path), class: "file #{typeClass}" + @span fs.base(path), class: "file label #{typeClass}" if folder = fs.directory(path) - @span "- #{folder}/", class: 'directory' + @span "#{folder}/", class: 'directory' openPath: (path) -> @rootView.open(path, {@allowActiveEditorChange}) if path diff --git a/themes/atom-dark-ui/fuzzy-finder.css b/themes/atom-dark-ui/fuzzy-finder.css index b3332a581..ccd37c1d4 100644 --- a/themes/atom-dark-ui/fuzzy-finder.css +++ b/themes/atom-dark-ui/fuzzy-finder.css @@ -1,6 +1,8 @@ .fuzzy-finder .directory { - color: #b2b2b2; - padding-left: .5em; + color: rgba(255, 255, 255, 0.4); + word-break: break-word; + display: block; + margin-left: 28px; } .fuzzy-finder .file:before { From 44d4efdc10895b759ae7dc459947d28ae1412e31 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 14:33:54 -0800 Subject: [PATCH 29/70] move common overlay and popover css to static directory --- src/app/window.coffee | 2 ++ {themes/atom-dark-ui => static}/overlay.css | 0 {themes/atom-dark-ui => static}/popover-list.css | 0 themes/atom-dark-ui/package.json | 2 -- 4 files changed, 2 insertions(+), 2 deletions(-) rename {themes/atom-dark-ui => static}/overlay.css (100%) rename {themes/atom-dark-ui => static}/popover-list.css (100%) diff --git a/src/app/window.coffee b/src/app/window.coffee index d990b28a4..d93d62a52 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -112,6 +112,8 @@ window.startup() requireStylesheet 'reset.css' requireStylesheet 'atom.css' +requireStylesheet 'overlay.css' +requireStylesheet 'popover-list.css' if nativeStylesheetPath = require.resolve("#{platform}.css") requireStylesheet(nativeStylesheetPath) diff --git a/themes/atom-dark-ui/overlay.css b/static/overlay.css similarity index 100% rename from themes/atom-dark-ui/overlay.css rename to static/overlay.css diff --git a/themes/atom-dark-ui/popover-list.css b/static/popover-list.css similarity index 100% rename from themes/atom-dark-ui/popover-list.css rename to static/popover-list.css diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 66ac928c9..b685603d9 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -6,13 +6,11 @@ "select-list.css", "tree-view.css", "tabs.css", - "overlay.css", "status-bar.css", "markdown-preview.css", "fuzzy-finder.css", "command-panel.css", "command-logger.css", - "popover-list.css", "notification.css" ] } From 908c9245fdfeb91a4c0057fba2de6b116fac07f9 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 14:35:52 -0800 Subject: [PATCH 30/70] move @font-face into default atom.css --- static/atom.css | 7 +++++++ themes/atom-dark-ui/atom.css | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/static/atom.css b/static/atom.css index 4f70a0574..382352314 100644 --- a/static/atom.css +++ b/static/atom.css @@ -53,4 +53,11 @@ html, body { left: 0; right: 0; box-sizing: border-box; +} + +@font-face { + font-family: 'Octicons Regular'; + src: url("octicons-regular-webfont.woff") format("woff"); + font-weight: normal; + font-style: normal; } \ No newline at end of file diff --git a/themes/atom-dark-ui/atom.css b/themes/atom-dark-ui/atom.css index 03c1f5992..ad3d6998e 100644 --- a/themes/atom-dark-ui/atom.css +++ b/themes/atom-dark-ui/atom.css @@ -28,10 +28,3 @@ html, body, .clear-float { clear: both; } - -@font-face { - font-family: 'Octicons Regular'; - src: url("octicons-regular-webfont.woff") format("woff"); - font-weight: normal; - font-style: normal; -} From 544743e95e995318f18da440a6a020a4c8870e42 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 14:36:45 -0800 Subject: [PATCH 31/70] kill @font-face from atom-light-ui while I'm here --- themes/atom-light-ui/atom.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/themes/atom-light-ui/atom.css b/themes/atom-light-ui/atom.css index 544df9367..18128215f 100644 --- a/themes/atom-light-ui/atom.css +++ b/themes/atom-light-ui/atom.css @@ -24,10 +24,3 @@ html, body, .clear-float { clear: both; } - -@font-face { - font-family: 'Octicons Regular'; - src: url("octicons-regular-webfont.woff") format("woff"); - font-weight: normal; - font-style: normal; -} From 05b1a1a64d685c02a48df0fecd3618fb9c4ed595 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Sun, 3 Feb 2013 14:39:09 -0800 Subject: [PATCH 32/70] move notification.css to main bundle --- src/app/window.coffee | 1 + {themes/atom-dark-ui => static}/notification.css | 0 themes/atom-dark-ui/package.json | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {themes/atom-dark-ui => static}/notification.css (100%) diff --git a/src/app/window.coffee b/src/app/window.coffee index d93d62a52..d2b2c196c 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -114,6 +114,7 @@ requireStylesheet 'reset.css' requireStylesheet 'atom.css' requireStylesheet 'overlay.css' requireStylesheet 'popover-list.css' +requireStylesheet 'notification.css' if nativeStylesheetPath = require.resolve("#{platform}.css") requireStylesheet(nativeStylesheetPath) diff --git a/themes/atom-dark-ui/notification.css b/static/notification.css similarity index 100% rename from themes/atom-dark-ui/notification.css rename to static/notification.css diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index b685603d9..13d928e63 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -10,7 +10,6 @@ "markdown-preview.css", "fuzzy-finder.css", "command-panel.css", - "command-logger.css", - "notification.css" + "command-logger.css" ] } From f4aacfc23e66519a9c7381921822b1e12760b1ef Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:06:42 -0800 Subject: [PATCH 33/70] don't break the line unless we have to in the fuzzy finder --- themes/atom-dark-ui/fuzzy-finder.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/atom-dark-ui/fuzzy-finder.css b/themes/atom-dark-ui/fuzzy-finder.css index ccd37c1d4..b4d6423a1 100644 --- a/themes/atom-dark-ui/fuzzy-finder.css +++ b/themes/atom-dark-ui/fuzzy-finder.css @@ -1,8 +1,8 @@ .fuzzy-finder .directory { color: rgba(255, 255, 255, 0.4); word-break: break-word; - display: block; - margin-left: 28px; + margin-left: 5px; + line-height: 150%; } .fuzzy-finder .file:before { From 81fbb3bc935b60db7c1f1f0e3a8c12ce09edee36 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:09:47 -0800 Subject: [PATCH 34/70] kill clear-float --- src/packages/symbols-view/src/symbols-view.coffee | 1 - themes/atom-dark-ui/atom.css | 4 ---- themes/atom-light-ui/atom.css | 6 +----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/packages/symbols-view/src/symbols-view.coffee b/src/packages/symbols-view/src/symbols-view.coffee index a78057230..acf72cb78 100644 --- a/src/packages/symbols-view/src/symbols-view.coffee +++ b/src/packages/symbols-view/src/symbols-view.coffee @@ -29,7 +29,6 @@ class SymbolsView extends SelectList else text = fs.base(file) @div text, class: 'function-details' - @div class: 'clear-float' toggleFileSymbols: -> if @hasParent() diff --git a/themes/atom-dark-ui/atom.css b/themes/atom-dark-ui/atom.css index ad3d6998e..d7409130b 100644 --- a/themes/atom-dark-ui/atom.css +++ b/themes/atom-dark-ui/atom.css @@ -24,7 +24,3 @@ html, body, .wrap-guide { background: rgba(150, 150, 150, 0.1); } - -.clear-float { - clear: both; -} diff --git a/themes/atom-light-ui/atom.css b/themes/atom-light-ui/atom.css index 18128215f..78020c44b 100644 --- a/themes/atom-light-ui/atom.css +++ b/themes/atom-light-ui/atom.css @@ -19,8 +19,4 @@ html, body, .error { background: #991212 !important; -webkit-transition: background 300ms ease-out; -} - -.clear-float { - clear: both; -} +} \ No newline at end of file From ffa3518cb3cd5194c26eb204e60985cee64f3821 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:14:52 -0800 Subject: [PATCH 35/70] kill grammar-view.css, uses overlay and select list defaults --- src/app/grammar-view.coffee | 3 +-- static/grammar-view.css | 8 -------- themes/atom-dark-ui/grammar-view.css | 17 ----------------- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 static/grammar-view.css delete mode 100644 themes/atom-dark-ui/grammar-view.css diff --git a/src/app/grammar-view.coffee b/src/app/grammar-view.coffee index bd0b73251..3465c45a7 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" + @viewClass: -> "#{super} grammar-view from-top overlay" filterKey: 'name' @@ -12,7 +12,6 @@ class GrammarView extends SelectList @currentGrammar = @editor.getGrammar() @path = @editor.getPath() @autoDetect = name: 'Auto Detect' - requireStylesheet 'grammar-view.css' @command 'editor:select-grammar', => @cancel() false diff --git a/static/grammar-view.css b/static/grammar-view.css deleted file mode 100644 index 1cbeeba30..000000000 --- a/static/grammar-view.css +++ /dev/null @@ -1,8 +0,0 @@ -.grammar-view { - width: 50%; - margin-left: -25%; -} - -.grammar-view ol { - max-height: 300px; -} \ No newline at end of file diff --git a/themes/atom-dark-ui/grammar-view.css b/themes/atom-dark-ui/grammar-view.css deleted file mode 100644 index 7be94f4c0..000000000 --- a/themes/atom-dark-ui/grammar-view.css +++ /dev/null @@ -1,17 +0,0 @@ -.grammar-view ol li { - line-height: 16px; -} - -.grammar-view ol li.grammar { - padding-left: 21px; -} - -.grammar-view ol li.current-grammar:before { - font-family: 'Octicons Regular'; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - color: #ccc; - content: '\f03a'; -} From 4b9d14d2f3eed8b3c4bf3dc52fd92ca2a3056422 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:21:34 -0800 Subject: [PATCH 36/70] remove grammar-view from package.json --- themes/atom-dark-ui/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 13d928e63..19a81d24f 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -2,7 +2,6 @@ "stylesheets":[ "atom.css", "editor.css", - "grammar-view.css", "select-list.css", "tree-view.css", "tabs.css", From 065d1e8d8006f30e2a57695bacab2c7e58f4ac0b Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:21:53 -0800 Subject: [PATCH 37/70] move generic select-list styles to main bundle --- static/select-list.css | 58 ++++++++++++++++++++++------- themes/atom-dark-ui/select-list.css | 41 -------------------- 2 files changed, 45 insertions(+), 54 deletions(-) diff --git a/static/select-list.css b/static/select-list.css index f2472e3c6..651ce2a31 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -1,19 +1,51 @@ -.select-list { - position: absolute; - width: 600px; - top: 0; - left: 50%; - margin-left: -300px; - box-sizing: border-box; - z-index: 99; +.select-list ol { + border: 1px solid #212121; + max-height: 300px; + position: relative; +} + +.select-list ol:empty { + margin-bottom: 0; + border: none; +} + +.select-list ol li { + padding: 10px; +} + +.select-list ol li:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + height: 0; +} + +.select-list li .label { + display: inline-block; +} + +.select-list li .right { + color: #999; +} + +.select-list .key-binding { + border-radius: 2px; + margin-left: 5px; + padding: 3px; + font-size: 11px; +} + +.select-list ol li:last-child { + border-bottom: none; } .select-list .editor { - box-sizing: border-box; - padding: 5px; + margin-bottom: 5px; } -.select-list ol { - position: relative; - overflow-y: auto; +.select-list .error { + font-weight: bold; + color: white; + text-shadow: 0 1px 0 #4E0000; } \ No newline at end of file diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index da27e8e0a..3a1e7d9ff 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -1,36 +1,13 @@ -.select-list ol { - border: 1px solid #212121; - max-height: 300px; -} - -.select-list ol:empty { - margin-bottom: 0; - border: none; -} - .select-list ol li { background-color: #292929; border-bottom: 1px solid #1e1e1e; - padding: 10px; -} - -.select-list ol li:after { - content: "."; - display: block; - clear: both; - visibility: hidden; - height: 0; } .select-list li .label { - display: inline-block; color: #ddd; } .select-list li .right { - float: right; - font-size: 11px; - font-family: courier; color: #999; } @@ -39,31 +16,13 @@ rgba(100, 100, 100, 0.5), rgba(70,70,70, 0.5)); color: #ccc; - border-radius: 2px; - margin-left: 5px; - padding: 3px; - font-size: 11px; -webkit-box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.1); } -.select-list ol li:last-child { - border-bottom: none; -} - -.select-list .editor { - margin-bottom: 5px; -} - .select-list li:hover { background-color: #555; } .select-list ol .selected { background-image: -webkit-linear-gradient(#7e7e7e, #737373); -} - -.select-list .error { - font-weight: bold; - color: white; - text-shadow: 0 1px 0 #4E0000; } \ No newline at end of file From f64ff199d6e7edb390e154bccaeb7bb4f34b0c29 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:23:21 -0800 Subject: [PATCH 38/70] select list tweaks --- static/select-list.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/static/select-list.css b/static/select-list.css index 651ce2a31..f4a4e2564 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -2,6 +2,7 @@ border: 1px solid #212121; max-height: 300px; position: relative; + overflow: hidden; } .select-list ol:empty { @@ -26,7 +27,7 @@ } .select-list li .right { - color: #999; + float: right; } .select-list .key-binding { From 4bfd73966db354c5e6d49afb1059bb2a68c9379a Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:28:58 -0800 Subject: [PATCH 39/70] move generic tree-view styles to the main bundle --- src/app/window.coffee | 1 + static/tree-view.css | 121 ++++++++++++++++++++++++++++++ themes/atom-dark-ui/tree-view.css | 118 +---------------------------- 3 files changed, 123 insertions(+), 117 deletions(-) create mode 100644 static/tree-view.css diff --git a/src/app/window.coffee b/src/app/window.coffee index d2b2c196c..930733c52 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -112,6 +112,7 @@ window.startup() requireStylesheet 'reset.css' requireStylesheet 'atom.css' +requireStylesheet 'tree-view.css' requireStylesheet 'overlay.css' requireStylesheet 'popover-list.css' requireStylesheet 'notification.css' diff --git a/static/tree-view.css b/static/tree-view.css new file mode 100644 index 000000000..1568bfbc1 --- /dev/null +++ b/static/tree-view.css @@ -0,0 +1,121 @@ +.tree-view .entries { + margin-left: 12px; +} + +.tree-view .entries .file .name { + margin-left: 20px; +} + +.tree-view .file .name, +.tree-view .directory .header { + padding-top: 4px; + padding-bottom: 4px; + padding-right: 10px; +} + +.tree-view .directory .header { + padding-left: 5px; +} + +.tree-view-dialog { + padding: 5px; +} + +.tree-view-dialog .prompt { + padding-bottom: 3px; + font-size: 12px; + line-height: 16px; +} + +.tree-view-dialog .prompt span { + position: relative; + top: -1px; +} + +.tree-view-dialog .prompt:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 3px; + -webkit-font-smoothing: antialiased; +} + +.tree-view-dialog .prompt.add:before { + content: "\f086"; +} + +.tree-view-dialog .prompt.move:before { + content: "\f03e"; +} + +.tree-view .directory .header .name, +.tree-view .file .name { + position: relative; + padding-left: 21px; +} + +.tree-view .directory .header .name:before, +.tree-view .file .name:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + position: absolute; + left: 0; +} + +.tree-view .disclosure-arrow:before { + font-family: 'Octicons Regular'; + font-size: 12px; + width: 12px; + height: 12px; + line-height: 16px; + margin-right: 3px; + -webkit-font-smoothing: antialiased; +} + +.tree-view .directory .header .directory-icon:before { + content: "\f016"; + top: -5px; +} + +.tree-view .directory .header .repository-icon:before { + content: "\f001"; + top: -4px; +} + +.tree-view .directory .header .submodule-icon:before { + content: "\f017"; + top: -5px; +} + +.tree-view .file .text-icon:before { + content: "\f011"; + top: -2px; +} + +.tree-view .file .image-icon:before { + content: "\f012"; + top: -2px; +} + +.tree-view .file .compressed-icon:before { + content: "\f013"; + top: -2px; +} + +.tree-view .file .pdf-icon:before { + content: "\f014"; + top: -2px; +} + +.tree-view .directory > .header .disclosure-arrow:before { + content: "\f05a"; +} + +.tree-view .directory.expanded > .header .disclosure-arrow:before { + content: "\f05b"; +} diff --git a/themes/atom-dark-ui/tree-view.css b/themes/atom-dark-ui/tree-view.css index d8e69ab64..f3cdf512e 100644 --- a/themes/atom-dark-ui/tree-view.css +++ b/themes/atom-dark-ui/tree-view.css @@ -7,14 +7,6 @@ text-shadow: 0 -1px 0 #000; } -.tree-view .entries { - margin-left: 12px; -} - -.tree-view .entries .file .name { - margin-left: 20px; -} - .tree-view .directory.selected > .header > .name, .tree-view .selected > .name { color: #d2d2d2; @@ -48,17 +40,6 @@ color: #ebebeb; } -.tree-view .file .name, -.tree-view .directory .header { - padding-top: 4px; - padding-bottom: 4px; - padding-right: 10px; -} - -.tree-view .directory .header { - padding-left: 5px; -} - .tree-view .ignored { color: #555; } @@ -75,105 +56,8 @@ background-color: #333; border-top: 1px solid #555; -webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); - padding: 5px; } .tree-view-dialog .prompt { - padding-bottom: 3px; - font-size: 12px; - line-height: 16px; color: #aaa; -} - -.tree-view-dialog .prompt span { - position: relative; - top: -1px; -} - -.tree-view-dialog .prompt:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 3px; - -webkit-font-smoothing: antialiased; -} - -.tree-view-dialog .prompt.add:before { - content: "\f086"; -} - -.tree-view-dialog .prompt.move:before { - content: "\f03e"; -} - -.tree-view .directory .header .name, -.tree-view .file .name { - position: relative; - padding-left: 21px; -} - -.tree-view .directory .header .name:before, -.tree-view .file .name:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - position: absolute; - left: 0; -} - -.tree-view .disclosure-arrow:before { - font-family: 'Octicons Regular'; - font-size: 12px; - width: 12px; - height: 12px; - line-height: 16px; - margin-right: 3px; - -webkit-font-smoothing: antialiased; -} - -.tree-view .directory .header .directory-icon:before { - content: "\f016"; - top: -5px; -} - -.tree-view .directory .header .repository-icon:before { - content: "\f001"; - top: -4px; -} - -.tree-view .directory .header .submodule-icon:before { - content: "\f017"; - top: -5px; -} - -.tree-view .file .text-icon:before { - content: "\f011"; - top: -2px; -} - -.tree-view .file .image-icon:before { - content: "\f012"; - top: -2px; -} - -.tree-view .file .compressed-icon:before { - content: "\f013"; - top: -2px; -} - -.tree-view .file .pdf-icon:before { - content: "\f014"; - top: -2px; -} - -.tree-view .directory > .header .disclosure-arrow:before { - content: "\f05a"; -} - -.tree-view .directory.expanded > .header .disclosure-arrow:before { - content: "\f05b"; -} +} \ No newline at end of file From 1affefb196afd32ffb10ca1d1ef8b62ad447b195 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:36:27 -0800 Subject: [PATCH 40/70] move generic command-panel styles to main bundle --- src/app/window.coffee | 1 + static/command-panel.css | 79 +++++++++++++++++++++++++++ themes/atom-dark-ui/command-panel.css | 55 ------------------- 3 files changed, 80 insertions(+), 55 deletions(-) create mode 100644 static/command-panel.css diff --git a/src/app/window.coffee b/src/app/window.coffee index 930733c52..69652e20a 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -113,6 +113,7 @@ window.startup() requireStylesheet 'reset.css' requireStylesheet 'atom.css' requireStylesheet 'tree-view.css' +requireStylesheet 'command-panel.css' requireStylesheet 'overlay.css' requireStylesheet 'popover-list.css' requireStylesheet 'notification.css' diff --git a/static/command-panel.css b/static/command-panel.css new file mode 100644 index 000000000..46ba7849f --- /dev/null +++ b/static/command-panel.css @@ -0,0 +1,79 @@ +.command-panel { + padding: 5px; +} + +.command-panel .preview-list { + max-height: 300px; + overflow: auto; + margin: 0 1px 5px 10px; + position: relative; + cursor: default; +} + +.command-panel .preview-count { + font-size: 11px; + text-align: right; + padding-bottom: 1px; +} + +.command-panel .preview-list .path { + padding-left: 5px; +} + +.command-panel .preview-list .path:before { + font-family: 'Octicons Regular'; + font-size: 16px; + width: 16px; + height: 16px; + margin-right: 5px; + -webkit-font-smoothing: antialiased; + content: "\f011"; + position: relative; + top: 1px; +} + +.command-panel .preview-list .operation { + padding-top: 2px; + padding-bottom: 2px; +} + +.command-panel .preview-list .line-number { + padding-left: 3px; + margin-right: 1ex; + text-align: right; + display: inline-block; +} + +.command-panel .preview-list .path-match-number { + padding-left: 8px; +} + +.command-panel .preview-list .preview { + word-break: break-all; +} + +.command-panel .preview-list .preview .match { + -webkit-border-radius: 2px; + padding: 1px; +} + +.command-panel .prompt-and-editor .prompt:before { + color: #969696; + content: '\f078'; + font-family: 'Octicons Regular'; + position: relative; + top: 0; + left: -5px; + -webkit-font-smoothing: antialiased; +} + +.command-panel .prompt-and-editor .editor { + position: relative; + left: -4px; + margin-right: -4px; +} + +.error-messages { + padding: 5px 1em; + color: white; +} diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css index 6d0f9775b..f7ca3c2ed 100644 --- a/themes/atom-dark-ui/command-panel.css +++ b/themes/atom-dark-ui/command-panel.css @@ -2,27 +2,18 @@ background-color: #303030; border: 1px solid #252525; color: #dedede; - padding: 5px; } .command-panel .preview-list { - max-height: 300px; - overflow: auto; - margin: 0 1px 5px 10px; - position: relative; background-color: #1e1e1e; color: #C5C8C6; - cursor: default; 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); } .command-panel .preview-count { - font-size: 11px; color: #969696; - text-align: right; - padding-bottom: 1px; } .command-panel .preview-list li.selected, .command-panel .preview-list li.operation:hover { @@ -34,37 +25,14 @@ } .command-panel .preview-list .path { - padding-left: 5px; color: #fff; } -.command-panel .preview-list .path:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - content: "\f011"; - position: relative; - top: 1px; -} - -.command-panel .preview-list .operation { - padding-top: 2px; - padding-bottom: 2px; -} - .command-panel .preview-list .line-number { - padding-left: 3px; color: rgba(255, 255, 255, .3); - margin-right: 1ex; - text-align: right; - display: inline-block; } .command-panel .preview-list .path-match-number { - padding-left: 8px; color: rgba(255, 255, 255, .3); } @@ -74,32 +42,9 @@ .command-panel .preview-list .preview .match { background-color: rgba(255, 255, 255, .2); - -webkit-border-radius: 2px; - padding: 1px; color: yellow; } .command-panel .prompt-and-editor { display: -webkit-box; } - -.command-panel .prompt-and-editor .prompt:before { - color: #969696; - content: '\f078'; - font-family: 'Octicons Regular'; - position: relative; - top: 0; - left: -5px; - -webkit-font-smoothing: antialiased; -} - -.command-panel .prompt-and-editor .editor { - position: relative; - left: -4px; - margin-right: -4px; -} - -.error-messages { - padding: 5px 1em; - color: white; -} From 7d006233139bd53484c48bc469c0e63f65a25bb8 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:52:39 -0800 Subject: [PATCH 41/70] move generic tab styles to main bundle --- src/app/window.coffee | 1 + static/tabs.css | 66 ++++++++++++++++++++++++++++++++++++ themes/atom-dark-ui/tabs.css | 49 ++------------------------ 3 files changed, 69 insertions(+), 47 deletions(-) create mode 100644 static/tabs.css diff --git a/src/app/window.coffee b/src/app/window.coffee index 69652e20a..04f1e1e82 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -112,6 +112,7 @@ window.startup() requireStylesheet 'reset.css' requireStylesheet 'atom.css' +requireStylesheet 'tabs.css' requireStylesheet 'tree-view.css' requireStylesheet 'command-panel.css' requireStylesheet 'overlay.css' diff --git a/static/tabs.css b/static/tabs.css new file mode 100644 index 000000000..2a4faa887 --- /dev/null +++ b/static/tabs.css @@ -0,0 +1,66 @@ +.tabs { + font: caption; + margin-bottom: 1px; +} + +.tab { + cursor: default; + padding: 2px 21px 2px 9px; +} + +.tab.file-modified .close-icon { + border-radius: 10px; +} + +.tab.file-modified .close-icon:before { + content: ""; +} + +.tab.active:before, +.tab.active:after { + position: absolute; + bottom: -1px; + width: 4px; + height: 4px; + content: " "; + z-index: 3; +} + +.tab.active:before { + left: -4px; +} + +.tab.active:after { + right: -4px; + border-width: 0 0 1px 1px; +} + +.tab.active:first-child:before { + display: none; +} + +.tab .file-name { + font-size: 11px; + text-shadow: 0 -1px 1px black; +} + +.tab .close-icon { + font-family: 'Octicons Regular'; + font-size: 14px; + width: 14px; + height: 14px; + display: block; + cursor: pointer; + position: absolute; + right: 4px; + top: -1px; + -webkit-font-smoothing: antialiased; +} + +.tab .close-icon:before { + content: "\f081"; +} + +.tab .close-icon:hover { + color: white; +} \ No newline at end of file diff --git a/themes/atom-dark-ui/tabs.css b/themes/atom-dark-ui/tabs.css index c30c9c1ad..0a3be6a1b 100644 --- a/themes/atom-dark-ui/tabs.css +++ b/themes/atom-dark-ui/tabs.css @@ -1,14 +1,10 @@ .tabs { background: #333333; border-bottom: 4px solid #424242; - font: caption; box-shadow: inset 0 -1px 0 #2e2e2e, 0 1px 0 #191919; - margin-bottom: 1px; } .tab { - cursor: default; - padding: 2px 21px 2px 9px; background-image: -webkit-linear-gradient(#444, #3d3d3d); border-top: 1px solid #383838; border-right: 1px solid #2e2e2e; @@ -42,11 +38,6 @@ .tab.file-modified .close-icon { border: 3px solid #777; - border-radius: 10px; -} - -.tab.file-modified .close-icon:before { - content: ""; } .tab:first-child { @@ -68,57 +59,21 @@ .tab.active:before, .tab.active:after { - position: absolute; - bottom: -1px; - width: 4px; - height: 4px; - content: " "; - z-index: 3; border: 1px solid #595959; } + .tab.active:before { border-bottom-right-radius: 4px; border-width: 0 1px 1px 0; box-shadow: 2px 2px 0 #424242; - left: -4px; } + .tab.active:after { - right: -4px; border-bottom-left-radius: 4px; - border-width: 0 0 1px 1px; box-shadow: -2px 2px 0 #424242; } -.tab.active:first-child:before { - display: none; -} .tab:hover { color: #c8c8c8; background-image: -webkit-linear-gradient(#474747, #444444); } - -.tab .file-name { - font-size: 11px; - text-shadow: 0 -1px 1px black; -} - -.tab .close-icon { - font-family: 'Octicons Regular'; - font-size: 14px; - width: 14px; - height: 14px; - display: block; - cursor: pointer; - position: absolute; - right: 4px; - top: -1px; - -webkit-font-smoothing: antialiased; -} - -.tab .close-icon:before { - content: "\f081"; -} - -.tab .close-icon:hover { - color: white; -} From d82187a187ff68cffecbee099f2b2336d898c91d Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:06:14 -0800 Subject: [PATCH 42/70] remove generic properties reset by is-focused merge --- themes/atom-dark-ui/tabs.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/themes/atom-dark-ui/tabs.css b/themes/atom-dark-ui/tabs.css index 24b1ba2ad..7a3d8b394 100644 --- a/themes/atom-dark-ui/tabs.css +++ b/themes/atom-dark-ui/tabs.css @@ -5,8 +5,6 @@ } .is-focused .tab { - cursor: default; - padding: 2px 21px 2px 9px; background-image: -webkit-linear-gradient(#444, #3d3d3d); border-top: 1px solid #383838; border-right: 1px solid #2e2e2e; @@ -27,8 +25,6 @@ } .tab { - cursor: default; - padding: 2px 21px 2px 9px; background-color: #555; background-image: none; border-top: 1px solid #383838; @@ -88,16 +84,13 @@ border: 1px solid #595959; } - .is-focused .tab.active:before { border-bottom-right-radius: 4px; border-width: 0 1px 1px 0; box-shadow: 2px 2px 0 #424242; - left: -4px; } .is-focused .tab.active:after { - right: -4px; border-bottom-left-radius: 4px; border-width: 0 0 1px 1px; box-shadow: -2px 2px 0 #424242; From a8d0268324d179f21d6b387e96043fd701e40e43 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:25:15 -0800 Subject: [PATCH 43/70] remove all the light styles that are now shared in the main bundle --- themes/atom-light-ui/command-palette.css | 38 ------------------------ themes/atom-light-ui/gists.css | 35 ---------------------- themes/atom-light-ui/go-to-line.css | 22 -------------- themes/atom-light-ui/grammar-view.css | 17 ----------- themes/atom-light-ui/package.json | 9 +----- themes/atom-light-ui/popover-list.css | 16 ---------- themes/atom-light-ui/symbols-view.css | 35 ---------------------- themes/atom-light-ui/wrap-guide.css | 3 -- 8 files changed, 1 insertion(+), 174 deletions(-) delete mode 100644 themes/atom-light-ui/command-palette.css delete mode 100644 themes/atom-light-ui/gists.css delete mode 100644 themes/atom-light-ui/go-to-line.css delete mode 100644 themes/atom-light-ui/grammar-view.css delete mode 100644 themes/atom-light-ui/popover-list.css delete mode 100644 themes/atom-light-ui/symbols-view.css delete mode 100644 themes/atom-light-ui/wrap-guide.css diff --git a/themes/atom-light-ui/command-palette.css b/themes/atom-light-ui/command-palette.css deleted file mode 100644 index 2e7dedd0c..000000000 --- a/themes/atom-light-ui/command-palette.css +++ /dev/null @@ -1,38 +0,0 @@ -.command-palette { - width: 50%; - margin-left: -25%; -} - -.command-palette ol { - max-height: 300px; -} - -.command-palette ol .event-description { - float: left; - display: inline-block; - margin-right: .5em; - margin: 4px 0; -} - -.command-palette li .right { - float: right; -} - -.command-palette ol .event-name, .command-palette ol .key-binding { - display: inline-block; - margin: 4px 0; - margin-right: .5em; - font-size: 90%; - color: #969696; - -webkit-border-radius: 3px; - padding: 0 4px; -} - -.command-palette ol .event-name { - background: rgba(0, 0, 0, .3); - color: #fff; -} - -.command-palette ol .key-binding { - background: #fff; -} diff --git a/themes/atom-light-ui/gists.css b/themes/atom-light-ui/gists.css deleted file mode 100644 index 0209ce3e3..000000000 --- a/themes/atom-light-ui/gists.css +++ /dev/null @@ -1,35 +0,0 @@ -.gist-notification { - position: absolute; - top: 6px; - left: 50%; - margin-left: -5%; - z-index: 99; - padding-left: 5px; - padding-right: 10px; - -webkit-box-shadow: 0px 0px 5px 5px #222; - color: #BBB; - background-color: #444; -} - -.gist-notification .message-area { - float: right; - padding-top: 11px; -} - -.gist-notification .message { - font-size: 13px; -} - -.gist-notification .clipboard { - font-size: 11px; -} - -.gist-notification:before { - font-family: 'Octicons Regular'; - font-size: 32px; - width: 32px; - height: 32px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - content: "\f08c"; -} diff --git a/themes/atom-light-ui/go-to-line.css b/themes/atom-light-ui/go-to-line.css deleted file mode 100644 index 70430ddea..000000000 --- a/themes/atom-light-ui/go-to-line.css +++ /dev/null @@ -1,22 +0,0 @@ -.go-to-line { - position: absolute; - width: 200px; - top: 0; - left: 50%; - margin-left: -100px; - box-sizing: border-box; - z-index: 99; - background-color: #eeeeee; - border: 1px solid #c6c6c6; - color: #323232; - box-shadow: 0 0 10px #555; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - padding: 5px; - cursor: pointer; -} - -.go-to-line .message { - padding-top: 2px; - font-size: 11px; -} diff --git a/themes/atom-light-ui/grammar-view.css b/themes/atom-light-ui/grammar-view.css deleted file mode 100644 index 7be94f4c0..000000000 --- a/themes/atom-light-ui/grammar-view.css +++ /dev/null @@ -1,17 +0,0 @@ -.grammar-view ol li { - line-height: 16px; -} - -.grammar-view ol li.grammar { - padding-left: 21px; -} - -.grammar-view ol li.current-grammar:before { - font-family: 'Octicons Regular'; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - color: #ccc; - content: '\f03a'; -} diff --git a/themes/atom-light-ui/package.json b/themes/atom-light-ui/package.json index 05804295a..19a81d24f 100644 --- a/themes/atom-light-ui/package.json +++ b/themes/atom-light-ui/package.json @@ -2,20 +2,13 @@ "stylesheets":[ "atom.css", "editor.css", - "grammar-view.css", "select-list.css", "tree-view.css", "tabs.css", - "wrap-guide.css", "status-bar.css", - "symbols-view.css", "markdown-preview.css", "fuzzy-finder.css", "command-panel.css", - "command-palette.css", - "command-logger.css", - "popover-list.css", - "gists.css", - "go-to-line.css" + "command-logger.css" ] } diff --git a/themes/atom-light-ui/popover-list.css b/themes/atom-light-ui/popover-list.css deleted file mode 100644 index 7dd7f60b1..000000000 --- a/themes/atom-light-ui/popover-list.css +++ /dev/null @@ -1,16 +0,0 @@ -.select-list.popover-list { - min-width: 150px; - webkit-box-shadow: 0 0 3px rgba(0, 0, 0, .5); - margin-left: 0px; - width: auto; -} - -.popover-list ol { - position: relative; - overflow-y: scroll; - max-height: 200px; -} - -.popover-list ol li { - padding: 0.1em 0.2em; -} diff --git a/themes/atom-light-ui/symbols-view.css b/themes/atom-light-ui/symbols-view.css deleted file mode 100644 index 0cbdbfa53..000000000 --- a/themes/atom-light-ui/symbols-view.css +++ /dev/null @@ -1,35 +0,0 @@ -.symbols-view { - width: 50%; - margin-left: -25%; -} - -.symbols-view ol { - max-height: 300px; -} - -.symbols-view ol li { - padding: 2px; - border-bottom: 1px solid rgba(255, 255, 255, .05); -} - -.symbols-view ol .function-name { - float: left; - display: inline-block; - margin-right: .5em; - margin: 4px 0; -} - -.symbols-view li .right { - float: right; -} - -.symbols-view ol .function-details { - display: inline-block; - margin: 4px 0; - margin-right: .5em; - font-size: 90%; - color: #ddd; - -webkit-border-radius: 3px; - padding: 0 4px; - background: rgba(0, 0, 0, .2); -} diff --git a/themes/atom-light-ui/wrap-guide.css b/themes/atom-light-ui/wrap-guide.css deleted file mode 100644 index f4ff6269c..000000000 --- a/themes/atom-light-ui/wrap-guide.css +++ /dev/null @@ -1,3 +0,0 @@ -.wrap-guide { - background: rgba(150, 150, 150, 0.3); -} From f307554d79bae5c7d9ee881db000d452dde7ac8a Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:33:11 -0800 Subject: [PATCH 44/70] kill dup command-panel light styles --- static/command-panel.css | 4 ++ themes/atom-dark-ui/command-panel.css | 4 -- themes/atom-light-ui/command-panel.css | 65 +------------------------- 3 files changed, 5 insertions(+), 68 deletions(-) diff --git a/static/command-panel.css b/static/command-panel.css index 46ba7849f..aa6796897 100644 --- a/static/command-panel.css +++ b/static/command-panel.css @@ -73,6 +73,10 @@ margin-right: -4px; } +.command-panel .prompt-and-editor { + display: -webkit-box; +} + .error-messages { padding: 5px 1em; color: white; diff --git a/themes/atom-dark-ui/command-panel.css b/themes/atom-dark-ui/command-panel.css index f7ca3c2ed..f3e8412cd 100644 --- a/themes/atom-dark-ui/command-panel.css +++ b/themes/atom-dark-ui/command-panel.css @@ -44,7 +44,3 @@ background-color: rgba(255, 255, 255, .2); color: yellow; } - -.command-panel .prompt-and-editor { - display: -webkit-box; -} diff --git a/themes/atom-light-ui/command-panel.css b/themes/atom-light-ui/command-panel.css index 4bfff1d22..34ced33e7 100644 --- a/themes/atom-light-ui/command-panel.css +++ b/themes/atom-light-ui/command-panel.css @@ -2,25 +2,16 @@ background-color: #f4f4f4; border-top: 1px solid #979797; color: #ededed; - padding: 10px; } .command-panel .preview-list { - max-height: 300px; - overflow: auto; - margin-bottom: 10px; - position: relative; background-color: #e7e7e7; color: #222; - cursor: default; border: 1px solid #989898; } .command-panel .preview-count { - font-size: 11px; color: #333; - text-align: right; - padding-bottom: 1px; } .command-panel .preview-list li.selected, .command-panel .preview-list li.operation:hover { @@ -28,71 +19,17 @@ } .command-panel .preview-list .path { - padding-left: 5px; color: #3D5075; } -.command-panel .preview-list .path:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - content: "\f011"; - position: relative; - top: 1px; -} - -.command-panel .preview-list .operation { - padding-top: 2px; - padding-bottom: 2px; -} - .command-panel .preview-list .line-number { - padding-left: 3px; color: #3D5075; - margin-right: 1ex; - text-align: right; - display: inline-block; } .command-panel .preview-list .path-match-number { - padding-left: 8px; color: #3D5075; } -.command-panel .preview-list .preview { - word-break: break-all; -} - .command-panel .preview-list .preview .match { background-color: #c8d4d7; - -webkit-border-radius: 2px; - padding: 1px; -} - -.command-panel .prompt-and-editor { - display: -webkit-box; -} - -.command-panel .prompt-and-editor .prompt:before { - color: #969696; - content: '\f078'; - font-family: 'Octicons Regular'; - position: relative; - top: -4px; - left: -5px; - -webkit-font-smoothing: antialiased; -} - -.command-panel .prompt-and-editor .editor { - position: relative; - left: -4px; - margin-right: -4px; -} - -.error-messages { - padding: 5px 1em; - color: white; -} +} \ No newline at end of file From c5cdda4e00dc79445875ad14d2e637aa2fbf8e1f Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:35:04 -0800 Subject: [PATCH 45/70] add wrap-guide to atom.css in atom-light-ui --- themes/atom-light-ui/atom.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/atom-light-ui/atom.css b/themes/atom-light-ui/atom.css index 78020c44b..76f2e989b 100644 --- a/themes/atom-light-ui/atom.css +++ b/themes/atom-light-ui/atom.css @@ -19,4 +19,8 @@ html, body, .error { background: #991212 !important; -webkit-transition: background 300ms ease-out; +} + +.wrap-guide { + background: rgba(150, 150, 150, 0.1); } \ No newline at end of file From 3fcb7888ccc19ff5c0b95274c0c922e6bcb4923d Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:39:55 -0800 Subject: [PATCH 46/70] share fuzzy-finder styles between dark and light --- src/app/window.coffee | 1 + .../atom-dark-ui => static}/fuzzy-finder.css | 4 +- themes/atom-dark-ui/package.json | 1 - themes/atom-light-ui/fuzzy-finder.css | 42 ------------------- themes/atom-light-ui/package.json | 1 - 5 files changed, 3 insertions(+), 46 deletions(-) rename {themes/atom-dark-ui => static}/fuzzy-finder.css (91%) delete mode 100644 themes/atom-light-ui/fuzzy-finder.css diff --git a/src/app/window.coffee b/src/app/window.coffee index e55080d72..24eb302c0 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -117,6 +117,7 @@ requireStylesheet 'atom.css' requireStylesheet 'tabs.css' requireStylesheet 'tree-view.css' requireStylesheet 'command-panel.css' +requireStylesheet 'fuzzy-finder.css' requireStylesheet 'overlay.css' requireStylesheet 'popover-list.css' requireStylesheet 'notification.css' diff --git a/themes/atom-dark-ui/fuzzy-finder.css b/static/fuzzy-finder.css similarity index 91% rename from themes/atom-dark-ui/fuzzy-finder.css rename to static/fuzzy-finder.css index b4d6423a1..76ef05462 100644 --- a/themes/atom-dark-ui/fuzzy-finder.css +++ b/static/fuzzy-finder.css @@ -1,5 +1,5 @@ .fuzzy-finder .directory { - color: rgba(255, 255, 255, 0.4); + color: rgba(0, 0, 0, 0.5); word-break: break-word; margin-left: 5px; line-height: 150%; @@ -13,7 +13,7 @@ margin-right: 5px; margin-left: 5px; -webkit-font-smoothing: antialiased; - color: #ccc; + color: #9d9d9d; } .fuzzy-finder .file.text-name:before { diff --git a/themes/atom-dark-ui/package.json b/themes/atom-dark-ui/package.json index 19a81d24f..d0a007f7f 100644 --- a/themes/atom-dark-ui/package.json +++ b/themes/atom-dark-ui/package.json @@ -7,7 +7,6 @@ "tabs.css", "status-bar.css", "markdown-preview.css", - "fuzzy-finder.css", "command-panel.css", "command-logger.css" ] diff --git a/themes/atom-light-ui/fuzzy-finder.css b/themes/atom-light-ui/fuzzy-finder.css deleted file mode 100644 index 0cc921e02..000000000 --- a/themes/atom-light-ui/fuzzy-finder.css +++ /dev/null @@ -1,42 +0,0 @@ -.fuzzy-finder ol { - overflow: hidden; - -webkit-user-select: none; - cursor: default; -} - -.fuzzy-finder ol:empty { - margin-bottom: 0; - border: none; -} - -.fuzzy-finder .directory { - color: #b2b2b2; - padding-left: .5em; -} - -.fuzzy-finder .file:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 5px; - margin-left: 5px; - -webkit-font-smoothing: antialiased; - color: #9d9d9d; -} - -.fuzzy-finder .file.text-name:before { - content: "\f011"; -} - -.fuzzy-finder .file.image-name:before { - content: "\f012"; -} - -.fuzzy-finder .file.compressed-name:before { - content: "\f013"; -} - -.fuzzy-finder .file.pdf-name:before { - content: "\f014"; -} \ No newline at end of file diff --git a/themes/atom-light-ui/package.json b/themes/atom-light-ui/package.json index 19a81d24f..d0a007f7f 100644 --- a/themes/atom-light-ui/package.json +++ b/themes/atom-light-ui/package.json @@ -7,7 +7,6 @@ "tabs.css", "status-bar.css", "markdown-preview.css", - "fuzzy-finder.css", "command-panel.css", "command-logger.css" ] From 5559e17254fa25d8bfecf09b0185c06b95e5acfd Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:41:45 -0800 Subject: [PATCH 47/70] kill dup select-list styles in atom-light-ui --- themes/atom-light-ui/select-list.css | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/themes/atom-light-ui/select-list.css b/themes/atom-light-ui/select-list.css index 99de4fd06..f59cb7bce 100644 --- a/themes/atom-light-ui/select-list.css +++ b/themes/atom-light-ui/select-list.css @@ -3,10 +3,6 @@ border: 1px solid #c6c6c6; color: #323232; box-shadow: 0 0 10px #555; - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - padding: 5px; - cursor: pointer; } .select-list ol { @@ -16,15 +12,6 @@ .select-list ol li { background-color: #f5f5f5; border-bottom: 1px solid #ccc; - padding: 5px; -} - -.select-list ol li:last-child { - border-bottom: none; -} - -.select-list .editor { - margin-bottom: 5px; } .select-list li:hover { @@ -33,10 +20,4 @@ .select-list ol .selected { background-color: #e0e0e0; -} - -.select-list .error { - font-weight: bold; - color: white; - text-shadow: 0 1px 0 #4E0000; } \ No newline at end of file From 94ee3ab221153eb3c42400ad8f061f00387259e4 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:44:23 -0800 Subject: [PATCH 48/70] kill dup tab styles in atom-light-ui --- themes/atom-light-ui/tabs.css | 41 ++--------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/themes/atom-light-ui/tabs.css b/themes/atom-light-ui/tabs.css index ffa248c8f..f5ebd6ef9 100644 --- a/themes/atom-light-ui/tabs.css +++ b/themes/atom-light-ui/tabs.css @@ -1,14 +1,10 @@ .tabs { background: #e3e3e3; border-bottom: 4px solid #e5e5e5; - font: caption; box-shadow: inset 0 -1px 0 #959595, 0 1px 0 #989898; - margin-bottom: 1px; } .is-focused .tab { - cursor: default; - padding: 2px 21px 2px 9px; background-image: -webkit-linear-gradient(#e0e0e0, #bfbfbf); border-top: none; border-right: 1px solid #959595; @@ -18,8 +14,6 @@ } .tab { - cursor: default; - padding: 2px 21px 2px 9px; background-image: none; background-color: #e0e0e0); border-top: none; @@ -61,10 +55,6 @@ border-radius: 10px; } -.tab.file-modified .close-icon:before { - content: ""; -} - .tab.active, .tab.active:hover { border-bottom-color: #e5e5e5; @@ -74,56 +64,29 @@ .tab.active:before, .tab.active:after { - position: absolute; - bottom: -1px; - width: 4px; - height: 4px; - content: " "; - z-index: 3; border: 1px solid #959595; } + .tab.active:before { border-bottom-right-radius: 4px; border-width: 0 1px 1px 0; box-shadow: 2px 2px 0 #e5e5e5; - left: -5px; } + .tab.active:after { - right: -5px; border-bottom-left-radius: 4px; border-width: 0 0 1px 1px; box-shadow: -2px 2px 0 #e5e5e5; } -.tab.active:first-child:before { - display: none; -} .tab:hover { background-image: -webkit-linear-gradient(#e2e2e2, #e0e0e0); } .tab .file-name { - font-size: 11px; text-shadow: 0 1px 0 #e0e0e0; } -.tab .close-icon { - font-family: 'Octicons Regular'; - font-size: 14px; - width: 14px; - height: 14px; - display: block; - cursor: pointer; - position: absolute; - right: 4px; - top: -1px; - -webkit-font-smoothing: antialiased; -} - -.tab .close-icon:before { - content: "\f081"; -} - .tab .close-icon:hover { color: #aaa; } From 1dc40dc469571b0b3873279eaef0449e4afb0e5f Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:47:58 -0800 Subject: [PATCH 49/70] kill dup tree-view styles in atom-light-ui --- themes/atom-light-ui/tree-view.css | 118 +---------------------------- 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/themes/atom-light-ui/tree-view.css b/themes/atom-light-ui/tree-view.css index 7a833b7a2..638c58669 100644 --- a/themes/atom-light-ui/tree-view.css +++ b/themes/atom-light-ui/tree-view.css @@ -12,14 +12,6 @@ text-shadow: 0 1px 0 #fff; } -.tree-view .entries { - margin-left: 12px; -} - -.tree-view .entries .file .name { - margin-left: 20px; -} - .tree-view .directory.selected > .header > .name, .tree-view .selected > .name { color: #262626; @@ -95,17 +87,6 @@ color: #3D4552; } -.tree-view .file .name, -.tree-view .directory .header { - padding-top: 4px; - padding-bottom: 4px; - padding-right: 10px; -} - -.tree-view .directory .header { - padding-left: 5px; -} - .tree-view .ignored { color: #555; } @@ -121,105 +102,8 @@ .tree-view-dialog { background-color: #e7e7e7; border-top: 1px solid #989898; - padding: 5px; } .tree-view-dialog .prompt { - padding-bottom: 3px; - font-size: 12px; - line-height: 16px; color: #333; -} - -.tree-view-dialog .prompt span { - position: relative; - top: -1px; -} - -.tree-view-dialog .prompt:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 3px; - -webkit-font-smoothing: antialiased; -} - -.tree-view-dialog .prompt.add:before { - content: "\f086"; -} - -.tree-view-dialog .prompt.move:before { - content: "\f03e"; -} - -.tree-view .directory .header .name, -.tree-view .file .name { - position: relative; - padding-left: 21px; -} - -.tree-view .directory .header .name:before, -.tree-view .file .name:before { - font-family: 'Octicons Regular'; - font-size: 16px; - width: 16px; - height: 16px; - margin-right: 5px; - -webkit-font-smoothing: antialiased; - position: absolute; - left: 0; -} - -.tree-view .disclosure-arrow:before { - font-family: 'Octicons Regular'; - font-size: 12px; - width: 12px; - height: 12px; - line-height: 16px; - margin-right: 3px; - -webkit-font-smoothing: antialiased; -} - -.tree-view .directory .header .directory-icon:before { - content: "\f016"; - top: -5px; -} - -.tree-view .directory .header .repository-icon:before { - content: "\f001"; - top: -4px; -} - -.tree-view .directory .header .submodule-icon:before { - content: "\f017"; - top: -5px; -} - -.tree-view .file .text-icon:before { - content: "\f011"; - top: -2px; -} - -.tree-view .file .image-icon:before { - content: "\f012"; - top: -2px; -} - -.tree-view .file .compressed-icon:before { - content: "\f013"; - top: -2px; -} - -.tree-view .file .pdf-icon:before { - content: "\f014"; - top: -2px; -} - -.tree-view .directory > .header .disclosure-arrow:before { - content: "\f05a"; -} - -.tree-view .directory.expanded > .header .disclosure-arrow:before { - content: "\f05b"; -} +} \ No newline at end of file From c94201db570dee63e738573f7b0c4ad06a864bca Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:58:15 -0800 Subject: [PATCH 50/70] move generic editor styles to the main bundle. kill resulting dupe code --- static/editor.css | 53 ++++++++++++++++++++++++++++++ themes/atom-dark-ui/editor.css | 57 --------------------------------- themes/atom-light-ui/editor.css | 56 +------------------------------- 3 files changed, 54 insertions(+), 112 deletions(-) diff --git a/static/editor.css b/static/editor.css index ebd85aeaf..91aed0439 100644 --- a/static/editor.css +++ b/static/editor.css @@ -6,10 +6,23 @@ -webkit-box-flex: 1; position: relative; z-index: 0; + font-family: Inconsolata, Monaco, Courier; + line-height: 1.3; } .editor.mini { height: auto; + line-height: 25px; +} + +.editor.mini .cursor { + width: 2px; + line-height: 20px; + margin-top: 2px; +} + +.editor .gutter .line-number.cursor-line { + opacity: 1; } .editor .gutter { @@ -19,14 +32,54 @@ text-align: right; } +.editor .gutter .line-number { + padding-right: .5em; + min-width: 35px; + box-sizing: border-box; + text-align: right; + opacity: 0.6; +} + .editor .gutter .line-numbers { position: relative; } +.editor .gutter .line-number.fold.cursor-line { + opacity: 1; +} + +.editor .gutter .line-number.fold:after { + visibility: visible; +} + .editor.mini .gutter { display: none; } +.editor .gutter .line-number:after { + font-size: 0.8em; + content: '\f078'; + font-family: 'Octicons Regular'; + -webkit-font-smoothing: antialiased; + color: #fba0e3; + visibility: hidden; +} + +.editor .fold-marker:after { + content: '\2026'; + opacity: .8; + color: #fba0e3; + padding-left: .2em; +} + +.editor .line.cursor-line .fold-marker { + opacity: 1; +} + +.editor .invisible { + opacity: 0.2; +} + .editor .vertical-scrollbar { position: absolute; right: 0; diff --git a/themes/atom-dark-ui/editor.css b/themes/atom-dark-ui/editor.css index 9dfb302ac..3006ed4ef 100644 --- a/themes/atom-dark-ui/editor.css +++ b/themes/atom-dark-ui/editor.css @@ -1,34 +1,9 @@ -.editor { - font-family: Inconsolata, Monaco, Courier; - line-height: 1.3; -} - .editor.mini { - height: auto; - 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); } -.editor.mini .cursor { - width: 2px; - line-height: 20px; - margin-top: 2px; -} - -.editor .gutter .line-number { - padding-right: .5em; - min-width: 35px; - box-sizing: border-box; - text-align: right; - opacity: 0.6; -} - -.editor .gutter .line-number.cursor-line { - opacity: 1; -} - .editor .gutter.drop-shadow { -webkit-box-shadow: -2px 0px 10px 2px #222; } @@ -48,35 +23,3 @@ color: #fba0e3; opacity: .8; } - -.editor .gutter .line-number.fold.cursor-line { - opacity: 1; -} - -.editor .gutter .line-number:after { - font-size: 0.8em; - content: '\f078'; - font-family: 'Octicons Regular'; - -webkit-font-smoothing: antialiased; - color: #fba0e3; - visibility: hidden; -} - -.editor .gutter .line-number.fold:after { - visibility: visible; -} - -.editor .fold-marker:after { - content: '\2026'; - opacity: .8; - color: #fba0e3; - padding-left: .2em; -} - -.editor .line.cursor-line .fold-marker { - opacity: 1; -} - -.editor .invisible { - opacity: 0.2; -} diff --git a/themes/atom-light-ui/editor.css b/themes/atom-light-ui/editor.css index 3a3652b0b..23d8a2eaf 100644 --- a/themes/atom-light-ui/editor.css +++ b/themes/atom-light-ui/editor.css @@ -1,11 +1,4 @@ -.editor { - font-family: Inconsolata, Monaco, Courier; - line-height: 1.3; -} - .editor.mini { - height: auto; - 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); @@ -15,21 +8,6 @@ .editor.mini .cursor { background: #333; - width: 2px; - line-height: 20px; - margin-top: 2px; -} - -.editor .gutter .line-number { - padding-right: .5em; - min-width: 35px; - box-sizing: border-box; - text-align: right; - opacity: 0.5; -} - -.editor .gutter .line-number.cursor-line { - opacity: 1; } .editor .gutter.drop-shadow { @@ -50,36 +28,4 @@ .editor .gutter .line-number.fold { color: #fba0e3; opacity: .8; -} - -.editor .gutter .line-number.fold.cursor-line { - opacity: 1; -} - -.editor .gutter .line-number:after { - font-size: 0.8em; - content: '\f078'; - font-family: 'Octicons Regular'; - -webkit-font-smoothing: antialiased; - color: #fba0e3; - visibility: hidden; -} - -.editor .gutter .line-number.fold:after { - visibility: visible; -} - -.editor .fold-marker:after { - content: '\2026'; - opacity: .8; - color: #fba0e3; - padding-left: .2em; -} - -.editor .line.cursor-line .fold-marker { - opacity: 1; -} - -.editor .invisible { - opacity: 0.2; -} +} \ No newline at end of file From 8474caa8d8c52d5d43796834a6629354eae18265 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 10:03:52 -0800 Subject: [PATCH 51/70] move generic status bar styles to main bundle, kill dupe cod --- src/app/window.coffee | 1 + static/status-bar.css | 48 +++++++++++++++++++++++++++++ themes/atom-dark-ui/status-bar.css | 46 --------------------------- themes/atom-light-ui/status-bar.css | 48 +---------------------------- 4 files changed, 50 insertions(+), 93 deletions(-) create mode 100644 static/status-bar.css diff --git a/src/app/window.coffee b/src/app/window.coffee index 24eb302c0..998f381a4 100644 --- a/src/app/window.coffee +++ b/src/app/window.coffee @@ -116,6 +116,7 @@ requireStylesheet 'reset.css' requireStylesheet 'atom.css' requireStylesheet 'tabs.css' requireStylesheet 'tree-view.css' +requireStylesheet 'status-bar.css' requireStylesheet 'command-panel.css' requireStylesheet 'fuzzy-finder.css' requireStylesheet 'overlay.css' diff --git a/static/status-bar.css b/static/status-bar.css new file mode 100644 index 000000000..fe46c8408 --- /dev/null +++ b/static/status-bar.css @@ -0,0 +1,48 @@ +.status-bar { + padding: 4px 10px 3px; + font-size: 11px; + line-height: 14px; +} + +.status-bar .cursor-position, +.status-bar .grammar-name { + padding-left: 10px; +} + +.status-bar .grammar-name { + cursor: pointer; +} + +.status-bar .branch-label { + vertical-align: baseline; +} + +.status-bar .git-status.octicons { + display: none; + padding-left: 10px; + margin-top:-2px; +} + +.status-bar .octicons:before { + font-family: 'Octicons Regular'; + font-size: 14px; + width: 14px; + height: 14px; + line-height: 14px; + -webkit-font-smoothing: antialiased; + display: inline-block; + vertical-align: middle; + margin-right: 5px; +} + +.status-bar .branch-icon:before { + content: "\f020"; +} + +.status-bar .modified-status-icon:before { + content: "\f26d"; +} + +.status-bar .new-status-icon:before { + content: "\f26b"; +} diff --git a/themes/atom-dark-ui/status-bar.css b/themes/atom-dark-ui/status-bar.css index f517760f4..4ca4f2dc5 100644 --- a/themes/atom-dark-ui/status-bar.css +++ b/themes/atom-dark-ui/status-bar.css @@ -1,61 +1,15 @@ .status-bar { background-color: #303030; border-top: 1px solid #454545; - padding: 4px 10px 3px; - font-size: 11px; - line-height: 14px; color: #969696; } -.status-bar .cursor-position, -.status-bar .grammar-name { - padding-left: 10px; -} - -.status-bar .grammar-name { - cursor: pointer; -} - -.status-bar .branch-label { - vertical-align: baseline; -} - -.status-bar .git-status.octicons { - display: none; - padding-left: 10px; - margin-top:-2px; -} - -.status-bar .octicons:before { - font-family: 'Octicons Regular'; - font-size: 14px; - width: 14px; - height: 14px; - line-height: 14px; - -webkit-font-smoothing: antialiased; - display: inline-block; - vertical-align: middle; - margin-right: 5px; -} - -.status-bar .branch-icon:before { - content: "\f020"; -} - .status-bar .git-status.octicons.modified-status-icon { color: #f78a46; display: inline-block; } -.status-bar .modified-status-icon:before { - content: "\f26d"; -} - .status-bar .git-status.octicons.new-status-icon { color: #5293d8; display: inline-block; } - -.status-bar .new-status-icon:before { - content: "\f26b"; -} diff --git a/themes/atom-light-ui/status-bar.css b/themes/atom-light-ui/status-bar.css index 88995cd78..201be6e28 100644 --- a/themes/atom-light-ui/status-bar.css +++ b/themes/atom-light-ui/status-bar.css @@ -1,61 +1,15 @@ .status-bar { background-color: #e5e5e5; border-top: 1px solid #959595; - padding: 4px 10px 3px; - font-size: 11px; - line-height: 14px; color: #333; } -.status-bar .cursor-position, -.status-bar .grammar-name { - padding-left: 10px; -} - -.status-bar .grammar-name { - cursor: pointer; -} - -.status-bar .branch-label { - vertical-align: baseline; -} - -.status-bar .git-status.octicons { - display: none; - padding-left: 10px; - margin-top:-2px; -} - -.status-bar .octicons:before { - font-family: 'Octicons Regular'; - font-size: 14px; - width: 14px; - height: 14px; - line-height: 14px; - -webkit-font-smoothing: antialiased; - display: inline-block; - vertical-align: middle; - margin-right: 5px; -} - -.status-bar .branch-icon:before { - content: "\f020"; -} - .status-bar .git-status.octicons.modified-status-icon { color: #f78a46; display: inline-block; } -.status-bar .modified-status-icon:before { - content: "\f26d"; -} - .status-bar .git-status.octicons.new-status-icon { color: #5293d8; display: inline-block; -} - -.status-bar .new-status-icon:before { - content: "\f26b"; -} +} \ No newline at end of file From 4845135375282ede6b5852644712a723ba61ea25 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 11:23:07 -0800 Subject: [PATCH 52/70] tweak directory look in dark theme, add back the dash --- src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee | 2 +- themes/atom-dark-ui/atom.css | 2 +- themes/atom-dark-ui/select-list.css | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee index 0a75068be..85c2c57d1 100644 --- a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee @@ -49,7 +49,7 @@ class FuzzyFinderView extends SelectList typeClass = 'text-name' @span fs.base(path), class: "file label #{typeClass}" if folder = fs.directory(path) - @span "#{folder}/", class: 'directory' + @span " - #{folder}/", class: 'directory' openPath: (path) -> @rootView.open(path, {@allowActiveEditorChange}) if path diff --git a/themes/atom-dark-ui/atom.css b/themes/atom-dark-ui/atom.css index d7409130b..22afd1c83 100644 --- a/themes/atom-dark-ui/atom.css +++ b/themes/atom-dark-ui/atom.css @@ -23,4 +23,4 @@ html, body, .wrap-guide { background: rgba(150, 150, 150, 0.1); -} +} \ No newline at end of file diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 3a1e7d9ff..c3a143f8a 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -25,4 +25,8 @@ .select-list ol .selected { background-image: -webkit-linear-gradient(#7e7e7e, #737373); +} + +.select-list .directory { + color: #777; } \ No newline at end of file From 09efd15122784f58ec731401414b3662ae178ccd Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 11:34:27 -0800 Subject: [PATCH 53/70] fix command pallete specs to reflect new classes --- .../command-palette/spec/command-palette-spec.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/packages/command-palette/spec/command-palette-spec.coffee b/src/packages/command-palette/spec/command-palette-spec.coffee index 2f62d1b7b..60e01efb2 100644 --- a/src/packages/command-palette/spec/command-palette-spec.coffee +++ b/src/packages/command-palette/spec/command-palette-spec.coffee @@ -16,15 +16,15 @@ describe "CommandPalette", -> afterEach -> rootView.remove() - describe "when command-palette:toggle is triggered on the root view", -> + fdescribe "when command-palette:toggle is triggered on the root view", -> it "shows a list of all valid command descriptions, names, and keybindings for the previously focused element", -> keyBindings = _.losslessInvert(keymap.bindingsForElement(rootView.getActiveEditor())) for eventName, description of rootView.getActiveEditor().events() eventLi = palette.list.children("[data-event-name='#{eventName}']") if description expect(eventLi).toExist() - expect(eventLi.find('.event-name')).toHaveText(eventName) - expect(eventLi.find('.event-description')).toHaveText(description) + expect(eventLi.find('.label')).toHaveText(description) + expect(eventLi.find('.label').attr('title')).toBe(eventName) for binding in keyBindings[eventName] ? [] expect(eventLi.find(".key-binding:contains(#{binding})")).toExist() else @@ -39,8 +39,8 @@ describe "CommandPalette", -> description = editorEvents[eventName] unless description if description expect(eventLi).toExist() - expect(eventLi.find('.event-name')).toHaveText(eventName) - expect(eventLi.find('.event-description')).toHaveText(description) + expect(eventLi.find('.label')).toHaveText(description) + expect(eventLi.find('.label').attr('title')).toBe(eventName) else expect(eventLi).not.toExist() From cf9ed9207293cecd01ad36d1b04335e7e1385b80 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 11:38:31 -0800 Subject: [PATCH 54/70] fix gists specs --- src/packages/command-palette/spec/command-palette-spec.coffee | 2 +- src/packages/gists/spec/gists-spec.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/command-palette/spec/command-palette-spec.coffee b/src/packages/command-palette/spec/command-palette-spec.coffee index 60e01efb2..1f56f1ab5 100644 --- a/src/packages/command-palette/spec/command-palette-spec.coffee +++ b/src/packages/command-palette/spec/command-palette-spec.coffee @@ -16,7 +16,7 @@ describe "CommandPalette", -> afterEach -> rootView.remove() - fdescribe "when command-palette:toggle is triggered on the root view", -> + describe "when command-palette:toggle is triggered on the root view", -> it "shows a list of all valid command descriptions, names, and keybindings for the previously focused element", -> keyBindings = _.losslessInvert(keymap.bindingsForElement(rootView.getActiveEditor())) for eventName, description of rootView.getActiveEditor().events() diff --git a/src/packages/gists/spec/gists-spec.coffee b/src/packages/gists/spec/gists-spec.coffee index 64227744a..056d6e412 100644 --- a/src/packages/gists/spec/gists-spec.coffee +++ b/src/packages/gists/spec/gists-spec.coffee @@ -44,8 +44,8 @@ describe "Gists package", -> expect(pasteboard.read()[0]).toBe 'https://gist.github.com/1' it "flashes that the Gist was created", -> - expect(rootView.find('.gist-notification')).toExist() - expect(rootView.find('.gist-notification .message').text()).toBe 'Gist 1 created' + expect(rootView.find('.notification')).toExist() + expect(rootView.find('.notification .title').text()).toBe 'Gist 1 created' advanceClock(2000) expect(rootView.find('.gist-notification')).not.toExist() From c62e0dfa4bf5bbb7db3fc4bef4ce00a160f3d523 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 11:41:50 -0800 Subject: [PATCH 55/70] fix symbols view spec --- src/packages/symbols-view/spec/symbols-view-spec.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/symbols-view/spec/symbols-view-spec.coffee b/src/packages/symbols-view/spec/symbols-view-spec.coffee index 89476c8d5..d2b5b07b2 100644 --- a/src/packages/symbols-view/spec/symbols-view-spec.coffee +++ b/src/packages/symbols-view/spec/symbols-view-spec.coffee @@ -16,7 +16,7 @@ describe "SymbolsView", -> rootView.deactivate() setArraySpy.reset() - describe "when tags can be generated for a file", -> + fdescribe "when tags can be generated for a file", -> it "initially displays all JavaScript functions with line numbers", -> rootView.open('sample.js') expect(rootView.find('.symbols-view')).not.toExist() @@ -30,9 +30,9 @@ describe "SymbolsView", -> expect(symbolsView.find('.loading')).toBeEmpty() expect(rootView.find('.symbols-view')).toExist() expect(symbolsView.list.children('li').length).toBe 2 - expect(symbolsView.list.children('li:first').find('.function-name')).toHaveText 'quicksort' + expect(symbolsView.list.children('li:first').find('.label')).toHaveText 'quicksort' expect(symbolsView.list.children('li:first').find('.function-details')).toHaveText 'Line 1' - expect(symbolsView.list.children('li:last').find('.function-name')).toHaveText 'quicksort.sort' + expect(symbolsView.list.children('li:last').find('.label')).toHaveText 'quicksort.sort' expect(symbolsView.list.children('li:last').find('.function-details')).toHaveText 'Line 2' expect(symbolsView).not.toHaveClass "error" expect(symbolsView.error).not.toBeVisible() From d4a080a0222208858c52b7d605fbf6e3c8b48825 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 11:53:04 -0800 Subject: [PATCH 56/70] more fixes to symbols spec --- src/packages/symbols-view/spec/symbols-view-spec.coffee | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/symbols-view/spec/symbols-view-spec.coffee b/src/packages/symbols-view/spec/symbols-view-spec.coffee index d2b5b07b2..3e0724795 100644 --- a/src/packages/symbols-view/spec/symbols-view-spec.coffee +++ b/src/packages/symbols-view/spec/symbols-view-spec.coffee @@ -16,7 +16,7 @@ describe "SymbolsView", -> rootView.deactivate() setArraySpy.reset() - fdescribe "when tags can be generated for a file", -> + describe "when tags can be generated for a file", -> it "initially displays all JavaScript functions with line numbers", -> rootView.open('sample.js') expect(rootView.find('.symbols-view')).not.toExist() @@ -165,7 +165,7 @@ describe "SymbolsView", -> editor.setCursorBufferPosition([8,14]) editor.trigger 'symbols-view:go-to-declaration' expect(symbolsView.list.children('li').length).toBe 1 - expect(symbolsView.list.children('li:first').find('.function-name')).toHaveText 'tagged.js' + expect(symbolsView.list.children('li:first').find('.label')).toHaveText 'tagged.js' describe "project symbols", -> it "displays all tags", -> @@ -181,9 +181,9 @@ describe "SymbolsView", -> expect(symbolsView.find('.loading')).toBeEmpty() expect(rootView.find('.symbols-view')).toExist() expect(symbolsView.list.children('li').length).toBe 4 - expect(symbolsView.list.children('li:first').find('.function-name')).toHaveText 'callMeMaybe' + expect(symbolsView.list.children('li:first').find('.label')).toHaveText 'callMeMaybe' expect(symbolsView.list.children('li:first').find('.function-details')).toHaveText 'tagged.js' - expect(symbolsView.list.children('li:last').find('.function-name')).toHaveText 'thisIsCrazy' + expect(symbolsView.list.children('li:last').find('.label')).toHaveText 'thisIsCrazy' expect(symbolsView.list.children('li:last').find('.function-details')).toHaveText 'tagged.js' expect(symbolsView).not.toHaveClass "error" expect(symbolsView.error).not.toBeVisible() From 6757e98ff5837582910e26ba7c4596889d999bb9 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 12:04:04 -0800 Subject: [PATCH 57/70] fix popover styles --- static/popover-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/popover-list.css b/static/popover-list.css index c719d887f..5f144b5ce 100644 --- a/static/popover-list.css +++ b/static/popover-list.css @@ -1,5 +1,5 @@ .select-list.popover-list { - min-width: 150px; + max-width: 200px; border: 2px solid #222; webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); margin-left: 0px; From 5b9957e85f6274ef746834f67e2879746d27dd92 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 12:16:37 -0800 Subject: [PATCH 58/70] fix autocomplete and specs --- .../autocomplete/src/autocomplete-view.coffee | 1 - static/popover-list.css | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/packages/autocomplete/src/autocomplete-view.coffee b/src/packages/autocomplete/src/autocomplete-view.coffee index e77037cd4..f2c200d44 100644 --- a/src/packages/autocomplete/src/autocomplete-view.coffee +++ b/src/packages/autocomplete/src/autocomplete-view.coffee @@ -106,7 +106,6 @@ class AutocompleteView extends SelectList setPosition: -> { left, top } = @editor.pixelPositionForScreenPosition(@originalCursorPosition) - height = @outerHeight() potentialTop = top + @editor.lineHeight potentialBottom = potentialTop - @editor.scrollTop() + height diff --git a/static/popover-list.css b/static/popover-list.css index 5f144b5ce..005b4a36a 100644 --- a/static/popover-list.css +++ b/static/popover-list.css @@ -1,17 +1,17 @@ .select-list.popover-list { - max-width: 200px; + width: 200px; border: 2px solid #222; - webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); + -webkit-box-shadow: 0 0 3px 3px rgba(0, 0, 0, .5); margin-left: 0px; - width: auto; + position: relative; } -.popover-list ol { +.select-list.popover-list ol { position: relative; overflow-y: scroll; max-height: 200px; } -.popover-list ol li { - padding: 0.1em 0.2em; -} +.select-list.popover-list ol li { + padding: 5px; +} \ No newline at end of file From 619d1957111745ef61166ffb9241d5a1ea58cac3 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 13:11:29 -0800 Subject: [PATCH 59/70] tweak select list --- static/select-list.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/static/select-list.css b/static/select-list.css index f4a4e2564..965e0bbae 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -1,8 +1,7 @@ .select-list ol { border: 1px solid #212121; - max-height: 300px; + max-height: 390px; position: relative; - overflow: hidden; } .select-list ol:empty { @@ -11,7 +10,7 @@ } .select-list ol li { - padding: 10px; + padding: 5px; } .select-list ol li:after { From b8c56e1618a102351847bbdd425b0f479089c280 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 13:33:49 -0800 Subject: [PATCH 60/70] tweak key binding position and clip overflow of select-list --- static/select-list.css | 1 + themes/atom-dark-ui/select-list.css | 1 + 2 files changed, 2 insertions(+) diff --git a/static/select-list.css b/static/select-list.css index 965e0bbae..7f0b267c6 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -2,6 +2,7 @@ border: 1px solid #212121; max-height: 390px; position: relative; + overflow: hidden; } .select-list ol:empty { diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index c3a143f8a..0e407d482 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -17,6 +17,7 @@ rgba(70,70,70, 0.5)); color: #ccc; -webkit-box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.1); + display: inline-block; } .select-list li:hover { From a5c20c1464ad2aced6b0f3826aece82dc0ab8a87 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 13:38:21 -0800 Subject: [PATCH 61/70] scrolling is a nice feature --- static/select-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/select-list.css b/static/select-list.css index 7f0b267c6..540d9fbbe 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -2,7 +2,7 @@ border: 1px solid #212121; max-height: 390px; position: relative; - overflow: hidden; + overflow: auto; } .select-list ol:empty { From 9eb3a208675dbf523ec645dfd5d923e81b8e1e16 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 13:40:09 -0800 Subject: [PATCH 62/70] consistent mini editor spacing in overlays --- static/overlay.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/overlay.css b/static/overlay.css index 8b44a76b3..421b2f71f 100644 --- a/static/overlay.css +++ b/static/overlay.css @@ -14,6 +14,10 @@ border-radius: 3px; } +.overlay .editor.mini { + margin-bottom: 10px; +} + .overlay .message { padding-top: 5px; font-size: 11px; From 6b9c94d0e8a77cc29865307f018e862358d38817 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 13:45:45 -0800 Subject: [PATCH 63/70] :lipstick: --- static/select-list.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/static/select-list.css b/static/select-list.css index 540d9fbbe..94b9cefdd 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -1,8 +1,11 @@ .select-list ol { border: 1px solid #212121; - max-height: 390px; position: relative; - overflow: auto; + overflow-y: auto; +} + +.select-list ol { + max-height: 390px; } .select-list ol:empty { @@ -41,10 +44,6 @@ border-bottom: none; } -.select-list .editor { - margin-bottom: 5px; -} - .select-list .error { font-weight: bold; color: white; From 1b722e8293bc2707c0d32343c113259ee26eceac Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 13:58:44 -0800 Subject: [PATCH 64/70] :rage: more select list tweaks. It's still about 8px off when scrolling --- static/select-list.css | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/static/select-list.css b/static/select-list.css index 94b9cefdd..3b2703fa3 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -2,27 +2,21 @@ border: 1px solid #212121; position: relative; overflow-y: auto; -} - -.select-list ol { - max-height: 390px; + max-height: 334px; + margin: 0; + background: red; + padding: 0; + line-height: 100%; } .select-list ol:empty { - margin-bottom: 0; border: none; } .select-list ol li { - padding: 5px; -} - -.select-list ol li:after { - content: "."; + padding: 10px; + box-sizing: border-box; display: block; - clear: both; - visibility: hidden; - height: 0; } .select-list li .label { From e3fd6d87b58ae025f445e468a3efdf11d36668b0 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 14:07:42 -0800 Subject: [PATCH 65/70] :lipstick: --- themes/atom-dark-ui/select-list.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 0e407d482..77bd9621a 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -9,6 +9,8 @@ .select-list li .right { color: #999; + display: inline-block; + margin-top: -3px; } .select-list .key-binding { @@ -18,6 +20,7 @@ color: #ccc; -webkit-box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.1); display: inline-block; + line-height: 100%; } .select-list li:hover { From e9747a8f9c6b42ad19c4b1c785447f6f218cb3ac Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 4 Feb 2013 14:15:12 -0800 Subject: [PATCH 66/70] Use outer height of item scrolling to item --- src/app/select-list.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee index 0b4cd9a87..297c3fa35 100644 --- a/src/app/select-list.coffee +++ b/src/app/select-list.coffee @@ -109,7 +109,7 @@ class SelectList extends View scrollToItem: (item) -> scrollTop = @list.scrollTop() desiredTop = item.position().top + scrollTop - desiredBottom = desiredTop + item.height() + desiredBottom = desiredTop + item.outerHeight() if desiredTop < scrollTop @list.scrollTop(desiredTop) From db9c67e1e2bdff97412c91e515ca953e57d66ef0 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 14:25:24 -0800 Subject: [PATCH 67/70] adjust select-list height to fit new outerHeight --- static/select-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/select-list.css b/static/select-list.css index 3b2703fa3..847edb7ab 100644 --- a/static/select-list.css +++ b/static/select-list.css @@ -2,7 +2,7 @@ border: 1px solid #212121; position: relative; overflow-y: auto; - max-height: 334px; + max-height: 312px; margin: 0; background: red; padding: 0; From 278b8c3df13b3aa191cc81f2954ffd190ba3c4c5 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 4 Feb 2013 15:26:46 -0800 Subject: [PATCH 68/70] Trigger move-up to reset top scroll to 0 --- src/packages/command-panel/spec/command-panel-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/command-panel/spec/command-panel-spec.coffee b/src/packages/command-panel/spec/command-panel-spec.coffee index a63ae410b..c0d47fe45 100644 --- a/src/packages/command-panel/spec/command-panel-spec.coffee +++ b/src/packages/command-panel/spec/command-panel-spec.coffee @@ -408,7 +408,7 @@ describe "CommandPanel", -> expect(previewList.scrollBottom()).toBeCloseTo previewList.prop('scrollHeight'), -1 - previewList.trigger 'core:move-down' + _.times previewList.getOperations().length, -> previewList.trigger 'core:move-up' expect(previewList.scrollTop()).toBe 0 it "doesn't bubble up the event and the command panel text doesn't change", -> From 3e7b75e9aa27d677e385fff3b9a68f556ce2cba4 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 15:31:01 -0800 Subject: [PATCH 69/70] set directory color when item is selected --- themes/atom-dark-ui/select-list.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/themes/atom-dark-ui/select-list.css b/themes/atom-dark-ui/select-list.css index 77bd9621a..235e604ff 100644 --- a/themes/atom-dark-ui/select-list.css +++ b/themes/atom-dark-ui/select-list.css @@ -33,4 +33,12 @@ .select-list .directory { color: #777; +} + +.select-list ol .selected .label { + color: #fff; +} + +.select-list ol .selected .directory { + color: #ccc; } \ No newline at end of file From bef965d8638d0cc0051f93c68d55d699c7e4e27e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 4 Feb 2013 15:34:41 -0800 Subject: [PATCH 70/70] Add line number padding to expected width --- spec/app/editor-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee index 2d04e5c7d..a3ddcf500 100644 --- a/spec/app/editor-spec.coffee +++ b/spec/app/editor-spec.coffee @@ -605,7 +605,7 @@ describe "Editor", -> rootView.attachToDom() config.set("editor.fontSize", 16 * 4) expect(editor.gutter.css('font-size')).toBe "#{16 * 4}px" - expect(editor.gutter.width()).toBe(64) + expect(editor.gutter.width()).toBe(64 + editor.gutter.calculateLineNumberPadding()) it "updates lines if there are unrendered lines", -> editor.attachToDom(heightInLines: 5)