Skip to content

Commit

Permalink
Merge pull request #1 from kulapio/improve-ui
Browse files Browse the repository at this point in the history
Improve UI
  • Loading branch information
totiz authored Jul 22, 2019
2 parents fbd7091 + 3f560b4 commit 0db3fab
Show file tree
Hide file tree
Showing 20 changed files with 2,818 additions and 2,387 deletions.
4,482 changes: 2,243 additions & 2,239 deletions package-lock.json

Large diffs are not rendered by default.

Binary file added public/bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 21 additions & 31 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
<template>
<div id="app">
<div id="nav">
<router-link to="/">Home</router-link>
<div class="left">
<Sidebar/>
</div>
<div class="right">
<router-view/>
</div>
<router-link to="/">
<img src="@/assets/img/logo/kulap-bakery-logo.jpg"
srcset="@/assets/img/logo/[email protected] 2x,
@/assets/img/logo/[email protected] 3x"
class="kulap-bakery-logo">
</router-link>
<router-view/>
<Footer/>
</div>
</template>

<script>
import Footer from '@/components/Footer'
import Sidebar from '@/components/Sidebar'
export default {
name: 'App',
components: {
Footer
Sidebar
}
}
</script>
Expand All @@ -30,27 +25,22 @@ export default {
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
max-height: 100vh;
}
#nav {
padding: 30px;
}
#nav a {
font-weight: bold;
color: #2c3e50;
}
#nav a.router-link-exact-active {
color: #42b983;
}
.header-image {
height: 70px;
cursor: pointer;
.left {
float: left;
width: 226px;
}
.kulap-bakery-logo {
width: 279px;
height: 157px;
object-fit: contain;
margin-bottom: 20px;
.right {
float: left;
width: calc(100vw - 226px);
height: 100vh;
padding: 1.5rem;
overflow: auto;
background-image: url("/bg.jpg");
background-position: center;
background-repeat: no-repeat;
background-size: cover;
}
</style>
3 changes: 3 additions & 0 deletions src/assets/img/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/libra/icon-libra.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/libra/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/libra/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/assets/img/sidebar-item/breakfast.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/assets/img/sidebar-item/coffee.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/assets/img/sidebar-item/munchies.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0db3fab

Please sign in to comment.