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

12
frontend/src/App.vue
View File

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

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

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

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

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