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