From 221b3187a521a87611d9dbed2c96e3212d04e590 Mon Sep 17 00:00:00 2001 From: Derick Montague Date: Tue, 14 Apr 2020 16:10:24 -0500 Subject: Add motion guidelines - Update transition global variables in bootstrap to use Carbon motion easing and duration tokens to maintain consistency throughout the application - Remove import of colors helper file into variables and set import order based on dependency Signed-off-by: Derick Montague Change-Id: Ibd3fb9438ff236670e5523250d284b59411a7e53 --- src/assets/styles/bmc/_helpers.scss | 4 ++-- src/assets/styles/bmc/helpers/_variables.scss | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/assets/styles/bmc') diff --git a/src/assets/styles/bmc/_helpers.scss b/src/assets/styles/bmc/_helpers.scss index bec209be..217c90e7 100644 --- a/src/assets/styles/bmc/_helpers.scss +++ b/src/assets/styles/bmc/_helpers.scss @@ -1,3 +1,3 @@ @import "./helpers/colors"; -@import "./helpers/variables"; -@import "./helpers/motion"; \ No newline at end of file +@import "./helpers/motion"; +@import "./helpers/variables"; \ No newline at end of file diff --git a/src/assets/styles/bmc/helpers/_variables.scss b/src/assets/styles/bmc/helpers/_variables.scss index f59cfc1c..cbee2dfe 100644 --- a/src/assets/styles/bmc/helpers/_variables.scss +++ b/src/assets/styles/bmc/helpers/_variables.scss @@ -1,8 +1,9 @@ -@import "./colors"; - // Override Bootstrap Variables - node_modules/Bootstrap/scss/_variables.scss $enable-rounded: false; $enable-validation-icons: false; +$transition-base: all $duration--moderate-02 $standard-easing--productive; +$transition-fade: opacity $duration--moderate-01 $standard-easing--productive; +$transition-collapse: height $duration--slow-01 $standard-easing--expressive; // OpenBMC Custom Variables $responsive-layout-bp: lg; -- cgit v1.2.3