From 179d9f2eb516e60709edeb074b596e048430672a Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Fri, 1 Jan 2016 13:40:24 +0100 Subject: [PATCH] refactor: Cleanup less files --- app/styles/app.less | 5 +++- app/styles/base.less | 54 -------------------------------------- app/styles/bootstrap.less | 1 - app/styles/typography.less | 50 +++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 56 deletions(-) create mode 100644 app/styles/typography.less diff --git a/app/styles/app.less b/app/styles/app.less index 60e6f18bb..2d37a6ac3 100644 --- a/app/styles/app.less +++ b/app/styles/app.less @@ -1,3 +1,6 @@ +@import "./variables"; @import "./bootstrap"; -@import "./base"; @import "../../node_modules/font-awesome/less/font-awesome"; + +@import "./base"; +@import "./typography"; diff --git a/app/styles/base.less b/app/styles/base.less index a5ecba4cc..9a3218ada 100644 --- a/app/styles/base.less +++ b/app/styles/base.less @@ -1,9 +1,3 @@ -/* - * Base structure - */ - -/* Move down content because we have a fixed navbar that is 50px tall */ - body { padding-top: 70px; font-size: 14px; @@ -12,52 +6,12 @@ body { font-family: Myriad Pro, "Helvetica Neue", Helvetica, Arial, sans-serif; } -/* - * IPFS stuff - */ - -/* titles */ -h1, h2, h3, h4, h5, h6 { - color: #586071; - text-transform: uppercase; - font-weight: 600; -} -h1 { - font-size: 24px; -} -h2 { - font-size: 20px; -} -h3 { - font-size: 18px; -} -h4 { - font-size: 16px; -} -h5 { - font-size: 14px; -} -h6 { - font-size: 12px; -} - -/* link */ -a { - color: #85dede; -} -a:hover, a:active, a:visited, a:focus { - color: #78c1c1; -} - /* header style */ .page-header { padding-bottom: 9px; margin: 0 0 20px; border: none !important; } -strong { - color: #7a8394; -} /* add it to all your text blocks */ .box { @@ -437,8 +391,6 @@ li.active a span.icon-log { } } - - p { margin: 0 0 4px; } @@ -549,7 +501,6 @@ p { } } - .webui-connection { margin-bottom: 6px; border-radius: 4px; @@ -716,11 +667,6 @@ p { } } -strong { - font-weight: 600; - color: #7a8394; -} - .globe-container { max-height: 500px; position: relative; diff --git a/app/styles/bootstrap.less b/app/styles/bootstrap.less index 4e5f5f7d0..4dac74896 100644 --- a/app/styles/bootstrap.less +++ b/app/styles/bootstrap.less @@ -1,5 +1,4 @@ // Core variables and mixins -@import "./variables"; @import "../../node_modules/bootstrap/less/mixins"; // Reset and dependencies diff --git a/app/styles/typography.less b/app/styles/typography.less new file mode 100644 index 000000000..fc123f2eb --- /dev/null +++ b/app/styles/typography.less @@ -0,0 +1,50 @@ +h1, +h2, +h3, +h4, +h5, +h6 { + color: #586071; + text-transform: uppercase; + font-weight: 600; +} + +h1 { + font-size: 24px; +} + +h2 { + font-size: 20px; +} + +h3 { + font-size: 18px; +} + +h4 { + font-size: 16px; +} + +h5 { + font-size: 14px; +} + +h6 { + font-size: 12px; +} + +a { + color: #85dede; + + &:hover, + &:active, + &:visited, + &:focus { + color: #78c1c1; + } +} + +strong { + color: #7a8394; + font-weight: 600; +}