Skip to content

Commit 286cef2

Browse files
committed
made TopNavbar display username when logged in, styling improvements #147
1 parent 751ddae commit 286cef2

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

src/assets/style.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,14 @@ button, input, select, textarea {
2525

2626
.csh-top-link {
2727
font-family: Georgia, Times, "Times New Roman", serif;
28-
color: #FFFFFF;
28+
color: #AAAAAA;
2929
font-size: 2em;
3030
}
3131

32+
.csh-top-link:hover, .csh-top-link:active {
33+
color: #EEEEEE;
34+
}
35+
3236
a.csh-dropdown-link,
3337
a.csh-dropdown-link:visited {
3438
color: #DDDDDD;

src/components/DeckBuilder.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<TopNavbar></TopNavbar>
3+
<TopNavbar :username="currentUser.username"></TopNavbar>
44
<div v-if="!doneLoading">
55
<h1 class="deckbuilder-deck-name">Loading Deck Builder...</h1>
66
</div>

src/components/GameBoard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<TopNavbar></TopNavbar>
3+
<TopNavbar :username="currentUser.username"></TopNavbar>
44
<div class="game" :class="'game-' + modName">
55
<!-- Player display -->
66
<div>

src/components/Lobby.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<TopNavbar></TopNavbar>
3+
<TopNavbar :username="currentUser.username"></TopNavbar>
44
<table id="lobby" class="lobby">
55
<tr id="lobby-headers" class="lobby-headers">
66
<td id="lobby-title" class="lobby-title">Lobby</td>

src/components/TopNavbar.vue

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<template>
2-
<nav class="navbar navbar-dark bg-dark top-navbar-container">
2+
<nav class="navbar navbar-dark top-navbar">
33
<div class="container-fluid">
44
<div class="navbar-header">
5-
<div class="navbar-brand csh-top-link">
6-
Cardshifter
5+
<div class="csh-top-link">
6+
<span>Cardshifter</span>
7+
<span class="top-navbar-username" v-if="username"> | {{ username }}</span>
78
</div>
89
</div>
910
</div>
@@ -16,14 +17,21 @@ export default {
1617
data() {
1718
return {}
1819
},
20+
props: ['username'],
1921
methods: {}
2022
};
2123
</script>
2224

2325
<style>
2426
@import "../assets/style.css";
2527
26-
.top-navbar-container {
27-
/* background-color: black; */
28+
.top-navbar {
29+
background-color: #222222;
30+
font-size: 0.8em;
31+
color: #EEEEEE;
32+
}
33+
34+
.top-navbar-username {
35+
font-size: 1.0em;
2836
}
2937
</style>

0 commit comments

Comments
 (0)