From 8474caa8d8c52d5d43796834a6629354eae18265 Mon Sep 17 00:00:00 2001 From: Justin Palmer Date: Mon, 4 Feb 2013 10:03:52 -0800 Subject: [PATCH] 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