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

Commit

Permalink
v0.1 final changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vailorium
Vailorium committed Dec 29, 2020
1 parent 1b63690 commit c41e57c
Show file tree
Hide file tree
Showing 14 changed files with 245 additions and 45 deletions.
27 changes: 16 additions & 11 deletions dist/main-es2015.js
View file

Large diffs are not rendered by default.

32 changes: 21 additions & 11 deletions dist/main-es5.js
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions dist/styles.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/app/app.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<p>v{{version}}</p>
<div class="footer_buttons">
<button mat-button (click)="openContributionsDialog()">Contributions</button>
<button mat-button><a href="https://discord.gg/z9YSeEqzg4" target="_blank"><img src="assets/ui/discord.png" alt="Discord"></a></button>
<button mat-button (click)="openDiscordLink()"><a><img src="assets/ui/discord.png" alt="Discord"></a></button>
<button mat-button (click)="openReportBugDialog()">Report a Bug / Provide Feedback</button>
</div>
</footer>
45 changes: 28 additions & 17 deletions src/app/app.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,31 @@ header {
margin-left: 10px;
}
}
// a{
// $padding: 10px;
// user-select: none;
// text-decoration: none;
// color: white;
// font-family: 'roboto', 'sans-serif';
// height: 50px;
// line-height: 50px - ($padding * 2);
// padding: 10px;
// padding-left: 25px;
// padding-right: 25px;
// box-sizing: border-box;
// display: inline-block;
// &:hover{
// background-color: rgba(255, 255, 255, 0.158);
// }
// }

@media only screen and (max-width: 600px){
footer{
position: initial;
padding: 0;
align-items: initial;
height: auto;
p{
display: none;
}
.footer_buttons{
width: 100%;
flex-wrap: wrap;
button{
height: 50px;
width: 100%;
margin-left: 0px;
a{
width: 100%;
img{
height: 36px;
margin-top: 7px;
}
}
}
}
}
}
4 changes: 4 additions & 0 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,8 @@ export class AppComponent {
contributions.afterClosed().subscribe(() => {contributions = null;});
}

openDiscordLink(){
window.open("https://discord.gg/z9YSeEqzg4", "_blank");
}

}
49 changes: 45 additions & 4 deletions src/app/pages/ar-builder/ar-builder-heroes-dialog/ar-builder-heroes-dialog.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,59 @@ mat-button-toggle div{
display: flex;
flex-wrap: wrap;
div{
height: 50px;
width: 50px;
height: 45px;
width: 45px;
margin: 3px;
img{
height: 50px;
width: 50px;
height: 45px;
width: 45px;
// box-sizing: border-box;
}
}
}
}

@media only screen and (max-width: 600px){
mat-button-toggle{
height: 35px;
width: 35px;
}

::ng-deep .mat-button-toggle-label-content {
line-height: 35px !important;
padding: 0 7.5px !important;
}

mat-button-toggle button{
height: 35px;
width: 35px;
}
mat-button-toggle img{
width: 20px;
height: auto;
}

mat-button-toggle div{
height: 20px;
width: 20px;
}

.hero_icons_container{
.hero_icons{
div{
height: 40px;
width: 40px;
margin: 3px;
img{
height: 40px;
width: 40px;
// box-sizing: border-box;
}
}
}
}
}

#dialog_close{
position: absolute;
top: 5px;
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ar-builder/ar-builder-save-dialog/ar-builder-save-dialog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h2>Save/Load</h2>
</button></p>
<hr />
<p>Saves are stored locally on your device.</p>
<p>Save data can be transferred across devices using the Export/Share and Load from File functions. This can also be used to share defense builds with friends.</p>
<p>Save data can be transferred across devices using the Export/Share and Load from File functions. Though the "Share Link" feature is recommended for this.</p>
<hr />
<div *ngFor="let i of [1,2,3,4,5,6,7,8,9]">
Save Data {{i}}
Expand Down
20 changes: 20 additions & 0 deletions src/app/pages/ar-builder/ar-builder-structures-dialog/ar-builder-structures-dialog.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
}
}

@media only screen and (max-width: 600px){
h2{
font-size: 1.2em;
}
.ar-structures-table{
.building-container{
.ar_building{
height: 52px;
width: 52px;
}
.ar_building_checkmark{
height: 20px;
width: 20px;
top: -5px;
left: -5px;
}
}
}
}


h2{
margin: 5px;
Expand Down
10 changes: 10 additions & 0 deletions src/app/pages/ar-builder/ar-builder-terrain-dialog/ar-builder-terrain-dialog.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@
}
}

@media only screen and (max-width: 600px){
.map_container{
width: 250px;
p{
line-height: 51px;
font-size: 20px;
}
}
}

h2{
margin: 5px;
}
Expand Down
75 changes: 75 additions & 0 deletions src/app/pages/ar-builder/ar-builder.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,27 @@ mat-button-toggle div{
}
}

@media only screen and (max-width: 1150px) {
.ar_builder_container{
flex-wrap: wrap;
justify-content: space-between;
.ar_builder_left_container{
order: 1;
}
.ar_builder_child_container:nth-child(1){
order: 3;
margin-left: 10px;
margin-top: 10px;
width: 450px;
}

.ar_builder_right_container{
order: 2;
width: 450px;
}
}
}

@media only screen and (max-width: 768px){
.page_content{
display: flex;
Expand All @@ -228,4 +249,58 @@ mat-button-toggle div{
margin-right: 0px;
}
}
}

@media only screen and (max-width: 450px){
.ar_builder_container{
width: 345px;
.ar_builder_child_container{
width: 345px;
margin-bottom: 10px;
}

.ar_builder_child_container:nth-child(1){
margin-left: 0px;
margin-top: 0px;
}

.ar_builder_left_container{
.ar_builder_map_container{
min-width: 345px;
min-height: 460px;
.ar_builder_map{
width: 345px;
height: 460px;
}
#dangerRange{
width: 345px;
height: 460px;
}
}

mat-card{
margin-top: 10px;
padding: 10px;
display:flex;
justify-content: space-evenly;
flex-wrap: wrap;
button:nth-child(3){
margin-top: 10px;
}
}
}

}
.ar_builder_overlay{
width: 345px;
height: 345px;
}
.map-item{
height: 57.5px;
width: 57.5px;
}
.ar_building{
height: 57.5px;
width: 57.5px;
}
}
1 change: 1 addition & 0 deletions src/app/pages/ar-builder/ar-builder.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ export class ArBuilderComponent implements OnInit, AfterViewInit {
openEditBuildDialog(){
let editBuildDialog = this.dialog.open(AREditBuildDialog, {
width: '450px',
height: '80%',
data: this.currentlyDisplayedHero
});

Expand Down
12 changes: 12 additions & 0 deletions src/app/pages/edit-build/edit-build.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,16 @@ form{
width: 100%;
flex-wrap: wrap;
justify-content: space-evenly;
}

@media only screen and (max-width: 600px){
hr{
margin-bottom: 10px;
}
form{
justify-content:space-between;
}
mat-form-field{
width: 120px;
}
}
6 changes: 6 additions & 0 deletions src/styles.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,10 @@ div.page_content{

.ar_building[src$="blank.png"]{
cursor: default;
}

@media only screen and (max-width: 600px){
div.page_content{
padding-bottom: 0px;
}
}

0 comments on commit c41e57c

Please sign in to comment.