hft-informatik/ubiquitous-computing-geo-timetracking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '41-frontend-design-adjustments' into 'master'

Browse Source 
Resolve "Frontend design adjustments"

Closes #41

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!18
This commit is contained in:
Tim Zieger 2020-04-21 12:47:30 +00:00
commit a077adb591
4 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/public/index.html
View File

@ -7,7 +7,7 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<body style="margin:0px">
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>

12
frontend/src/App.vue
View File

@ -3,7 +3,6 @@
<Header />
<router-view />
<Footer />
</div>
</template>
@ -22,15 +21,18 @@ export default {
<style scoped>
#app {
font-family: Avenir, Helvetica, Arial, sans-serif;
/* font-family: Avenir, Helvetica, Arial, sans-serif; */
font-family: 'Montserrat', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
background-color: #131313;
color: #f1f1f1f1;
}
#nav {
padding: 30px;
}
#nav a {

8
frontend/src/components/layout/Footer.vue
View File

@ -1,3 +1,4 @@
footer
<template>
<div class="footer">
<h3>Links</h3>
@ -15,14 +16,15 @@ name: "Footer"
<style scoped>
.footer {
background: #333;
color: #fff;
background: #272727;
color: #f1f1f1f1;
text-align: center;
padding: 10px;
}
.footer a {
color: #fff;
font-family: 'Montserrat', sans-serif;
color: #f1f1f1f1;
padding-right: 5px;
text-decoration: none;
}

42
frontend/src/components/layout/Header.vue
View File

@ -1,56 +1,42 @@
<template>
<div class="header">
<div>
<img alt="Vue logo" src="../../assets/logo.svg">
<img alt="Vue logo" src="../../assets/logo.svg">
</div>
<div>
<u><router-link to="/login">Login</router-link></u>
</div>
<u><router-link to="/login">Login</router-link></u>
</div>
</div>
</template>
<script>
export default {
name: "Header"
}
export default {
name: "Header"
}
</script>
<style scoped>
.header {
display: flex;
justify-content: space-between;
background: #333;
color: #fff;
display: flex;
justify-content: space-between;
background: #272727;
color: #f1f1f1f1;
padding: 10px;
}
.header a {
float: left;
color: #fff;
padding: 10px;
font-family: 'Montserrat', sans-serif;
color: #f1f1f1f1;
text-decoration: none;
}
.header img {
float: left;
height: 50px;
height: 60px;
width: auto;
padding: 10px;
padding: 5px;
}
.header p {
margin-left: 50%;
}
</style>