From 1affefb196afd32ffb10ca1d1ef8b62ad447b195 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 08:36:27 -0800 Subject: [PATCH] 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; -}