Commander1024/lostplaces-frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Commander1024:6f3fb3850f5a3c84f74034ba664b2f594d6cf8e8
Branches Tags
Commander1024:master
Commander1024:linklist-add
..
compare: Commander1024:ad17e48049bbfea462d74e2c7af2f7131d9ee226
Branches Tags
Commander1024:master
Commander1024:linklist-add

No commits in common. "6f3fb3850f5a3c84f74034ba664b2f594d6cf8e8" and "ad17e48049bbfea462d74e2c7af2f7131d9ee226" have entirely different histories.
6f3fb3850f ... ad17e48049

7 changed files with 35 additions and 112 deletions
Show Stats Expand all files Collapse all files

6
components/01_Atoms/link/_link.scss
View File

@ -1,13 +1,13 @@
.LP-Link { .LP-Link {
color: $-grey; color: $-grey;
text-decoration: none; text-decoration: none;
font-family: $-primary-sans-serif-font; font-family: $-primary-sans-serif-accent-font;
&:hover { &:hover {
color: $-light-brown; color: $-light-brown;
} }
.LP-Paragraph{ .LP-Text{
font-family: $-primary-sans-serif-font; font-family: $-primary-sans-serif-accent-font;
&:hover{ &:hover{
color: $-light-brown; color: $-light-brown;
} }

28
components/02_Molecules/navigation/_navigation.scss
View File

@ -1,10 +1,9 @@
.LP-Menu{ .LP-Menu{
border-left: 1px solid $-light-brown;
.LP-Menu__List { .LP-Menu__List {
list-style-type: none; list-style-type: none;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-around; justify-content: space-between;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
@ -12,6 +11,7 @@
.LP-Menu__Item { .LP-Menu__Item {
padding: 15px 0; padding: 15px 0;
margin: 0; margin: 0;
width: 100px;
text-align: center; text-align: center;
background-color: transparent; background-color: transparent;
} }
@ -24,24 +24,6 @@
color: $-wine-red; 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){ @media(max-width: $-viewport-medium){
@ -50,11 +32,7 @@
.LP-Menu__List{ .LP-Menu__List{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start
.LP-Menu__Item{
flex: 1 1 auto;
}
} }
} }
} }

10
components/02_Molecules/navigation/navigation.config.json
View File

@ -1,11 +1,3 @@
{ {
"title": "Navigation",
"variants": [
{
"name": "Sidebar",
"context":{
"modifier": "--sidebar"
}
}
]
} }

2
components/02_Molecules/navigation/navigation.hbs
View File

@ -1,4 +1,4 @@
<nav class="LP-Menu LP-Menu{{modifier}}"> <nav class="LP-Menu">
<ul class="LP-Menu__List"> <ul class="LP-Menu__List">
<li class="LP-Menu__Item">{{> @link text='Home'}}</li> <li class="LP-Menu__Item">{{> @link text='Home'}}</li>
<li class="LP-Menu__Item">{{> @link text='About'}}</li> <li class="LP-Menu__Item">{{> @link text='About'}}</li>

18
components/03_Organisms/header/_header.scss
View File

@ -5,17 +5,12 @@
margin-bottom: 70px; margin-bottom: 70px;
height: 60px; height: 60px;
&__Navigation{
flex-grow: 2;
}
&__Logo { &__Logo {
height: 60px; height: 60px;
margin: 25px; margin: 25px;
object-fit:cover; object-fit:cover;
max-height: 100%; max-height: 100%;
overflow: hidden; overflow: hidden;
flex-shrink: 0;
.LP-Image{ .LP-Image{
height: 60px; height: 60px;
@ -23,19 +18,6 @@
} }
} }
.LP-Header__UserInformation{
margin-right: 3%;
.LP-Paragraph{
font-family: $-primary-sans-serif-font;
white-space: nowrap;
}
.LP-Link{
margin: 0 3px;
padding: 4px 4px;
}
}
@media(max-width: $-viewport-medium){ @media(max-width: $-viewport-medium){
.LP-Header__Logo{ .LP-Header__Logo{
width: 60px; width: 60px;

5
components/03_Organisms/header/header.hbs
View File

@ -2,11 +2,6 @@
<div class="LP-Header__Logo"> <div class="LP-Header__Logo">
{{> @image source='/images/logo.png'}} {{> @image source='/images/logo.png'}}
</div> </div>
<div class="LP-Header__UserInformation">
<span class="LP-Paragraph">
Hi there!{{> @link url="#" text="Login"}} or {{> @link url="#" text="Sign up"}}
</span>
</div>
<div class="LP-Header__Navigation"> <div class="LP-Header__Navigation">
{{> @navigation}} {{> @navigation}}
</div> </div>

78
public/components.css
View File

@ -9,12 +9,12 @@
.LP-Link { .LP-Link {
color: #565656; color: #565656;
text-decoration: none; text-decoration: none;
font-family: Montserrat, Helvetica, sans-serif; } font-family: Roboto, Arial, sans-serif; }
.LP-Link:hover { .LP-Link:hover {
color: #C09F80; } color: #C09F80; }
.LP-Link .LP-Paragraph { .LP-Link .LP-Text {
font-family: Montserrat, Helvetica, sans-serif; } font-family: Roboto, Arial, sans-serif; }
.LP-Link .LP-Paragraph:hover { .LP-Link .LP-Text:hover {
color: #C09F80; } color: #C09F80; }
.LP-Link__IconWrapper { .LP-Link__IconWrapper {
@ -229,45 +229,33 @@
.LP-TagList .LP-TagList__List .LP-TagList__Item { .LP-TagList .LP-TagList__List .LP-TagList__Item {
margin: 6px; } margin: 6px; }
.LP-Menu { .LP-Menu .LP-Menu__List {
border-left: 1px solid #C09F80; } list-style-type: none;
.LP-Menu .LP-Menu__List { display: flex;
list-style-type: none; flex-direction: row;
display: flex; justify-content: space-between;
flex-direction: row; padding: 0;
justify-content: space-around; margin: 0; }
padding: 0;
margin: 0; } .LP-Menu .LP-Menu__Item {
.LP-Menu .LP-Menu__Item { padding: 15px 0;
padding: 15px 0; margin: 0;
margin: 0; width: 100px;
text-align: center; text-align: center;
background-color: transparent; } background-color: transparent; }
.LP-Menu .LP-Link__Text {
color: #565656; .LP-Menu .LP-Link__Text {
font-weight: bold; color: #565656;
text-shadow: 0px 0px 20px white; } font-weight: bold;
.LP-Menu .LP-Link__Text:hover { text-shadow: 0px 0px 20px white; }
color: #76323F; } .LP-Menu .LP-Link__Text:hover {
.LP-Menu--sidebar { color: #76323F; }
border: none;
min-width: 80px; }
.LP-Menu--sidebar .LP-Menu__List {
flex-direction: column; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item {
text-align: left;
border-left: 1px solid #C09F80;
margin-bottom: 10px; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:last-child {
margin-bottom: 0; }
@media (max-width: 750px) { @media (max-width: 750px) {
.LP-Menu .LP-Menu__List { .LP-Menu .LP-Menu__List {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; } justify-content: flex-start; } }
.LP-Menu .LP-Menu__List .LP-Menu__Item {
flex: 1 1 auto; } }
@media (max-width: 450px) { @media (max-width: 450px) {
.LP-Menu .LP-Menu__List { .LP-Menu .LP-Menu__List {
@ -279,27 +267,15 @@
justify-content: space-between; justify-content: space-between;
margin-bottom: 70px; margin-bottom: 70px;
height: 60px; } height: 60px; }
.LP-Header__Navigation {
flex-grow: 2; }
.LP-Header__Logo { .LP-Header__Logo {
height: 60px; height: 60px;
margin: 25px; margin: 25px;
object-fit: cover; object-fit: cover;
max-height: 100%; max-height: 100%;
overflow: hidden; overflow: hidden; }
flex-shrink: 0; }
.LP-Header__Logo .LP-Image { .LP-Header__Logo .LP-Image {
height: 60px; } height: 60px; }
.LP-Header__UserInformation {
margin-right: 3%; }
.LP-Header__UserInformation .LP-Paragraph {
font-family: Montserrat, Helvetica, sans-serif;
white-space: nowrap; }
.LP-Header__UserInformation .LP-Link {
margin: 0 3px;
padding: 4px 4px; }
@media (max-width: 750px) { @media (max-width: 750px) {
.LP-Header__Logo { .LP-Header__Logo {
width: 60px; } width: 60px; }