Skip to content

Commit

Permalink
Реализован шаблон и стили калькулятора
Browse files Browse the repository at this point in the history
  • Loading branch information
TimewebAccount committed May 27, 2021
1 parent 1be4957 commit 21f22cb
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 73 deletions.
19 changes: 4 additions & 15 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
<template>
<div id="app">
<img alt="Vue logo" src="./assets/logo.png">
<HelloWorld msg="Welcome to Your Vue.js App"/>
<calc-view msg="Welcome to Your Vue.js App"/>
</div>
</template>

<script>
import HelloWorld from './components/HelloWorld.vue'
import CalcView from './components/CalcView.vue'
export default {
name: 'App',
components: {
HelloWorld
CalcView
}
}
</script>

<style>
#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;
}
</style>
88 changes: 88 additions & 0 deletions src/components/CalcView.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<template>
<div class="calculator">
<div class="result"></div>

<div class="pad">
<button class="clear">C</button>
<button>/</button>
<button>7</button>
<button>8</button>
<button>9</button>
<button>x</button>
<button>4</button>
<button>5</button>
<button>6</button>
<button>-</button>
<button>1</button>
<button>2</button>
<button>3</button>
<button>+</button>
<button class="zero">0</button>
<button class="equal">=</button>
</div>
</div>
</template>

<script>
export default {
name: 'HelloWorld',
props: {
msg: String
}
}
</script>

<style scoped>
.calculator {
--border-style: 2px solid black;
--border-radius: 4px;
border: var(--border-style);
border-radius: var(--border-radius);
max-width: 350px;
}
.result {
font-size: 42px;
width: 100%;
height: 70px;
box-sizing: border-box;
display: grid;
padding: 10px;
justify-items: end;
align-items: center;
border-bottom: var(--border-radius);
}
.pad {
display: grid;
grid-template-columns: repeat(4, minmax(60px, 1fr));
grid-gap: 10px;
padding: 15px;
}
button {
cursor: pointer;
font-size: 20px;
display: grid;
padding: 15px 10px;
justify-items: center;
align-items: center;
border: var(--border-style);
border-radius: var(--border-radius);
background: lightgray;
}
.clear {
background: lightblue;
grid-column: 1/4;
}
.zero {
grid-column: 1/4;
}
.equal {
background: lightgreen;
}
</style>
58 changes: 0 additions & 58 deletions src/components/HelloWorld.vue

This file was deleted.

0 comments on commit 21f22cb

Please sign in to comment.