From 59f51eb25b39275f70cdabb956907bb5ab9788c4 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Tue, 3 Sep 2013 17:32:28 -0700 Subject: [PATCH] Move utility block classes to the base css --- static/utilities.less | 28 ++++++++++++++++++++++++++++ themes/neue-dark-ui/blocks.less | 23 ----------------------- themes/neue-dark-ui/package.cson | 1 - themes/neue-dark-ui/utilities.less | 4 ---- 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 themes/neue-dark-ui/blocks.less diff --git a/static/utilities.less b/static/utilities.less index c2391f25b..25a62006b 100644 --- a/static/utilities.less +++ b/static/utilities.less @@ -1,3 +1,5 @@ +@import "ui-variables"; + :focus { outline: none; } @@ -6,3 +8,29 @@ margin-left: auto; margin-right: auto; } + +.padded { + padding: @component-padding; +} + +.block { + display: block; + margin-bottom: @component-padding; +} +div > .block:last-child { + margin-bottom: 0; +} + +.inline-block, .inline-block-tight { + display: inline-block; + vertical-align: middle; +} +.inline-block { + margin-right: @component-padding; +} +.inline-block-tight { + margin-right: @component-padding/2; +} +div > .inline-block:last-child, div > .inline-block-tight:last-child { + margin-right: 0; +} diff --git a/themes/neue-dark-ui/blocks.less b/themes/neue-dark-ui/blocks.less deleted file mode 100644 index 71c6cfbb1..000000000 --- a/themes/neue-dark-ui/blocks.less +++ /dev/null @@ -1,23 +0,0 @@ -@import "ui-variables"; - -.block { - display: block; - margin-bottom: @component-padding; -} -div > .block:last-child { - margin-bottom: 0; -} - -.inline-block, .inline-block-tight { - display: inline-block; - vertical-align: middle; -} -.inline-block { - margin-right: @component-padding; -} -.inline-block-tight { - margin-right: @component-padding/2; -} -div > .inline-block:last-child, div > .inline-block-tight:last-child { - margin-right: 0; -} diff --git a/themes/neue-dark-ui/package.cson b/themes/neue-dark-ui/package.cson index 16405b452..1639db51e 100644 --- a/themes/neue-dark-ui/package.cson +++ b/themes/neue-dark-ui/package.cson @@ -2,7 +2,6 @@ 'atom' 'utilities' 'text' - 'blocks' 'git' 'sites' 'icons' diff --git a/themes/neue-dark-ui/utilities.less b/themes/neue-dark-ui/utilities.less index 16524ce2f..feb882fbf 100644 --- a/themes/neue-dark-ui/utilities.less +++ b/themes/neue-dark-ui/utilities.less @@ -1,10 +1,6 @@ @import "ui-mixins"; @import "ui-variables"; -.padded { - padding: @component-padding; -} - .key-binding { background: -webkit-linear-gradient( rgba(100, 100, 100, 0.5),