From ae006e0ec37aa1a17c38cf5d4e058c13f1b4b0cf Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Fri, 1 Jan 2016 13:34:52 +0100 Subject: [PATCH 1/2] refactor: Integrate bootstrap less directly This will allow for easier modification and styling of bootstrap variables --- app/scripts/{main.js => app.js} | 2 + app/scripts/routes.js | 2 - app/scripts/views/config.js | 4 +- app/styles/app.less | 3 + app/styles/base.less | 363 ++++++++++++- app/styles/bootstrap.less | 50 ++ app/styles/bundle.less | 362 ------------- app/styles/variables.less | 869 ++++++++++++++++++++++++++++++++ webpack.config.js | 2 +- 9 files changed, 1289 insertions(+), 368 deletions(-) rename app/scripts/{main.js => app.js} (92%) create mode 100644 app/styles/app.less create mode 100644 app/styles/bootstrap.less delete mode 100644 app/styles/bundle.less create mode 100644 app/styles/variables.less diff --git a/app/scripts/main.js b/app/scripts/app.js similarity index 92% rename from app/scripts/main.js rename to app/scripts/app.js index f5de66a78..12b11cd9f 100644 --- a/app/scripts/main.js +++ b/app/scripts/app.js @@ -3,6 +3,8 @@ import ReactDOM from 'react-dom' import Router from 'react-router' import routes from './routes' +require('../styles/app.less') + if (process.env.NODE_ENV !== 'production') { window.uiDebug = require('debug') } diff --git a/app/scripts/routes.js b/app/scripts/routes.js index 1ae6d7846..987ef9aab 100644 --- a/app/scripts/routes.js +++ b/app/scripts/routes.js @@ -12,8 +12,6 @@ import ConfigPage from './pages/config' import LogPage from './pages/logs' import NotFoundPage from './pages/notfound' -require('../styles/bundle.less') - export default ( diff --git a/app/scripts/views/config.js b/app/scripts/views/config.js index cfd8c1da9..181c0add2 100644 --- a/app/scripts/views/config.js +++ b/app/scripts/views/config.js @@ -11,7 +11,7 @@ export default React.createClass({ getInitialState: function () { return { - body: JSON.stringify(this.props.config, null, '\t'), + body: JSON.stringify(this.props.config, null, ' '), error: null, saving: false, saved: false @@ -20,7 +20,7 @@ export default React.createClass({ reset: function () { this.setState({ - body: JSON.stringify(this.props.config, null, '\t'), + body: JSON.stringify(this.props.config, null, ' '), error: null }) }, diff --git a/app/styles/app.less b/app/styles/app.less new file mode 100644 index 000000000..60e6f18bb --- /dev/null +++ b/app/styles/app.less @@ -0,0 +1,3 @@ +@import "./bootstrap"; +@import "./base"; +@import "../../node_modules/font-awesome/less/font-awesome"; diff --git a/app/styles/base.less b/app/styles/base.less index e4609330f..a5ecba4cc 100644 --- a/app/styles/base.less +++ b/app/styles/base.less @@ -13,7 +13,7 @@ body { } /* - * TPFS stuff + * IPFS stuff */ /* titles */ @@ -436,3 +436,364 @@ li.active a span.icon-log { border-radius: 50%; } } + + + +p { + margin: 0 0 4px; +} + +.box { + margin-bottom: 40px; +} + +.clear { + clear: both; + height: 10px; +} + +.copier { + outline: none; + color: #aaa; +} +.copier:focus { + outline: none; +} +.copier.disabled { + color: #ccc; + text-decoration: none; +} + +.btn:focus { + outline: none !important; +} + +.navbar-left { + + > .form-group { + > input { + width: 350px; + background-color: #555; + color: #ddd; + border: #aaa; + } + } + button { + padding: 7px 16px; + margin-left: 4px; + } +} + +.webui-address { + font-size: 12px; + word-wrap: break-word; + + -ms-word-break: break-all; + word-break: break-all; + /* Non standard for webkit */ + word-break: break-word; +} + +.webui-idbanner { + margin: 10px 0px 30px; + padding: 15px 0px; + background-color: #f5f5f5; +} + +.webui-swarm-vis { + img { + width: 100%; + } +} + +.webui-file { + a {color: inherit;} + + .type { + display: inline-block; + padding: 6px 6px 4px; + text-transform: uppercase; + font-weight: 600; + font-size: 11px; + border: 1px solid #dedede; + border-radius: 3px; + line-height: 0.5em; + } + .action-cell { + width: 150px; + .separator { + display: inline-block; + margin: 0 10px; + } + } + .id-cell { + width: 55%; + min-width: 422px; + } +} +.webui-file:hover { + a {color: #78c1c1;} +} + +.links-panel { + margin: 8px; +} + +.links-panel > .filelist { + margin-bottom: 0px; +} + +.filelist.filelist-names-hidden { + .filelist-name { + display: none; + } +} + + +.webui-connection { + margin-bottom: 6px; + border-radius: 4px; + padding: 2px 6px; + + h4 { + font-weight: bold; + } + .box { + border: none; + margin-bottom: inherit; + } + button.btn-link { + text-align: left; + padding: 6px; + width: 100%; + outline: none; + color: #498D96; + > strong { + color: #498D96; + } + > i.fa { + position: absolute; + right: 12px; + top: 22px; + color: #ddd; + font-size: 25px; + } + } +} +.webui-connection.active, +.webui-connection.active:active, +.webui-connection.active:focus, +.webui-connection.active:hover { + color: inherit; + background-color: #fff; + border-color: #ddd; + button.btn-link { + i.fa:before { + content: "\f106"; + } + } +} + +.webui-peer { + .addresses { + p { + margin: 8px 0; + } + } + .pubkey-copy { + .copier { + float: right; + size: 0.8em; + position: relative; + top: -1em; + } + } +} + +.textarea-panel, +.panel-inner { + background: none; + border: none; + width: 100%; + height: 100%; + font-family: monospace; + resize:none; +} + +.webui-config { + textarea { + color: #444; + } + .controls { + .btn { + margin-left: 5px; + } + } +} + +.webui-config-item { + word-wrap: break-word; +} + +.webui-editable { + z-index: -1; +} +.webui-editable-input { + z-index: 30; +} + +.padded { + padding: 14px 16px; +} + +.webui-version { + position: relative; + top: 23px; + left: -10px; +} + +.webui-object { + >.row { + position: relative; + } + .link-buttons { + position: absolute; + right: 0; + top: 0; + > a { + color: #fff; + } + > .btn { + margin-left: 5px; + } + } + .data { + height: 480px; + } +} + +.dht-graph { + .outer { + fill: transparent; + stroke: #555; + stroke-width: 12px; + } + + .node { + fill: #d55; + cursor: pointer; + } + + .link { + fill: transparent; + stroke: rgba(0,0,0,0.5); + stroke-width: 3px; + } + + .label { + font-family: sans-serif; + fill: #6bd; + } +} + +.centered { + margin-left: auto; + margin-right: auto; +} + +.textarea-panel { + background: #f2f6fd; + width: auto; + overflow-x: scroll; + overflow-y: auto; + + textarea { + font-size: 1em; + padding: 14px 20px; + margin: 0 auto; + display: block; + overflow-y: hidden; + } +} + +strong { + font-weight: 600; + color: #7a8394; +} + +.globe-container { + max-height: 500px; + position: relative; + .theme-toggle { + position: absolute; + top: 0; + right: 0; + cursor:pointer; + } +} + +.file-add-container { + text-align: center; + padding: 42px; + border: 1px dashed #ccc; + margin: 20px 0; + height: 190px; + position: relative; + .file-add-container-inner { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: -10; + } + .file-add-container-inner.hover { + background: #f2f6fd; + } + .file-add-target { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 10; + } + button.add-file { + z-index: 20; + position: relative; + } +} + +.webui-dag { + .path { + .col-xs-11 { + padding-right: 5px; + } + } + >.row { + margin-bottom: 40px; + } + .go { + display: block; + width: 100%; + } +} + +.webui-logs { + position: relative; + + .actions { + position: absolute; + right: 0; + top: 12px; + padding-right: 10px; + } + + button { + margin-right: 5px; + } + + .textarea-panel { + height: 600px; + } +} diff --git a/app/styles/bootstrap.less b/app/styles/bootstrap.less new file mode 100644 index 000000000..4e5f5f7d0 --- /dev/null +++ b/app/styles/bootstrap.less @@ -0,0 +1,50 @@ +// Core variables and mixins +@import "./variables"; +@import "../../node_modules/bootstrap/less/mixins"; + +// Reset and dependencies +@import "../../node_modules/bootstrap/less/normalize"; +@import "../../node_modules/bootstrap/less/print"; +@import "../../node_modules/bootstrap/less/glyphicons"; + +// Core CSS +@import "../../node_modules/bootstrap/less/scaffolding"; +@import "../../node_modules/bootstrap/less/type"; +@import "../../node_modules/bootstrap/less/code"; +@import "../../node_modules/bootstrap/less/grid"; +@import "../../node_modules/bootstrap/less/tables"; +@import "../../node_modules/bootstrap/less/forms"; +@import "../../node_modules/bootstrap/less/buttons"; + +// Components +@import "../../node_modules/bootstrap/less/component-animations"; +@import "../../node_modules/bootstrap/less/dropdowns"; +@import "../../node_modules/bootstrap/less/button-groups"; +@import "../../node_modules/bootstrap/less/input-groups"; +@import "../../node_modules/bootstrap/less/navs"; +@import "../../node_modules/bootstrap/less/navbar"; +@import "../../node_modules/bootstrap/less/breadcrumbs"; +@import "../../node_modules/bootstrap/less/pagination"; +@import "../../node_modules/bootstrap/less/pager"; +@import "../../node_modules/bootstrap/less/labels"; +@import "../../node_modules/bootstrap/less/badges"; +@import "../../node_modules/bootstrap/less/jumbotron"; +@import "../../node_modules/bootstrap/less/thumbnails"; +@import "../../node_modules/bootstrap/less/alerts"; +@import "../../node_modules/bootstrap/less/progress-bars"; +@import "../../node_modules/bootstrap/less/media"; +@import "../../node_modules/bootstrap/less/list-group"; +@import "../../node_modules/bootstrap/less/panels"; +@import "../../node_modules/bootstrap/less/responsive-embed"; +@import "../../node_modules/bootstrap/less/wells"; +@import "../../node_modules/bootstrap/less/close"; + +// Components w/ JavaScript +@import "../../node_modules/bootstrap/less/modals"; +@import "../../node_modules/bootstrap/less/tooltip"; +@import "../../node_modules/bootstrap/less/popovers"; +@import "../../node_modules/bootstrap/less/carousel"; + +// Utility classes +@import "../../node_modules/bootstrap/less/utilities"; +@import "../../node_modules/bootstrap/less/responsive-utilities"; diff --git a/app/styles/bundle.less b/app/styles/bundle.less deleted file mode 100644 index 8c6b6f623..000000000 --- a/app/styles/bundle.less +++ /dev/null @@ -1,362 +0,0 @@ -@import "../../node_modules/bootstrap/less/bootstrap.less"; -@import "./base.less"; -@import "../../node_modules/font-awesome/less/font-awesome.less"; - -p { - margin: 0 0 4px; -} - -.box { - margin-bottom: 40px; -} - -.clear { - clear: both; - height: 10px; -} - -.copier { - outline: none; - color: #aaa; -} -.copier:focus { - outline: none; -} -.copier.disabled { - color: #ccc; - text-decoration: none; -} - -.btn:focus { - outline: none !important; -} - -.navbar-left { - - > .form-group { - > input { - width: 350px; - background-color: #555; - color: #ddd; - border: #aaa; - } - } - button { - padding: 7px 16px; - margin-left: 4px; - } -} - -.webui-address { - font-size: 12px; - word-wrap: break-word; - - -ms-word-break: break-all; - word-break: break-all; - /* Non standard for webkit */ - word-break: break-word; -} - -.webui-idbanner { - margin: 10px 0px 30px; - padding: 15px 0px; - background-color: #f5f5f5; -} - -.webui-swarm-vis { - img { - width: 100%; - } -} - -.webui-file { - a {color: inherit;} - - .type { - display: inline-block; - padding: 6px 6px 4px; - text-transform: uppercase; - font-weight: 600; - font-size: 11px; - border: 1px solid #dedede; - border-radius: 3px; - line-height: 0.5em; - } - .action-cell { - width: 150px; - .separator { - display: inline-block; - margin: 0 10px; - } - } - .id-cell { - width: 55%; - min-width: 422px; - } -} -.webui-file:hover { - a {color: #78c1c1;} -} - -.links-panel { - margin: 8px; -} - -.links-panel > .filelist { - margin-bottom: 0px; -} - -.filelist.filelist-names-hidden { - .filelist-name { - display: none; - } -} - - -.webui-connection { - margin-bottom: 6px; - border-radius: 4px; - padding: 2px 6px; - - h4 { - font-weight: bold; - } - .box { - border: none; - margin-bottom: inherit; - } - button.btn-link { - text-align: left; - padding: 6px; - width: 100%; - outline: none; - color: #498D96; - > strong { - color: #498D96; - } - > i.fa { - position: absolute; - right: 12px; - top: 22px; - color: #ddd; - font-size: 25px; - } - } -} -.webui-connection.active, -.webui-connection.active:active, -.webui-connection.active:focus, -.webui-connection.active:hover { - color: inherit; - background-color: #fff; - border-color: #ddd; - button.btn-link { - i.fa:before { - content: "\f106"; - } - } -} - -.webui-peer { - .addresses { - p { - margin: 8px 0; - } - } - .pubkey-copy { - .copier { - float: right; - size: 0.8em; - position: relative; - top: -1em; - } - } -} - -.textarea-panel, -.panel-inner { - background: none; - border: none; - width: 100%; - height: 100%; - font-family: monospace; - resize:none; -} - -.webui-config { - textarea { - color: #444; - } - .controls { - .btn { - margin-left: 5px; - } - } -} - -.webui-config-item { - word-wrap: break-word; -} - -.webui-editable { - z-index: -1; -} -.webui-editable-input { - z-index: 30; -} - -.padded { - padding: 14px 16px; -} - -.webui-version { - position: relative; - top: 23px; - left: -10px; -} - -.webui-object { - >.row { - position: relative; - } - .link-buttons { - position: absolute; - right: 0; - top: 0; - > a { - color: #fff; - } - > .btn { - margin-left: 5px; - } - } - .data { - height: 480px; - } -} - -.dht-graph { - .outer { - fill: transparent; - stroke: #555; - stroke-width: 12px; - } - - .node { - fill: #d55; - cursor: pointer; - } - - .link { - fill: transparent; - stroke: rgba(0,0,0,0.5); - stroke-width: 3px; - } - - .label { - font-family: sans-serif; - fill: #6bd; - } -} - -.centered { - margin-left: auto; - margin-right: auto; -} - -.textarea-panel { - background: #f2f6fd; - width: auto; - overflow-x: scroll; - overflow-y: auto; - - textarea { - font-size: 1em; - padding: 14px 20px; - margin: 0 auto; - display: block; - overflow-y: hidden; - } -} - -strong { - font-weight: 600; - color: #7a8394; -} - -.globe-container { - max-height: 500px; - position: relative; - .theme-toggle { - position: absolute; - top: 0; - right: 0; - cursor:pointer; - } -} - -.file-add-container { - text-align: center; - padding: 42px; - border: 1px dashed #ccc; - margin: 20px 0; - height: 190px; - position: relative; - .file-add-container-inner { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: -10; - } - .file-add-container-inner.hover { - background: #f2f6fd; - } - .file-add-target { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 10; - } - button.add-file { - z-index: 20; - position: relative; - } -} - -.webui-dag { - .path { - .col-xs-11 { - padding-right: 5px; - } - } - >.row { - margin-bottom: 40px; - } - .go { - display: block; - width: 100%; - } -} - -.webui-logs { - position: relative; - - .actions { - position: absolute; - right: 0; - top: 12px; - padding-right: 10px; - } - - button { - margin-right: 5px; - } - - .textarea-panel { - height: 600px; - } -} diff --git a/app/styles/variables.less b/app/styles/variables.less new file mode 100644 index 000000000..b057ef5bf --- /dev/null +++ b/app/styles/variables.less @@ -0,0 +1,869 @@ +// +// Variables +// -------------------------------------------------- + + +//== Colors +// +//## Gray and brand colors for use across Bootstrap. + +@gray-base: #000; +@gray-darker: lighten(@gray-base, 13.5%); // #222 +@gray-dark: lighten(@gray-base, 20%); // #333 +@gray: lighten(@gray-base, 33.5%); // #555 +@gray-light: lighten(@gray-base, 46.7%); // #777 +@gray-lighter: lighten(@gray-base, 93.5%); // #eee + +@brand-primary: darken(#428bca, 6.5%); // #337ab7 +@brand-success: #5cb85c; +@brand-info: #5bc0de; +@brand-warning: #f0ad4e; +@brand-danger: #d9534f; + + +//== Scaffolding +// +//## Settings for some of the most global styles. + +//** Background color for ``. +@body-bg: #fff; +//** Global text color on ``. +@text-color: @gray-dark; + +//** Global textual link color. +@link-color: @brand-primary; +//** Link hover color set via `darken()` function. +@link-hover-color: darken(@link-color, 15%); +//** Link hover decoration. +@link-hover-decoration: underline; + + +//== Typography +// +//## Font, line-height, and color for body text, headings, and more. + +@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; +@font-family-serif: Georgia, "Times New Roman", Times, serif; +//** Default monospace fonts for ``, ``, and `
`.
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:        @font-family-sans-serif;
+
+@font-size-base:          14px;
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5:            @font-size-base;
+@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base:        1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the ``.
+@headings-font-family:    inherit;
+@headings-font-weight:    500;
+@headings-line-height:    1.1;
+@headings-color:          inherit;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path:          "../fonts/";
+//** File name for all font files.
+@icon-font-name:          "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id:        "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical:     6px;
+@padding-base-horizontal:   12px;
+
+@padding-large-vertical:    10px;
+@padding-large-horizontal:  16px;
+
+@padding-small-vertical:    5px;
+@padding-small-horizontal:  10px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for ``s and ``s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;
+
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                #f5f5f5;
+@table-bg-active:               @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color:            #ddd;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight:                normal;
+
+@btn-default-color:              #333;
+@btn-default-bg:                 #fff;
+@btn-default-border:             #ccc;
+
+@btn-primary-color:              #fff;
+@btn-primary-bg:                 @brand-primary;
+@btn-primary-border:             darken(@btn-primary-bg, 5%);
+
+@btn-success-color:              #fff;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             darken(@btn-success-bg, 5%);
+
+@btn-info-color:                 #fff;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                darken(@btn-info-bg, 5%);
+
+@btn-warning-color:              #fff;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             darken(@btn-warning-bg, 5%);
+
+@btn-danger-color:               #fff;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              darken(@btn-danger-bg, 5%);
+
+@btn-link-disabled-color:        @gray-light;
+
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base:         @border-radius-base;
+@btn-border-radius-large:        @border-radius-large;
+@btn-border-radius-small:        @border-radius-small;
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+@input-bg:                       #fff;
+//** `` background color
+@input-bg-disabled:              @gray-lighter;
+
+//** Text color for ``s
+@input-color:                    @gray;
+//** `` border color
+@input-border:                   #ccc;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on ``s in CSS.
+@input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus:             #66afe9;
+
+//** Placeholder text color
+@input-color-placeholder:        #999;
+
+//** Default `.form-control` height
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
+@legend-color:                   @gray-dark;
+@legend-border-color:            #e5e5e5;
+
+//** Background color for textual input addons
+@input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:            #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color:      darken(@gray-dark, 5%);
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg:         #f5f5f5;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color:     @component-active-color;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg:        @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color:   @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color:          @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color:           #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar:            1000;
+@zindex-dropdown:          1000;
+@zindex-popover:           1060;
+@zindex-tooltip:           1070;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs:                  480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min:              @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone:               @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm:                  768px;
+@screen-sm-min:              @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet:              @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md:                  992px;
+@screen-md-min:              @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop:             @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg:                  1200px;
+@screen-lg-min:              @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop:          @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max:              (@screen-sm-min - 1);
+@screen-sm-max:              (@screen-md-min - 1);
+@screen-md-max:              (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns:              12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width:         30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint:     @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet:             (720px + @grid-gutter-width);
+//** For `@screen-sm-min` and up.
+@container-sm:                 @container-tablet;
+
+// Medium screen / desktop
+@container-desktop:            (940px + @grid-gutter-width);
+//** For `@screen-md-min` and up.
+@container-md:                 @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop:      (1140px + @grid-gutter-width);
+//** For `@screen-lg-min` and up.
+@container-lg:                 @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height:                    50px;
+@navbar-margin-bottom:             @line-height-computed;
+@navbar-border-radius:             @border-radius-base;
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
+
+@navbar-default-color:             #777;
+@navbar-default-bg:                #f8f8f8;
+@navbar-default-border:            darken(@navbar-default-bg, 6.5%);
+
+// Navbar links
+@navbar-default-link-color:                #777;
+@navbar-default-link-hover-color:          #333;
+@navbar-default-link-hover-bg:             transparent;
+@navbar-default-link-active-color:         #555;
+@navbar-default-link-active-bg:            darken(@navbar-default-bg, 6.5%);
+@navbar-default-link-disabled-color:       #ccc;
+@navbar-default-link-disabled-bg:          transparent;
+
+// Navbar brand label
+@navbar-default-brand-color:               @navbar-default-link-color;
+@navbar-default-brand-hover-color:         darken(@navbar-default-brand-color, 10%);
+@navbar-default-brand-hover-bg:            transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg:           #ddd;
+@navbar-default-toggle-icon-bar-bg:        #888;
+@navbar-default-toggle-border-color:       #ddd;
+
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color:                      lighten(@gray-light, 15%);
+@navbar-inverse-bg:                         #222;
+@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color:                 lighten(@gray-light, 15%);
+@navbar-inverse-link-hover-color:           #fff;
+@navbar-inverse-link-hover-bg:              transparent;
+@navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
+@navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-link-disabled-color:        #444;
+@navbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color:                @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color:          #fff;
+@navbar-inverse-brand-hover-bg:             transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg:            #333;
+@navbar-inverse-toggle-icon-bar-bg:         #fff;
+@navbar-inverse-toggle-border-color:        #333;
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding:                          10px 15px;
+@nav-link-hover-bg:                         @gray-lighter;
+
+@nav-disabled-link-color:                   @gray-light;
+@nav-disabled-link-hover-color:             @gray-light;
+
+//== Tabs
+@nav-tabs-border-color:                     #ddd;
+
+@nav-tabs-link-hover-border-color:          @gray-lighter;
+
+@nav-tabs-active-link-hover-bg:             @body-bg;
+@nav-tabs-active-link-hover-color:          @gray;
+@nav-tabs-active-link-hover-border-color:   #ddd;
+
+@nav-tabs-justified-link-border-color:            #ddd;
+@nav-tabs-justified-active-link-border-color:     @body-bg;
+
+//== Pills
+@nav-pills-border-radius:                   @border-radius-base;
+@nav-pills-active-link-hover-bg:            @component-active-bg;
+@nav-pills-active-link-hover-color:         @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color:                     @link-color;
+@pagination-bg:                        #fff;
+@pagination-border:                    #ddd;
+
+@pagination-hover-color:               @link-hover-color;
+@pagination-hover-bg:                  @gray-lighter;
+@pagination-hover-border:              #ddd;
+
+@pagination-active-color:              #fff;
+@pagination-active-bg:                 @brand-primary;
+@pagination-active-border:             @brand-primary;
+
+@pagination-disabled-color:            @gray-light;
+@pagination-disabled-bg:               #fff;
+@pagination-disabled-border:           #ddd;
+
+
+//== Pager
+//
+//##
+
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
+@pager-border-radius:                  15px;
+
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
+
+@pager-disabled-color:                 @pagination-disabled-color;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
+@jumbotron-bg:                   @gray-lighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size:    ceil((@font-size-base * 4.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text:             #3c763d;
+@state-success-bg:               #dff0d8;
+@state-success-border:           darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text:                #31708f;
+@state-info-bg:                  #d9edf7;
+@state-info-border:              darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text:             #8a6d3b;
+@state-warning-bg:               #fcf8e3;
+@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);
+
+@state-danger-text:              #a94442;
+@state-danger-bg:                #f2dede;
+@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width:           200px;
+//** Tooltip text color
+@tooltip-color:               #fff;
+//** Tooltip background color
+@tooltip-bg:                  #000;
+@tooltip-opacity:             .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
+@tooltip-arrow-color:         @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg:                          #fff;
+//** Popover maximum width
+@popover-max-width:                   276px;
+//** Popover border color
+@popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color:       #ccc;
+
+//** Popover title background color
+@popover-title-bg:                    darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width:                 10px;
+//** Popover arrow color
+@popover-arrow-color:                 @popover-bg;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg:            @gray-light;
+//** Primary label background color
+@label-primary-bg:            @brand-primary;
+//** Success label background color
+@label-success-bg:            @brand-success;
+//** Info label background color
+@label-info-bg:               @brand-info;
+//** Warning label background color
+@label-warning-bg:            @brand-warning;
+//** Danger label background color
+@label-danger-bg:             @brand-danger;
+
+//** Default label text color
+@label-color:                 #fff;
+//** Default text color of a linked label
+@label-link-hover-color:      #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding:         15px;
+
+//** Padding applied to the modal title
+@modal-title-padding:         15px;
+//** Modal title line-height
+@modal-title-line-height:     @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg:                             #fff;
+//** Modal content border color
+@modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color:          #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity:      .5;
+//** Modal header border color
+@modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color:   @modal-header-border-color;
+
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding:               15px;
+@alert-border-radius:         @border-radius-base;
+@alert-link-font-weight:      bold;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
+@alert-warning-bg:            @state-warning-bg;
+@alert-warning-text:          @state-warning-text;
+@alert-warning-border:        @state-warning-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg:                 #f5f5f5;
+//** Progress bar text color
+@progress-bar-color:          #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
+
+//** Default progress bar color
+@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg:        @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 #fff;
+//** `.list-group-item` border color
+@list-group-border:             #ddd;
+//** List group border radius
+@list-group-border-radius:      @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list items
+@list-group-active-color:       @component-active-color;
+//** Background color of active list items
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg:                    #fff;
+@panel-body-padding:          15px;
+@panel-heading-padding:       10px 15px;
+@panel-footer-padding:        @panel-heading-padding;
+@panel-border-radius:         @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border:          #ddd;
+@panel-footer-bg:             #f5f5f5;
+
+@panel-default-text:          @gray-dark;
+@panel-default-border:        #ddd;
+@panel-default-heading-bg:    #f5f5f5;
+
+@panel-primary-text:          #fff;
+@panel-primary-border:        @brand-primary;
+@panel-primary-heading-bg:    @brand-primary;
+
+@panel-success-text:          @state-success-text;
+@panel-success-border:        @state-success-border;
+@panel-success-heading-bg:    @state-success-bg;
+
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
+@panel-warning-text:          @state-warning-text;
+@panel-warning-border:        @state-warning-border;
+@panel-warning-heading-bg:    @state-warning-bg;
+
+@panel-danger-text:           @state-danger-text;
+@panel-danger-border:         @state-danger-border;
+@panel-danger-heading-bg:     @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding:           4px;
+//** Thumbnail background color
+@thumbnail-bg:                @body-bg;
+//** Thumbnail border color
+@thumbnail-border:            #ddd;
+//** Thumbnail border radius
+@thumbnail-border-radius:     @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding:   9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg:                     #f5f5f5;
+@well-border:                 darken(@well-bg, 7%);
+
+
+//== Badges
+//
+//##
+
+@badge-color:                 #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color:      #fff;
+@badge-bg:                    @gray-light;
+
+//** Badge text color in active nav link
+@badge-active-color:          @link-color;
+//** Badge background color in active nav link
+@badge-active-bg:             #fff;
+
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical:   8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 #f5f5f5;
+//** Breadcrumb text color
+@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      #fff;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
+
+@carousel-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
+
+@carousel-caption-color:                      #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight:           bold;
+@close-color:                 #000;
+@close-text-shadow:           0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@kbd-color:                   #fff;
+@kbd-bg:                      #333;
+
+@pre-bg:                      #f5f5f5;
+@pre-color:                   @gray-dark;
+@pre-border-color:            #ccc;
+@pre-scrollable-max-height:   340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+//** Text muted color
+@text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color:           @gray-light;
+//** Headings small color
+@headings-small-color:        @gray-light;
+//** Blockquote small color
+@blockquote-small-color:      @gray-light;
+//** Blockquote font size
+@blockquote-font-size:        (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color:     @gray-lighter;
+//** Page header border color
+@page-header-border-color:    @gray-lighter;
+//** Width of horizontal description list titles
+@dl-horizontal-offset:        @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint:    @grid-float-breakpoint;
+//** Horizontal line color.
+@hr-border:                   @gray-lighter;
diff --git a/webpack.config.js b/webpack.config.js
index 1649c99d3..c9f0b5fd2 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,7 @@
 var createConfig = require('hjs-webpack')
 
 var config = createConfig({
-  in: './app/scripts/main.js',
+  in: './app/scripts/app.js',
   out: 'dist',
   html: function (ctx) {
     return ctx.defaultTemplate({

From 179d9f2eb516e60709edeb074b596e048430672a Mon Sep 17 00:00:00 2001
From: dignifiedquire 
Date: Fri, 1 Jan 2016 13:40:24 +0100
Subject: [PATCH 2/2] 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;
+}