From c4cfc0cff62995a8891789b71db4214b6c89877b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 20 May 2013 17:53:56 -0700 Subject: [PATCH] Move btn override to command panel stylesheet --- themes/atom-dark-ui/atom.less | 7 ------- themes/atom-dark-ui/command-panel.less | 7 +++++++ themes/atom-light-ui/atom.less | 12 ------------ themes/atom-light-ui/command-panel.less | 12 ++++++++++++ 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/themes/atom-dark-ui/atom.less b/themes/atom-dark-ui/atom.less index 915e12106..d7409130b 100644 --- a/themes/atom-dark-ui/atom.less +++ b/themes/atom-dark-ui/atom.less @@ -1,5 +1,3 @@ -@import "bootstrap/less/mixins.less"; - html, body, #root-view { font: caption; @@ -26,8 +24,3 @@ html, body, .wrap-guide { background: rgba(150, 150, 150, 0.1); } - -.btn { - .btn-pseudo-states(#19191a, #1a1b1c); - color: #969696; -} diff --git a/themes/atom-dark-ui/command-panel.less b/themes/atom-dark-ui/command-panel.less index 49b05eb0d..711dbf428 100644 --- a/themes/atom-dark-ui/command-panel.less +++ b/themes/atom-dark-ui/command-panel.less @@ -1,9 +1,16 @@ +@import "bootstrap/less/mixins.less"; + .command-panel { background-color: #1b1c1e; color: #dedede; border-top: 1px solid rgba(0, 0, 0, 0.5); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05); padding: 10px; + + .btn { + .btn-pseudo-states(#19191a, #1a1b1c); + color: #969696; + } } .command-panel .header { diff --git a/themes/atom-light-ui/atom.less b/themes/atom-light-ui/atom.less index 38c6e453d..f7685251d 100644 --- a/themes/atom-light-ui/atom.less +++ b/themes/atom-light-ui/atom.less @@ -1,5 +1,3 @@ -@import "bootstrap/less/mixins.less"; - html, body, #root-view { font: caption; @@ -26,13 +24,3 @@ html, body, .wrap-guide { background: rgba(150, 150, 150, 0.1); } - -.btn { - .btn-pseudo-states(#cbcbcb, #b3b3b3); - color: #444; - - &:hover, - &:focus { - color: #222; - } -} diff --git a/themes/atom-light-ui/command-panel.less b/themes/atom-light-ui/command-panel.less index abd189d79..e324224b3 100644 --- a/themes/atom-light-ui/command-panel.less +++ b/themes/atom-light-ui/command-panel.less @@ -1,8 +1,20 @@ +@import "bootstrap/less/mixins.less"; + .command-panel { background-color: #e5e5e5; border-top: 1px solid #979797; color: #ededed; padding: 10px; + + .btn { + .btn-pseudo-states(#cbcbcb, #b3b3b3); + color: #444; + + &:hover, + &:focus { + color: #222; + } + } } .command-panel .header {