Shuffle around styles to better organize around net new code and bulma overrides

This commit is contained in:
Michael Lange
2017-12-19 14:00:45 -08:00
parent 54e083538e
commit c65fff82ca
6 changed files with 46 additions and 46 deletions

View File

@@ -12,6 +12,7 @@
@import "./components/loading-spinner";
@import "./components/metrics";
@import "./components/node-status-light";
@import "./components/page-layout";
@import "./components/simple-list";
@import "./components/status-text";
@import "./components/timeline";

View File

@@ -1,8 +1,3 @@
html, body, body > .ember-view {
height: 100%;
width: 100%;
}
.page-layout {
height: 100%;
display: flex;

View File

@@ -1,47 +1,14 @@
// Utils
@import "./utils/reset.scss";
@import "./utils/z-indices";
@import "./utils/product-colors";
@import "./utils/bumper";
// Start with Bulma variables as a foundation
@import "bulma/sass/utilities/initial-variables";
// Override variables where appropriate
@import "./utils/product-colors";
$orange: #fa8e23;
$green: #2eb039;
$blue: $vagrant-blue;
$purple: $terraform-purple;
$red: #c84034;
$grey-blue: #bbc4d1;
$primary: $nomad-green;
$warning: $orange;
$warning-invert: $white;
$danger: $red;
$dark: #234;
$radius: 2px;
$body-size: 14px;
$title-size: 1.75rem;
$size-5: 1.15rem;
$size-4: 1.3rem;
$size-7: 0.85rem;
$title-weight: $weight-semibold;
$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
$text: $black;
$header-height: 112px;
$gutter-width: 250px;
$icon-dimensions: 1.25rem;
$icon-dimensions-small: 1rem;
$icon-dimensions-medium: 1.5rem;
$icon-dimensions-large: 2.5rem;
@import "./core/variables.scss";
// Bring in the rest of Bulma
@import "bulma/bulma";
@@ -64,7 +31,3 @@ $icon-dimensions-large: 2.5rem;
@import "./core/tag";
@import "./core/title";
@import "./core/typography";
// Add unique core extensions
@import "./core/page-layout";
@import "./core/bumper";

View File

@@ -0,0 +1,35 @@
$orange: #fa8e23;
$green: #2eb039;
$blue: $vagrant-blue;
$purple: $terraform-purple;
$red: #c84034;
$grey-blue: #bbc4d1;
$primary: $nomad-green;
$warning: $orange;
$warning-invert: $white;
$danger: $red;
$dark: #234;
$radius: 2px;
$body-size: 14px;
$title-size: 1.75rem;
$size-5: 1.15rem;
$size-4: 1.3rem;
$size-7: 0.85rem;
$title-weight: $weight-semibold;
$family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
$text: $black;
$header-height: 112px;
$gutter-width: 250px;
$icon-dimensions: 1.25rem;
$icon-dimensions-small: 1rem;
$icon-dimensions-medium: 1.5rem;
$icon-dimensions-large: 2.5rem;

View File

@@ -0,0 +1,6 @@
html,
body,
body > .ember-view {
height: 100%;
width: 100%;
}