more styling

This commit is contained in:
2017-11-03 02:26:00 +00:00
parent 740e37c509
commit 84f1cd6f9b
7 changed files with 113 additions and 32 deletions

View File

@@ -14,31 +14,55 @@
<span class="heading">Laser</span> <span class="heading">Laser</span>
<div class="content"> <div class="content">
<ul> <ul>
<li class="form-row"> <li class="form-row info">
<label>L</label> <label>Frequency</label>
<label>123</label>
</li>
<li class="form-row info">
<input type="range" class="laser slider" value="1" min="1" max="128"> <input type="range" class="laser slider" value="1" min="1" max="128">
</li> </li>
<li class="form-row"> <li class="form-row info">
<label>M1</label> <label>Motor 1</label>
<label>23</label>
</li>
<li class="form-row info">
<input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="1"> <input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="1">
</li> </li>
<li class="form-row info">
<label>Motor 3</label>
<label>324</label>
</li>
<li class="form-row"> <li class="form-row">
<label>M2</label>
<input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="2"> <input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="2">
</li> </li>
<li class="form-row"> <li class="form-row">
<label>M3</label> <label>Motor 3</label>
<label>123</label>
</li>
<li class="form-row">
<input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="3"> <input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="3">
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
<div id="prototypControls" class="container collapsible"> <form id="prototypControls" class="container collapsible">
<span class="heading">Makros</span> <span class="heading">Makros</span>
<div class="content"> <div class="content">
<button>Submit</button> <div class="form-row">
<label>Stop</label>
<button>Run</button>
</div>
<div class="form-row">
<label>Preset Mode</label>
<button>Run</button>
</div>
<div class="form-row">
<label>Do stuff</label>
<button>Run</button>
</div>
</div> </div>
</div> </form>
<div class="settings container collapsible"> <div class="settings container collapsible">
<span class="heading">WiFi Settings</span> <span class="heading">WiFi Settings</span>
<div class="content"> <div class="content">
@@ -56,7 +80,7 @@
<input type="password" name="password" placeholder="Default: th3r31sn0sp00n"> <input type="password" name="password" placeholder="Default: th3r31sn0sp00n">
</li> </li>
<li class="form-row"> <li class="form-row">
<button type="submit">Submit</button> <button type="submit">Save</button>
</li> </li>
</ul> </ul>
</form> </form>

View File

@@ -163,11 +163,10 @@ var $ = function(selector){
} }
};Sui.ready(() => { };Sui.ready(() => {
let debugResponse = (data) => { let debugResponse = (data) => {
$('#response').html(data); document.querySelector('#response').html(data);
}; };
Sui.select('.collapsible').forEach((container) => { Sui.select('.collapsible').forEach((container) => {
container.querySelector('.heading').addEventListener('click', (item) => { container.querySelector('.heading').addEventListener('click', (item) => {
console.log(container);
container.classList.toggle('open'); container.classList.toggle('open');
}); });
}); });

View File

@@ -8,11 +8,15 @@ form .form-row > label {
padding: .5em 1em .5em 0; padding: .5em 1em .5em 0;
flex: 1; flex: 1;
} }
form .form-row > label + label {
flex: 0;
}
form .form-row > input { form .form-row > input {
flex: 2; flex: 2;
} }
form .form-row > span { form .form-row > span {
flex: 2; flex: 2;
text-align: right;
} }
form .form-row input[type="checkbox"] { form .form-row input[type="checkbox"] {
margin-top: 12px; margin-top: 12px;
@@ -38,6 +42,7 @@ form .form-row input[type="checkbox"] {
.sui { .sui {
background: #000000; background: #000000;
color: #0eb8c0; color: #0eb8c0;
font-family: "Open Sans";
} }
.sui * { .sui * {
margin: 0; margin: 0;
@@ -49,10 +54,12 @@ form .form-row input[type="checkbox"] {
.sui .shown { .sui .shown {
display: block; display: block;
} }
.sui input, .sui input {
.sui button {
padding: .5em; padding: .5em;
} }
.sui button {
padding: .8em;
}
.sui > .content { .sui > .content {
padding: 16px; padding: 16px;
} }
@@ -74,15 +81,18 @@ form .form-row input[type="checkbox"] {
.sui > .content .container.collapsible > .heading:hover { .sui > .content .container.collapsible > .heading:hover {
cursor: pointer; cursor: pointer;
} }
.sui > .content .container.collapsible .content { .sui > .content .container.collapsible > .content {
display: none; display: none;
} }
.sui > .content .container.collapsible.open > .heading { .sui > .content .container.collapsible.open > .heading {
margin-bottom: 16px; margin-bottom: 16px;
} }
.sui > .content .container.collapsible.open .content { .sui > .content .container.collapsible.open > .content {
display: block; display: block;
} }
.sui > .content label {
color: #b3b2b2;
}
.sui > .content input[type="text"], .sui > .content input[type="text"],
.sui > .content input[type="password"] { .sui > .content input[type="password"] {
height: 16px; height: 16px;
@@ -101,6 +111,9 @@ form .form-row input[type="checkbox"] {
.sui > .content input[type="checkbox"] { .sui > .content input[type="checkbox"] {
transform: scale(2); transform: scale(2);
} }
.sui > .content input[type="range"] {
padding: 0;
}
.sui > .content button { .sui > .content button {
background: #097479; background: #097479;
color: white; color: white;

View File

@@ -14,31 +14,55 @@
<span class="heading">Laser</span> <span class="heading">Laser</span>
<div class="content"> <div class="content">
<ul> <ul>
<li class="form-row"> <li class="form-row info">
<label>L</label> <label>Frequency</label>
<label>123</label>
</li>
<li class="form-row info">
<input type="range" class="laser slider" value="1" min="1" max="128"> <input type="range" class="laser slider" value="1" min="1" max="128">
</li> </li>
<li class="form-row"> <li class="form-row info">
<label>M1</label> <label>Motor 1</label>
<label>23</label>
</li>
<li class="form-row info">
<input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="1"> <input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="1">
</li> </li>
<li class="form-row info">
<label>Motor 3</label>
<label>324</label>
</li>
<li class="form-row"> <li class="form-row">
<label>M2</label>
<input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="2"> <input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="2">
</li> </li>
<li class="form-row"> <li class="form-row">
<label>M3</label> <label>Motor 3</label>
<label>123</label>
</li>
<li class="form-row">
<input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="3"> <input type="range" class="motor slider" value="1" min="1" max="128" data-motor-nr="3">
</li> </li>
</ul> </ul>
</div> </div>
</form> </form>
<div id="prototypControls" class="container collapsible"> <form id="prototypControls" class="container collapsible">
<span class="heading">Makros</span> <span class="heading">Makros</span>
<div class="content"> <div class="content">
<button>Submit</button> <div class="form-row">
<label>Stop</label>
<button>Run</button>
</div>
<div class="form-row">
<label>Preset Mode</label>
<button>Run</button>
</div>
<div class="form-row">
<label>Do stuff</label>
<button>Run</button>
</div>
</div> </div>
</div> </form>
<div class="settings container collapsible"> <div class="settings container collapsible">
<span class="heading">WiFi Settings</span> <span class="heading">WiFi Settings</span>
<div class="content"> <div class="content">
@@ -56,7 +80,7 @@
<input type="password" name="password" placeholder="Default: th3r31sn0sp00n"> <input type="password" name="password" placeholder="Default: th3r31sn0sp00n">
</li> </li>
<li class="form-row"> <li class="form-row">
<button type="submit">Submit</button> <button type="submit">Save</button>
</li> </li>
</ul> </ul>
</form> </form>

View File

@@ -1,10 +1,9 @@
Sui.ready(() => { Sui.ready(() => {
let debugResponse = (data) => { let debugResponse = (data) => {
$('#response').html(data); document.querySelector('#response').html(data);
}; };
Sui.select('.collapsible').forEach((container) => { Sui.select('.collapsible').forEach((container) => {
container.querySelector('.heading').addEventListener('click', (item) => { container.querySelector('.heading').addEventListener('click', (item) => {
console.log(container);
container.classList.toggle('open'); container.classList.toggle('open');
}); });
}); });

View File

@@ -10,12 +10,16 @@ form {
padding: .5em 1em .5em 0; padding: .5em 1em .5em 0;
flex: 1; flex: 1;
} }
.form-row > label + label {
flex: 0;
}
.form-row > input { .form-row > input {
flex: 2; flex: 2;
} }
.form-row > span { .form-row > span {
flex: 2; flex: 2;
text-align: right;
} }
.form-row input[type="checkbox"] { .form-row input[type="checkbox"] {
margin-top: 12px; margin-top: 12px;

View File

@@ -1,7 +1,10 @@
@import "form.less"; @import "form.less";
@default-font: "Open Sans";
@color-black: #000000; @color-black: #000000;
@color-white: #eeeeee; @color-white: #eeeeee;
@color-grey: #b3b2b2;
@color-main: #097479; @color-main: #097479;
@color-main-light: #0eb8c0; @color-main-light: #0eb8c0;
@color-container: #333333; @color-container: #333333;
@@ -18,6 +21,7 @@
.sui { .sui {
background: @color-black; background: @color-black;
color: @color-main-light; color: @color-main-light;
font-family: @default-font;
* { * {
margin: 0; margin: 0;
@@ -31,11 +35,14 @@
display: block; display: block;
} }
input, input {
button {
padding: .5em; padding: .5em;
} }
button {
padding: .8em;
}
> .content { > .content {
padding: @default-padding; padding: @default-padding;
.heading { .heading {
@@ -56,19 +63,22 @@
cursor: pointer; cursor: pointer;
} }
} }
.content { > .content {
.hidden; .hidden;
} }
&.open { &.open {
> .heading { > .heading {
margin-bottom: @default-margin; margin-bottom: @default-margin;
} }
.content { > .content {
.shown; .shown;
} }
} }
} }
} }
label {
color: @color-grey;
}
input[type="text"], input[type="password"] { input[type="text"], input[type="password"] {
height: @input-text-height; height: @input-text-height;
background: transparent; background: transparent;
@@ -83,6 +93,9 @@
input[type="checkbox"] { input[type="checkbox"] {
transform: scale(@input-checkbox-scale); transform: scale(@input-checkbox-scale);
} }
input[type="range"] {
padding: 0;
}
button { button {
background: @color-main; background: @color-main;
color: white; color: white;
@@ -91,3 +104,8 @@
} }
} }
.spiro-control {
.form-row .info {
}
}