From 3fcb7888ccc19ff5c0b95274c0c922e6bcb4923d Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 09:39:55 -0800 Subject: [PATCH] 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" ]