Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[K7] Create global_styles dir with sub-directories. #12833

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 0 additions & 112 deletions ui_framework/components/_variables.scss

This file was deleted.

3 changes: 3 additions & 0 deletions ui_framework/components/global_styles/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import 'reset/index';
@import 'variables/index';
@import 'mixins/index';
1 change: 1 addition & 0 deletions ui_framework/components/global_styles/mixins/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'naming';
1 change: 1 addition & 0 deletions ui_framework/components/global_styles/reset/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "reset";
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Animations

$globalAnimSlightBounce: cubic-bezier(0.34,1.61,0.7,1);
$globalAnimSlightResistance: cubic-bezier(0.694, 0.0482, 0.335, 1);
$globalAnimSpeedVeryFast: 90ms;
$globalAnimSpeedFast: 150ms;
$globalAnimSpeedNormal: 250ms;
$globalAnimSpeedSlow: 350ms;
$globalAnimSpeedVerySlow: 500ms;
6 changes: 6 additions & 0 deletions ui_framework/components/global_styles/variables/_borders.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Borders

$globalBorderColor: $globalColorLightGray;
$globalBorderRadius: 4px;
$globalBorderThick: 2px solid $globalBorderColor;
$globalBorderThin: 1px solid $globalBorderColor;
49 changes: 49 additions & 0 deletions ui_framework/components/global_styles/variables/_colors.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// True colors

$globalColorBlue: #0079a5;
$globalColorTeal: #00A69B;
$globalColorRed: #A30000;
$globalColorLightestGray: #F5F5F5;
$globalColorLightGray: #D9D9D9;
$globalColorMediumGray: #999;
$globalColorDarkGray: #666;
$globalColorDarkestGray: #3F3F3F;
$globalColorBlack: #000;
$globalColorWhite: #FFF;

// Normal colors

$globalTextColor: #2d2d2d;
$globalLinkColor: $globalColorBlue;
$globalLinkColor-isHover: darken($globalLinkColor, 10%);
$globalInputTextColor: $globalTextColor;
$globalInputBackgroundColor: $globalColorWhite;
$globalInputBorderColor: $globalColorLightGray;

// Dark theme colors

$globalTextColor--darkTheme: #cecece;
$globalBackgroundColor--darkTheme: #777777;
$globalLinkColor--darkTheme: #b7e2ea;
$globalLinkColor-isHover--darkTheme: #def2f6;
$globalInputTextColor--darkTheme: $globalTextColor--darkTheme;
$globalInputBackgroundColor--darkTheme: #444444;
$globalInputBorderColor--darkTheme: $globalInputBackgroundColor--darkTheme;

// Colors

$globalInfoColor: #3fa8c7;
$globalInactiveColor: #c3c3c3;
$globalSuccessColor: #417505;
$globalWarningColor: #ec9800;
$globalDangerColor: $globalColorRed;
$globalFocusColor: $globalColorBlue;
$globalFocusDangerColor: #ff523c;
$globalFocusWarningColor: #ffa500;
$globalFocusBackgroundColor: #ffffff;
$globalFontColor: #191E23;
$globalSubduedTextColor: $globalColorDarkGray;
$globalLinkHoverColor: #006E8A;
$globalSelectedBorderColor: $globalColorBlue;
$globalDangerBorderColor: $globalDangerColor;
$globalFormControlBorderColor: #DEDEDE;
9 changes: 9 additions & 0 deletions ui_framework/components/global_styles/variables/_font.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Font

$globalFontFamily: "Open Sans", Helvetica, Arial, sans-serif;
$globalFontSize: 14px;
$globalLineHeight: 1.5;
$globalSubTextFontSize: 12px;
$globalTitleFontSize: 18px;
$globalFontWeightRegular: 400;
$globalFontWeightBold: 700;
15 changes: 15 additions & 0 deletions ui_framework/components/global_styles/variables/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// --------------------------------------------------------------------------------------
// KUI global variables
// --------------------------------------------------------------------------------------
// This module contains all global variables available within kui. Every variable in this
// document should be prefixed with $global. This lets us know where the variable is
// coming from when looking inside the individual component files. Any component local
// variables should be declared at the top of those documents prefixed with $componentName.

@import 'colors';
@import 'font';
@import 'timing';
@import 'borders';
@import 'shadows';
@import 'z_index';
@import 'animations';
3 changes: 3 additions & 0 deletions ui_framework/components/global_styles/variables/_shadows.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Shadows

$globalBoxShadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1);
3 changes: 3 additions & 0 deletions ui_framework/components/global_styles/variables/_timing.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Timing

$globalInputTransitionTiming: 0.1s linear;
Empty file.
7 changes: 2 additions & 5 deletions ui_framework/components/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
// When possible, if making changes to those legacy components, please think about
// instead adding them to this library and deprecating that dependency.


// Global constants
@import "variables";
@import "mixins";
@import "common_styles";
// Global styles
@import "global_styles/index"

// Components
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../../variables";

.guidePage {
display: flex;
flex: 1 0 auto;
Expand Down