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

Compare commits

base: Commander1024:93341886d6cf6a33671b5e37bbd6be30de6274d6
Branches Tags
Commander1024:master
Commander1024:linklist-add
...
compare: Commander1024:cf5e804e50f0853e27ab7ea853321eb5c646beba
Branches Tags
Commander1024:master
Commander1024:linklist-add

13 Commits
93341886d6 ... cf5e804e50

Author SHA1 Message Date
reverend
cf5e804e50 Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-04 23:48:00 +02:00
reverend
0ca397071a uff 2020-08-04 23:47:51 +02:00
reverend
ba56976420 zam rumfrickelei 2020-08-04 23:47:39 +02:00
reverend
8f2e607b61 Styling sidebar navigation 2020-08-04 23:47:14 +02:00
reverend
8c412db0e9 Reseting of html, body 2020-08-04 23:46:44 +02:00
Commander1024
43def15caa Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-04 23:41:19 +02:00
Commander1024
0ad042487f Changed otf font references by correct ttf ones. 2020-08-04 23:41:15 +02:00
Commander1024
9e061f9566 Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-04 20:00:44 +02:00
Commander1024
f469520885 Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-02 23:12:25 +02:00
Commander1024
fa5cf10104 Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-02 23:03:24 +02:00
Commander1024
76e8a64a2e Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-02 09:22:03 +02:00
Commander1024
f1dcbc19db Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend 2020-08-01 11:09:00 +02:00
Commander1024
f898b49d05 Ignored npm package-lock file as it is a uniqe to each system. 2020-08-01 11:04:26 +02:00
11 changed files with 112 additions and 5706 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
package-lock.json
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

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

@ -30,22 +30,30 @@
}
&--sidebar{
border: none;
min-width: 80px;
border-top: 1px solid $-light-brown;
min-width: 60px;
background-color: $-almost-white;
height: 100%;
.LP-Menu__List{
margin-left: 25px;
margin-top: 25px;
flex-direction: column;
.LP-Menu__Item{
text-align: left;
border-left: 1px solid $-light-brown;
margin-bottom: 10px;
padding: 5px;
padding-left: 25px;
&:last-child{
margin-bottom: 0;
}
.LP-Link:hover{
background-color: $-almost-white;
&:hover{
border-left: 2px solid $-light-brown;
position: relative;
background-color: $-beige;
left: -2px;
}
}

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

@ -1,24 +1,27 @@
$-logo-height: 45px;
.LP-Header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 70px;
height: 60px;
box-shadow: 0 0 2px $-light-brown;
&__Navigation{
flex-grow: 2;
}
&__Logo {
height: 60px;
height: $-logo-height;
margin: 25px;
object-fit:cover;
max-height: 100%;
width: 225px;
overflow: hidden;
flex-shrink: 0;
.LP-Image{
height: 60px;
height: 100%;
}
}
}
@ -38,7 +41,7 @@
@media(max-width: $-viewport-medium){
.LP-Header__Logo{
width: 60px;
width: $-logo-height;
.LP-Image{
object-position: 0 0;
object-fit: cover;

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

@ -7,7 +7,4 @@
Hi there!{{> @link url="#" text="Login"}} or {{> @link url="#" text="Sign up"}}
</span>
</div>
<div class="LP-Header__Navigation">
{{> @navigation}}
</div>
</header>

22
components/05_Pages/_pages.scss Normal file
View File

@ -0,0 +1,22 @@
$-sidebar-width: 250px;
.LP-Main{
display: flex;
flex-direction: row-reverse;
height: calc(100% - 61px);
.LP-Main__Content{
flex-grow: 1;
width: calc(100% -300px);
min-height: 1px;
}
.LP-Main__Navigation{
flex-shrink: 0;
width: $-sidebar-width;
flex-grow: 0;
height: 100%;
}
}
@import 'placeDetail/placeDetail';

0
components/05_Pages/placeDetail/_placeDetail.scss Normal file
View File

1
components/05_Pages/placeDetail/placeDetail.config.json Normal file
View File

@ -0,0 +1 @@
{}

9
components/05_Pages/placeDetail/placeDetail.hbs Normal file
View File

@ -0,0 +1,9 @@
{{> @header}}
<article class="LP-Main">
<section class="LP-Main__Content">
</section>
<section class="LP-Main__Navigation">
{{> @navigation modifier='--sidebar'}}
</section>
</article>

19
components/components.scss
View File

@ -10,9 +10,9 @@
@font-face {
font-family: Montserrat;
src:
url('fonts/Montserrat/Montserrat-Regular.otf'),
url('fonts/Montserrat/Montserrat-Bold.otf'),
url('fonts/Montserrat/Montserrat-Italic.otf')
url('fonts/Montserrat/Montserrat-Regular.ttf'),
url('fonts/Montserrat/Montserrat-Bold.ttf'),
url('fonts/Montserrat/Montserrat-Italic.ttf')
;
}
@ -31,8 +31,19 @@ $-viewport-extra-small: 450px;
$-viewport-medium: 750px;
$-viewport-normal: 1000px;
html{
height:100%;
margin: 0;
padding: 0;
}
body{
height: 100%;
margin: 0;
}
@import '01_Atoms/atoms';
@import '02_Molecules/molecules';
@import '03_Organisms/organisms';
@import '04_Templates/templates';
@import '04_Templates/templates';
@import '05_Pages/pages';

5678
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

56
public/components.css
View File

@ -4,7 +4,16 @@
@font-face {
font-family: Montserrat;
src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); }
src: url("fonts/Montserrat/Montserrat-Regular.ttf"), url("fonts/Montserrat/Montserrat-Bold.ttf"), url("fonts/Montserrat/Montserrat-Italic.ttf"); }
html {
height: 100%;
margin: 0;
padding: 0; }
body {
height: 100%;
margin: 0; }
.LP-Link {
color: #565656;
@ -252,18 +261,26 @@
.LP-Menu .LP-Link__Text:hover {
color: #76323F; }
.LP-Menu--sidebar {
border: none;
min-width: 80px; }
border-top: 1px solid #C09F80;
min-width: 60px;
background-color: #f9f9f9;
height: 100%; }
.LP-Menu--sidebar .LP-Menu__List {
margin-left: 25px;
margin-top: 25px;
flex-direction: column; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item {
text-align: left;
border-left: 1px solid #C09F80;
margin-bottom: 10px; }
margin-bottom: 10px;
padding: 5px;
padding-left: 25px; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:last-child {
margin-bottom: 0; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item .LP-Link:hover {
background-color: #f9f9f9; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:hover {
border-left: 2px solid #C09F80;
position: relative;
background-color: #D7CEC7;
left: -2px; }
@media (max-width: 750px) {
.LP-Menu:not(.LP-Menu--sidebar) .LP-Menu__List {
@ -281,19 +298,20 @@
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 70px;
height: 60px; }
height: 60px;
box-shadow: 0 0 2px #C09F80; }
.LP-Header__Navigation {
flex-grow: 2; }
.LP-Header__Logo {
height: 60px;
height: 45px;
margin: 25px;
object-fit: cover;
max-height: 100%;
width: 225px;
overflow: hidden;
flex-shrink: 0; }
.LP-Header__Logo .LP-Image {
height: 60px; }
height: 100%; }
.LP-Header__UserInformation {
margin-right: 3%; }
@ -306,7 +324,7 @@
@media (max-width: 750px) {
.LP-Header__Logo {
width: 60px; }
width: 45px; }
.LP-Header__Logo .LP-Image {
object-position: 0 0;
object-fit: cover; } }
@ -496,3 +514,17 @@
height: auto;
margin: 0;
padding: 0; } }
.LP-Main {
display: flex;
flex-direction: row-reverse;
height: calc(100% - 61px); }
.LP-Main .LP-Main__Content {
flex-grow: 1;
width: calc(100% -300px);
min-height: 1px; }
.LP-Main .LP-Main__Navigation {
flex-shrink: 0;
width: 250px;
flex-grow: 0;
height: 100%; }