Rewritten CSS #38

Merged
merged 2 commits into from Sep 20, 2016
Jump to file or symbol
Failed to load files and symbols.
+217 −130
Diff settings

Always

Just for now

View
@@ -67,48 +67,42 @@
<link rel="stylesheet" href="user_css/main.css">
</head>
<body>
- <div id="container">
+ <div class="container" id="container">
<div id="menu" class="paused">
- <ul id="menu_top">
+ <ul class="menu" id="menu_top">
<li>
- <span>File</span>
+ File
<ul>
- <li class="nowrap"><span>BIOS: </span> <input type="file" id="bios_load" class="files"></li>
- <li class="nowrap"><span>Game: </span> <input type="file" id="rom_load" class="files"></li>
+ <li><span>BIOS: </span> <input type="file" id="bios_load" class="files"></li>
+ <li><span>Game: </span> <input type="file" id="rom_load" class="files"></li>
</ul>
</li>
- <li id="play" class="show">
- <span>Play</span>
- </li>
- <li id="pause" class="hide">
- <span>Pause</span>
- </li>
- <li id="restart">
- <span>Restart</span>
- </li>
+ <li id="play" class="show">Play</li>
+ <li id="pause" class="hide">Pause</li>
+ <li id="restart">Restart</li>
<li>
- <span>Settings</span>
+ Settings
<ul>
- <li class="nowrap">
- <input type="checkbox" id="skip_boot"><span>Skip Boot Intro</span>
+ <li>
+ <input type="checkbox" id="skip_boot"> Skip Boot Intro
</li>
- <li class="nowrap">
- <input type="checkbox" id="toggleSmoothScaling" checked="checked"><span>Smooth Scaling</span>
+ <li>
+ <input type="checkbox" id="toggleSmoothScaling" checked="checked"> Smooth Scaling
</li>
- <li class="nowrap">
- <input type="checkbox" id="toggleDynamicSpeed"><span>Dynamic Speed</span>
+ <li>
+ <input type="checkbox" id="toggleDynamicSpeed"> Dynamic Speed
</li>
- <li class="nowrap">
- <input type="checkbox" id="offthread-cpu" checked="checked"><span>CPU off-thread</span>
+ <li>
+ <input type="checkbox" id="offthread-cpu" checked="checked"> CPU off-thread
</li>
- <li class="nowrap">
- <input type="checkbox" id="offthread-gpu" checked="checked"><span>GPU off-thread</span>
+ <li>
+ <input type="checkbox" id="offthread-gpu" checked="checked"> GPU off-thread
</li>
- <li class="nowrap">
- <input type="checkbox" id="sound"><span>Sound</span>
+ <li>
+ <input type="checkbox" id="sound"> Sound
</li>
<li>
- <span>GBA Bindings</span>
+ GBA Bindings
<ul>
<li id="key_a">
<span>A</span>
@@ -143,7 +137,7 @@
</ul>
</li>
<li>
- <span>Emulator Bindings</span>
+ Emulator Bindings
<ul>
<li id="key_volumeup">
<span>Volume Up</span>
@@ -168,33 +162,31 @@
</ul>
</li>
<li>
- <span>Volume</span>
+ Volume
<ul>
<li>
<input type="range" id="volume">
</li>
</ul>
</li>
<li id="saves_menu">
- <span>Saves</span>
+ Saves
<ul id="saves_menu_container">
- <li class="nowrap">
+ <li>
<span>Import:</span><input type="file" id="import" class="files">
</li>
- <li class="nowrap" id="existing_saves">
+ <li id="existing_saves">
<span>Existing Saves</span>
<ul id="existing_saves_list">
</ul>
</li>
- <li class="nowrap">
+ <li>
<a href="./" id="export" target="_new">Export All Saves</a>
</li>
</ul>
</li>
- <li id="fullscreen">
- <span>Fullscreen</span>
- </li>
+ <li id="fullscreen">Fullscreen</li>
<li>
<span id="speed">Speed</span>
<ul>
@@ -211,10 +203,28 @@
</li>
</ul>
</div>
- <div id="main">
- <canvas id="emulator_target" width="240" height="160"></canvas>
+ <div class="main" id="main">
+ <canvas class="canvas" id="emulator_target" width="240" height="160"></canvas>
+ </div>
+ <div class="touch-controls">
+ <div class="touch-dpad">
+ <button class="touch-dpad--up">↑</button><br>
+ <button class="touch-dpad--left">←</button>
+ <button class="touch-dpad--right">→</button><br>
+ <button class="touch-dpad--down">↓</button>
+ </div>
+ <div class="touch-buttons">
+ <button class="touch-button--select">SELECT</button>
+ <button class="touch-button--start">START</button>
+ </div>
+ <div class="touch-buttons">
+ <button class="touch-button--a">A</button>
+ <button class="touch-button--b">B</button><br>
+ <button class="touch-button--l">L</button>
+ <button class="touch-button--r">R</button>
+ </div>
</div>
- <span id="tempMessage"></span>
+ <span class="message" id="tempMessage"></span>
</div>
</body>
</html>
Oops, something went wrong.