From a02f069690e6432c09804a779d818e2073c5d3e5 Mon Sep 17 00:00:00 2001 From: ivaosthu Date: Fri, 16 Sep 2016 21:44:44 +0200 Subject: [PATCH] We should just require the common.scss in out theme file --- .../src/theme/_config.scss | 92 +------------------ 1 file changed, 3 insertions(+), 89 deletions(-) diff --git a/packages/unleash-frontend-next/src/theme/_config.scss b/packages/unleash-frontend-next/src/theme/_config.scss index 118df95ed9..2b301c05f3 100644 --- a/packages/unleash-frontend-next/src/theme/_config.scss +++ b/packages/unleash-frontend-next/src/theme/_config.scss @@ -1,6 +1,8 @@ @import "~react-toolbox/lib/colors"; @import "~react-toolbox/lib/globals"; @import "~react-toolbox/lib/mixins"; +@import "~react-toolbox/lib/commons"; + $color-primary:$palette-blue-400; $color-primary-dark: $palette-blue-700; @@ -17,92 +19,4 @@ $navigation-drawer-max-desktop-width: 40 * $unit !default; $navigation-drawer-mobile-width: 5 * $standard-increment-mobile !default; // sass doesn't like use of variable here: calc(100% - $standard-increment-mobile); -$navigation-drawer-max-mobile-width: calc(100% - 5.6rem) !default; - -html { - font-size: 62.5%; -} - -body { - position: absolute; - width: 100%; - height: 100%; - padding: 0; - margin: 0; - font-family: Roboto, sans-serif; - font-size: 1.6rem; - -webkit-touch-callout: none; - * { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); - } -} - -a, abbr, address, article, aside, audio, b, blockquote, body, caption, cite, -code, dd, del, dfn, dialog, div, dl, dt, em, fieldset, figure, footer, form, h1, -h2, h3, h4, h5, h6, header, hgroup, hr, html, i, iframe, img, ins, kbd, label, -legend, li, mark, menu, nav, object, ol, p, pre, q, samp, section, small, span, -strong, sub, sup, table, tbody, td, tfoot, th, thead, time, tr, ul, var, video { - padding: 0; - margin: 0; - border: 0; - outline: 0; -} - -*, *:before, *:after { - box-sizing: border-box; - padding: 0; - margin: 0; -} - -h1, h2, h3, h4, h5, h6, label, p, button, abbr, a, span, small { - font-smoothing: antialiased; - -webkit-font-smoothing: antialiased; - text-size-adjust: 100%; -} - -a { - text-decoration: none; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} - -input:not([type="checkbox"]):not([type="radio"]), button { - outline: none; - appearance: none; - -webkit-touch-callout: none; - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); -} - -// -- Material design font sizes -h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { - @include typo-display-3($color-contrast: true); -} - -h1 { - @include typo-display-3; -} - -h2 { - @include typo-display-2; -} - -h3 { - @include typo-display-1; -} - -h4 { - @include typo-headline; -} - -h5 { - @include typo-title; -} - -h6 { - @include typo-subhead; -} - -p { - @include typo-body-1; -} - - +$navigation-drawer-max-mobile-width: calc(100% - 5.6rem) !default; \ No newline at end of file