Skip to content

Commit

Permalink
asdasd
Browse files Browse the repository at this point in the history
  • Loading branch information
salomonelli committed May 19, 2017
1 parent b30117c commit 61b87c7
Show file tree
Hide file tree
Showing 11 changed files with 638 additions and 66 deletions.
13 changes: 12 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ module.exports = {
// allow async-await
'generator-star-spacing': 0,
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
'quotes': [
'error',
'single'
],
'semi': [
'error',
'always'
],
'no-console': 'off',
'curly': ['error', 'multi-or-nest'],
'no-var': 'error'
}
}
Binary file removed old/public/github.png
Binary file not shown.
Binary file removed old/public/suitcase.png
Binary file not shown.
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
},
"dependencies": {
"font-awesome": "^4.7.0",
"material-design-icons": "^3.0.1",
"material-icons": "^0.1.0",
"roboto-fontface": "^0.7.0",
"vue": "^2.2.6",
"vue-router": "^2.3.1"
},
Expand Down
35 changes: 27 additions & 8 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<template>
<div id="app">
<img src="./assets/logo.png">
<router-view></router-view>
<div class="page">
<router-view></router-view>
</div>
</div>
</template>

Expand All @@ -12,12 +13,30 @@ export default {
</script>

<style>
@import '../node_modules/roboto-fontface/css/roboto/roboto-fontface.css';
@import '../node_modules/font-awesome/css/font-awesome.css';
@import '../node_modules/material-design-icons/iconfont/material-icons.css';
#app {
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
text-align: center;
color: #2c3e50;
margin-top: 60px;
overflow-x: hidden;
background: #CCCCCC;
margin: 0;
padding: 0;
-webkit-print-color-adjust: exact;
box-sizing: border-box;
}
.page {
background: white;
position: relative;
width: 21cm;
height: 29.7cm;
display: block;
page-break-after: auto;
overflow: hidden;
}
body{
padding: 0;
margin: 0;
overflow-x: hidden;
}
</style>
Binary file removed src/assets/logo.png
Binary file not shown.
Binary file added src/assets/person.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 0 additions & 53 deletions src/components/Hello.vue

This file was deleted.

Loading

0 comments on commit 61b87c7

Please sign in to comment.