Skip to content

Galina_calculator #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
galina-al wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Galina_calculator #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
432ba43
Add sort in java
galina-al Feb 11, 2018
b3db9dd
Merge remote-tracking branch 'https/master'
galina-al Feb 14, 2018
8ba37ac
Add calculator
galina-al Feb 14, 2018
7a0ef55
Add calculator
galina-al Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions homework/2-calculator/galina_al/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
*{
margin: 0;
padding: 0;
}

body{
background-color: #22b2ec;
font-family: 'Indie Flower', cursive;
font-family: 'Lato', sans-serif;
font-family: 'Montserrat', sans-serif;
font-family: 'Dosis', sans-serif;
font-family: 'BioRhyme Expanded', serif;
font-family: 'Titillium Web', sans-serif;
font-family: 'Nunito', sans-serif;
}

.main{
height: 100vh;
width: 100%;
display: flex;
justify-content: center;

}
.container{
width: 20%;
margin: auto;
box-shadow: 0px 45px 40px -30px rgba(0, 0, 0, .3);
}

.output{
padding: 15px;
background-color: #4b5665;
text-align: right;
border-top-right-radius: 10px;
border-top-left-radius: 10px;
}

.calculation{
font-size: 1.2rem;
color: #adb5b8;
font-weight: 100;
}

.total{
padding-top: 5px;
font-size: 2.5rem;
color: white;
font-weight: bold;
}

.keyboard{
width: 100%;
table-layout: fixed;
text-align: center;
border: 1px solid transparent;
border-collapse: collapse;
background-color: white;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
text-transform: uppercase;
}

td{
padding: 10px;
border-bottom: 1px solid #f2f2f2;
}

td:not(:last-child){
border-right: 1px solid #f2f2f2;
}

.fifth td{
border-bottom: 0px;
}

td.operation{
font-size: 1.7rem;
color: #54656C;
font-weight: 400;
}

td.number{
font-size: 1.5rem;
color: #adb5b8;
font-weight: 100;
}


63 changes: 63 additions & 0 deletions homework/2-calculator/galina_al/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Colculator</title>
<link rel="stylesheet" type="text/css" href="index.css">
<link href="https://fonts.googleapis.com/css?family=BioRhyme+Expanded:200|Dosis|Indie+Flower|Lato|Montserrat|Nunito:200|Titillium+Web" rel="stylesheet">
<body>
<div class="main">
<div class="container">
<div class="output">
<div class="calculation">
<p>4x12=</p>
</div>
<div class="total">
<p>48</p>
</div>
</div>
<div >
<table class="keyboard">
<tr>
<td class="operation">AC</td>
<td class="operation">(</td>
<td class="operation">)</td>
<td class="operation">%</td>
</tr>

<tr>
<td class="number">7</td>
<td class="number">8</td>
<td class="number">9</td>
<td class="operation">&divide;</td>
</tr>

<tr>
<td class="number">4</td>
<td class="number">5</td>
<td class="number">6</td>
<td class="operation">&times;</td>
</tr>

<tr>
<td class="number">1</td>
<td class="number">2</td>
<td class="number">3</td>
<td class="operation">-</td>
</tr>

<tr class="fifth">
<td class="number">,</td>
<td class="number">0</td>
<td class="number">=</td>
<td class="operation">+</td>
</tr>

</table>
</div>

</div>
</div>

</body>
</html>
15 changes: 15 additions & 0 deletions sorting/java_sort.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
public static int[] sort(int[] mas){
int min, tmp;
for (int i = 0; i < mas.length - 1; i++) {
min = i;
for(int next = i+1; next < mas.length; next++){
if( mas[next] < mas[min]){
min = next;
}
}
tmp = mas[min];
mas[min] = mas[i];
mas[i] = tmp;
}
return mas;
}