diff --git a/components/01_Atoms/input/_input.scss b/components/01_Atoms/input/_input.scss index 35bcdde..ff03425 100644 --- a/components/01_Atoms/input/_input.scss +++ b/components/01_Atoms/input/_input.scss @@ -11,11 +11,12 @@ padding: 8px; margin-bottom: $-margin-bottom; - &:focus, &:active{ + &:focus, &:active, &:invalid{ margin-bottom: $-margin-bottom - 1px; border-bottom: 2px solid $-wine-red; background-color: $-almost-white; - border-radius: 3px 3px 0 0; + border-radius: 3px 3px 0 0; + box-shadow: none; } } @@ -31,10 +32,6 @@ padding: 3px; position: relative; top: -$-margin-bottom; - - &:before{ - content: '* '; - } } &--error{ diff --git a/components/01_Atoms/link/_link.scss b/components/01_Atoms/link/_link.scss index b7bd75f..bdb3608 100644 --- a/components/01_Atoms/link/_link.scss +++ b/components/01_Atoms/link/_link.scss @@ -1,13 +1,13 @@ .LP-Link { color: $-grey; text-decoration: none; - font-family: $-primary-sans-serif-accent-font; + font-family: $-primary-sans-serif-font; &:hover { color: $-light-brown; } - .LP-Text{ - font-family: $-primary-sans-serif-accent-font; + .LP-Paragraph{ + font-family: $-primary-sans-serif-font; &:hover{ color: $-light-brown; } diff --git a/components/02_Molecules/navigation/_navigation.scss b/components/02_Molecules/navigation/_navigation.scss index a3398dc..df773c8 100644 --- a/components/02_Molecules/navigation/_navigation.scss +++ b/components/02_Molecules/navigation/_navigation.scss @@ -1,9 +1,10 @@ .LP-Menu{ + border-left: 1px solid $-light-brown; .LP-Menu__List { list-style-type: none; display: flex; flex-direction: row; - justify-content: space-between; + justify-content: space-around; padding: 0; margin: 0; } @@ -11,7 +12,6 @@ .LP-Menu__Item { padding: 15px 0; margin: 0; - width: 100px; text-align: center; background-color: transparent; } @@ -24,6 +24,24 @@ color: $-wine-red; } } + + &--sidebar{ + border: none; + min-width: 80px; + .LP-Menu__List{ + flex-direction: column; + + .LP-Menu__Item{ + text-align: left; + border-left: 1px solid $-light-brown; + margin-bottom: 10px; + + &:last-child{ + margin-bottom: 0; + } + } + } + } } @media(max-width: $-viewport-medium){ @@ -32,7 +50,11 @@ .LP-Menu__List{ display: flex; flex-direction: row; - justify-content: flex-start + justify-content: flex-start; + + .LP-Menu__Item{ + flex: 1 1 auto; + } } } } diff --git a/components/02_Molecules/navigation/navigation.config.json b/components/02_Molecules/navigation/navigation.config.json index 544b7b4..58fb85c 100644 --- a/components/02_Molecules/navigation/navigation.config.json +++ b/components/02_Molecules/navigation/navigation.config.json @@ -1,3 +1,11 @@ { - + "title": "Navigation", + "variants": [ + { + "name": "Sidebar", + "context":{ + "modifier": "--sidebar" + } + } + ] } \ No newline at end of file diff --git a/components/02_Molecules/navigation/navigation.hbs b/components/02_Molecules/navigation/navigation.hbs index 289825d..0f30891 100644 --- a/components/02_Molecules/navigation/navigation.hbs +++ b/components/02_Molecules/navigation/navigation.hbs @@ -1,4 +1,4 @@ -