Skip to content
This repository has been archived by the owner on Dec 6, 2023. It is now read-only.

board - buttons and background positions fix #202

Merged
merged 1 commit into from
Nov 18, 2020
Merged

board - buttons and background positions fix #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/app/components/board/board.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<img src="../../../assets/paperType/ruled.png" alt="ruled">
</div>
<div class="box" (click)="addClearBackground()">

</div>
<div class="box" (click)="addMathPaper()">
<img class="img-scale" src="../../../assets/paperType/mathYellow.svg" alt="math">
Expand Down Expand Up @@ -215,13 +215,14 @@
<!-- Buttons -->
<li class="finalBtn">
<div class="btx">
<button class="btn btn-success" (click)="downloadAsJSON()">Save</button>
<button class="btn btn-danger">Exit</button>
<button class="btn btn-success btn-save" (click)="downloadAsJSON()">Save</button>
<button class="btn btn-danger btn-exit">Exit</button>
</div>
</li>
</ul>
</div>

<!-- main container for background -->
<div class="main">
<canvas #backgroundImage id="backgroundImage"></canvas>
<canvas #myCanvas id="my_canvas" class="canvasElement"></canvas>
Expand Down
31 changes: 25 additions & 6 deletions src/app/components/board/board.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


.sidebar{
position: fixed;
position: relative;
width: 200px;
height:100%;
// background: linear-gradient(to bottom, #33ccff 0%, #ff99cc 100%);
Expand All @@ -31,8 +31,9 @@
}

.finalBtn{
position: absolute;
position: relative;
bottom: 0px;
margin-top: 1rem;

.btx{
display: grid;
Expand All @@ -44,6 +45,23 @@
}
}

.btn-save {
box-shadow: 0 6px darken( #008000, 10%);
}
.btn-save:hover {
position: relative;
box-shadow: 0 4px darken(#008000, 10%);
top: 2px;
}
.btn-exit{
box-shadow: 0 6px darken( #DC143C, 10%);
}
.btn-exit:hover {
position: relative;
box-shadow: 0 4px darken(#DC143C, 10%);
top: 2px;
}

.page-buttons{
display:flexbox;
.btn-svg{
Expand Down Expand Up @@ -171,7 +189,8 @@
}

.main{
margin-left: 200px;
margin-left: 0px;
height: 100%;
}

.heading{
Expand All @@ -188,10 +207,10 @@
}

#backgroundImage{
position: absolute;
position: fixed;
}
#my_canvas{
position:absolute;
position: fixed;
}


Expand All @@ -204,4 +223,4 @@

.board-logo {
margin-bottom: 12px;
}
}