Merge branch 'master' of github.com:EECS-448-Battleship/project-1

master
Garrett Mills 4 years ago
commit 6a639e8396
Signed by: garrettmills
GPG Key ID: D2BF5FBA8298F246

@ -42,7 +42,7 @@ const template = `
export default class GameBoardComponent extends Component {
static get selector() { return 'app-game-board' }
static get template() { return template }
static get props() { return ['rows', 'is_placement_mode', 'ships_to_place'] }
static get props() { return ['rows', 'is_placement_mode', 'ships_to_place', 'is_missile_mode'] }
/**
* If true, the grid is ready to be rendered. If false,
@ -113,6 +113,7 @@ export default class GameBoardComponent extends Component {
game_service.place_ship(this.ships_to_place[0], coord_one, coord_two)
this.$emit('shipplaced')
this.$emit('missilefired',[row_i ,cell_i])
}
}
}

@ -102,10 +102,74 @@ p {
margin: 20px;
}
/*******************************************
************** SCOREBOARD CSS **************
********************************************/
.app-scoreboard-component {
}
.scoreboard_table {
border-collapse: collapse;
text-align: center;
margin: auto;
font-size: 0.9em;
min-width: 400px;
font-weight: bold;
font-family:'Roboto',sans-serif;
border-radius: 15px 15px 7px 7px;
overflow: hidden;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.70);
}
.scoreboard_table_header {
padding: 30px;
background-color: #204a61;
color: #ffffff;
border-bottom: 1px solid #dddddd;
font-size: 17px;
}
.scoreboard_header_scoreProgress {
border-collapse: collapse;
padding: 15px;
border-bottom: 1px solid #dddddd;
background-color: #f3f3f3;
color: #204a61;
}
.scoreboard_emptyCells {
background-color: #333333;
}
.scoreboard_scoreProgress {
border-collapse: collapse;
padding: 15px;
border-bottom: 1px solid #dddddd;
}
.scoreboard_player {
border-collapse: collapse;
padding: 15px;
border-bottom: 1px solid #dddddd;
}
.scoreboard_lastRow {
border-collapse: collapse;
padding: 15px;
border-bottom: 5px solid #204a61;
}
.scoreboard_data {
border-collapse: collapse;
padding: 15px;
border-bottom: 1px solid #dddddd;
}
/*******************************************
************** END SCOREBOARD CSS **************
********************************************/
.game-player-change-container, .game-choose-ships-container {
height: calc(40px * 9);
display: flex;

Loading…
Cancel
Save