Skip to content

Commit

Permalink
#1 menu changes, used scss
Browse files Browse the repository at this point in the history
  • Loading branch information
VadimDez committed Dec 20, 2018
1 parent c2feff4 commit c26e53f
Show file tree
Hide file tree
Showing 14 changed files with 6,376 additions and 8,363 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Suspected copyrighted data
data/
peerJSApiKey.js

.DS_Store
node_modules/

.idea/
3 changes: 3 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"singleQuote": true
}
9 changes: 9 additions & 0 deletions _colors.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
$white: #fff;
$grey: #C8C8C8;
$main-green: #4C5844;
$secondary-green: #3E4637;

// modal
$modal-border-width: 2px;
$modal-border-shadow-light: #737a72;
$modal-border-shadow-dark: rgb(58, 58, 58);
17 changes: 17 additions & 0 deletions _mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@mixin border() {
border-width: $modal-border-width;
border-style: solid;
border-top-color: $modal-border-shadow-light;
border-left-color: $modal-border-shadow-light;
border-bottom-color: $modal-border-shadow-dark;
border-right-color: $modal-border-shadow-dark;
}

@mixin border-reversed() {
border-width: $modal-border-width;
border-style: solid;
border-top-color: $modal-border-shadow-dark;
border-left-color: $modal-border-shadow-dark;
border-bottom-color: $modal-border-shadow-light;
border-right-color: $modal-border-shadow-light;
}
105 changes: 67 additions & 38 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,76 @@
<html>
<head>
<link rel="stylesheet" type="text/css" href="stylesmenu.css">
<link rel="stylesheet" type="text/css" href="styles.css">

<script type="text/javascript" src="lib/webgl-utils.js"></script>
<script type="text/javascript" src="node_modules/soundjs/lib/soundjs.min.js"></script>
</head>

<body>

<div class="main-menu">
<table id="menu">
<tr>
<td><a href="#" class="new-game">New Game</a></td>
</tr>
<tr>
<td><a href="#" class="join-server">Join Server</a></td>
</tr>
</table>

<div class="PopupMenu" id="newGameMenu" style="visibility:hidden;">
Map
<select id="dropDownMapMenu">
<option value="">< Random Map ></option>
<option value="cs_assault.bsp">cs_assault</option>
<option value="cs_italy.bsp">cs_italy</option>
</select>

<head>
<!-- <link rel="stylesheet" type="text/css" href="stylesmenu.css">
<link rel="stylesheet" type="text/css" href="styles.css"> -->

<link rel="icon" href="/data/cstrike.ico">

<script type="text/javascript" src="lib/webgl-utils.js"></script>
<script type="text/javascript" src="node_modules/soundjs/lib/soundjs.min.js"></script>
</head>

<body>

<div class="main-menu">
<table id="menu">
<tr>
<td><a href="#" class="new-game">New Game</a></td>
</tr>
<tr>
<td><a href="#" class="join-server">Find Servers</a></td>
</tr>
<tr>
<td><a href="#">Options</a></td>
</tr>
<tr>
<td><a href="#">Quit</a></td>
</tr>
</table>

<div class="PopupMenu" id="newGameMenu" style="visibility:hidden;">

<header>
<h3>Create Server</h3>
</header>

<section>
<div class="tabs">
<div class="tab">Server</div>
</div>

<div class="selector-container">
<span class="label">Map</span>
<div class="styled-select green rounded">
<select id="dropDownMapMenu">
<option value="">
<&nbsp;Random Map&nbsp;>
</option>
<option value="cs_assault.bsp">cs_assault</option>
<option value="cs_italy.bsp">cs_italy</option>
</select>
</div>
</div>
<hr />

</section>

<footer>
<button class="menu-start-game" type="button">Start</button>
<button class="menu-cancel">Cancel</button>
</div>

<div class="PopupMenu" id="joinGameMenu" style="visibility:hidden;">
<input id="server"/>
<button class="join-game-button">Join</button>
<button class="cancel-join-button">Cancel</button>
</div>
<button class="menu-cancel" type="button">Cancel</button>
</footer>
</div>

<canvas id="canvas"></canvas>
<div class="PopupMenu" id="joinGameMenu" style="visibility:hidden;">
<input id="server" />
<button class="join-game-button">Join</button>
<button class="cancel-join-button">Cancel</button>
</div>
</div>

<canvas id="canvas"></canvas>

<script src="bundle.js" type="text/javascript"></script>
</body>

<script src="bundle.js" type="text/javascript"></script>
</body>
</html>
Loading

0 comments on commit c26e53f

Please sign in to comment.