Skip to content

Commit

Permalink
styling (#32)
Browse files Browse the repository at this point in the history
* styling

* Update schema.sql
  • Loading branch information
afeldmanx1 authored and fernandamarr committed Mar 9, 2019
1 parent 1f70cc2 commit 1bb311d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
2 changes: 1 addition & 1 deletion config/config.json
@@ -1,7 +1,7 @@
{
"development": {
"username": "root",
"password": "yourPassword",
"password": "yourRootPassword",
"database": "gamelist",
"host": "localhost",
"port": 3306,
Expand Down
Binary file added public/images/black.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/styles/styles.css
Expand Up @@ -37,12 +37,14 @@
min-height: 500px;
max-height: 75%;
overflow-y: scroll;
padding: 4%;
}
#gamelist-wrapper{
background-color: white;
min-height: 500px;
max-height: 75%;
overflow-y: scroll;
padding: 4%;
}
.game-box{
display: block;
Expand Down Expand Up @@ -132,4 +134,13 @@ label{

.intro-box {
opacity: 0.9;
}

#search-text {
width: 100%;
}

.settings {
margin: 1%;
padding-right: 0%;
}
2 changes: 1 addition & 1 deletion schema.sql
@@ -1,4 +1,4 @@
-- Drops the gamelist if it exists currently --
DROP DATABASE IF EXISTS gamelist;
-- Creates the "gamelist" database --
CREATE DATABASE gamelist;
CREATE DATABASE gamelist;
12 changes: 6 additions & 6 deletions views/index.handlebars
Expand Up @@ -10,17 +10,17 @@
background-size: 100vw 100vh;
}
</style>
<nav class="navbar navbar-light bg-light justify-content-between accentColor" style="background-color:{{accentcolor}} !important;">
<nav class="navbar navbar-light bg-light justify-content-between accentColor rounded" style="background-color:{{accentcolor}} !important;">
{{/each}}
<input class="form-control mr-sm-2" id="searchText" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" id="searchButton" type="submit">Search</button>
<a class="navbar-brand" data-toggle="modal" data-target="#userModal">Account</a>
<input class="form-control mr-sm-2 rounded" id="searchText" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-primary text-center rounded" id="searchButton" type="submit">Search</button>
<button type="button" class="settings btn btn-primary text-center rounded"><a class="navbar-brand" data-toggle="modal" data-target="#userModal">Account Settings</a></button>
</nav>
</div>
</div>
<div class="row">
<div class="col-sm-8">
<div class="wrapper" id="gamelist-wrapper">
<div class="wrapper rounded accentColor" id="gamelist-wrapper">
<h1>Game Library</h1>
<input id="basics" />
{{#each games}}
Expand All @@ -29,7 +29,7 @@
</div>
</div>
<div class="col-sm-4">
<div class="wrapper" id="friendlist-wrapper">
<div class="wrapper rounded accentColor" id="friendlist-wrapper">
{{> friends/friendlist-block}}
</div>
</div>
Expand Down

0 comments on commit 1bb311d

Please sign in to comment.