feat #114 - Remove border from styleguide

dassana-io · Oct 15, 2020 · 737a783 · 737a783
1 parent 55f9666
commit 737a783
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/components/Input/utils.ts b/src/components/Input/utils.ts
@@ -4,7 +4,7 @@ import {
 } from 'components/assets/styles/styleguide'
 import { themedStyles, ThemeType } from 'components/assets/styles/themes'
 
-const { border, borderRadius } = styleguide
+const { borderRadius } = styleguide
 
 export const generateInputStyles = (themeType: ThemeType) => {
 	const { base, disabled, error, focus, hover, placeholder } = themedStyles[
@@ -23,7 +23,6 @@ export const generateInputStyles = (themeType: ThemeType) => {
 			'&:hover': {
 				borderColor: hover.borderColor
 			},
-
 			backgroundColor: base.backgroundColor,
 			borderColor: base.borderColor,
 			borderRadius,
@@ -46,8 +45,7 @@ export const generateInputSkeletonStyles = (themeType: ThemeType) => {
 	const { loading } = themedStyles[themeType]
 
 	return {
-		border,
-		borderColor: loading.borderColor,
+		border: `1px solid ${loading.borderColor}`,
 		borderRadius,
 		padding: '6px 14px'
 	}

diff --git a/src/components/assets/styles/styleguide.ts b/src/components/assets/styles/styleguide.ts
@@ -1,6 +1,5 @@
 import colors from './colors'
 
-const border = '1px solid'
 const borderRadius = 4
 
 export const defaultFieldWidth = '300px'
@@ -18,7 +17,6 @@ export const fieldErrorStyles = {
 }
 
 export const styleguide = {
-	border,
 	borderRadius,
 	colors,
 	font: {