This commit is contained in:
George Michael Brower 2014-08-23 16:27:00 -07:00
parent a4c6241d76
commit a84421e81d
6 changed files with 93 additions and 72 deletions

View File

@ -482,15 +482,36 @@ if(f)g=void 0;else if(f=g[this.name],!f)return void console.error("Cannot find f
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
#row { #row {
height: 30px;
-webkit-transition: background-color 0.2s linear; -webkit-transition: background-color 0.2s linear;
-moz-transition: background-color 0.2s linear; -moz-transition: background-color 0.2s linear;
-o-transition: background-color 0.2s linear; -o-transition: background-color 0.2s linear;
-ms-transition: background-color 0.2s linear; -ms-transition: background-color 0.2s linear;
transition: background-color 0.2s linear; transition: background-color 0.2s linear;
border-bottom: 1px solid #262626;
} }
#row:hover { #row:hover {
background-color: #262626; background-color: #262626;
} }
#controller {
height: 100%;
}
#name {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
word-wrap: break-word;
overflow: hidden;
padding: 0 8px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
display: inline-block;
width: 40%;
cursor: default;
}
.comment-true #name {
cursor: pointer;
}
#comment { #comment {
line-height: 16px; line-height: 16px;
-webkit-user-select: text; -webkit-user-select: text;
@ -543,31 +564,8 @@ if(f)g=void 0;else if(f=g[this.name],!f)return void console.error("Cannot find f
#commentInner { #commentInner {
padding: 8px; padding: 8px;
} }
#name {
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
word-wrap: break-word;
overflow: hidden;
padding: 0 8px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
display: inline-block;
width: 40%;
height: 30px;
line-height: 30px;
cursor: default;
}
.comment-true #name {
cursor: pointer;
}
.comment-true #nameInner { .comment-true #nameInner {
display: inline-block; display: inline-block;
border-bottom: 1px dotted rgba(255,255,255,0.25);
}
.comment-true #nameInner:after {
content: ' ?';
color: rgba(255,255,255,0.25);
} }
</style> </style>
@ -1166,17 +1164,16 @@ Polymer( 'controller-number', {
<template> <template>
<style>:host { <style>:host {
display: block;
font-size: 0;
height: 100%;
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
#container {
height: 100%;
}
#track-container { #track-container {
width: 100%; height: 100%;
height: 30px;
} }
#track { #track {
width: 100%; width: 100%;
@ -1232,7 +1229,7 @@ input {
color: #eee; color: #eee;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
color: text-color; color: text-color;
height: 30px; height: 100%;
display: inline-block; display: inline-block;
background: transparent; background: transparent;
border: 0; border: 0;
@ -1241,8 +1238,7 @@ input {
.slider-true input { .slider-true input {
text-align: center; text-align: center;
margin-left: 8px; margin-left: 8px;
width: 100%; width: 25%;
width: 22%;
-webkit-transition: width 0.2s cubic-bezier(0.25, 0.25, 0, 1); -webkit-transition: width 0.2s cubic-bezier(0.25, 0.25, 0, 1);
-moz-transition: width 0.2s cubic-bezier(0.25, 0.25, 0, 1); -moz-transition: width 0.2s cubic-bezier(0.25, 0.25, 0, 1);
-o-transition: width 0.2s cubic-bezier(0.25, 0.25, 0, 1); -o-transition: width 0.2s cubic-bezier(0.25, 0.25, 0, 1);
@ -1255,6 +1251,9 @@ input {
.slider-true input:focus { .slider-true input:focus {
width: 50%; width: 50%;
} }
.slider-false input {
width: 100%;
}
input::selection { input::selection {
background-color: rgba(255,255,255,0.1); background-color: rgba(255,255,255,0.1);
} }
@ -1343,12 +1342,14 @@ Polymer( 'controller-boolean', {
} }
#container { #container {
display: block; display: block;
border: 1px solid #00f; height: 100%;
height: row-height; }
#input {
height: 20px;
} }
</style> </style>
<label for="input" id="container"> <label for="input" id="container" horizontal="" layout="" center="">
<input id="input" type="checkbox" checked?="{{ value }}" on-change="{{ change }}"> <input id="input" type="checkbox" checked?="{{ value }}" on-change="{{ change }}">
</label> </label>

View File

@ -12,7 +12,7 @@
<link rel="stylesheet" href="controller-boolean.css"> <link rel="stylesheet" href="controller-boolean.css">
<label for="input" id="container"> <label for="input" id="container" horizontal layout center>
<input id="input" type="checkbox" checked?="{{ value }}" on-change="{{ change }}"> <input id="input" type="checkbox" checked?="{{ value }}" on-change="{{ change }}">
</label> </label>

View File

@ -6,6 +6,10 @@
#container { #container {
display: block; display: block;
border: 1px solid blue; height: 100%;
height: row-height; // border: 1px solid red;
}
#input {
height: 20px;
} }

View File

@ -3,21 +3,20 @@
fill-color = number-color fill-color = number-color
track-color = light track-color = light
track-height = 30px
track-size = 1px; track-size = 1px;
fill-size = 1px; fill-size = 1px;
knob-size = 6px knob-size = 6px
:host { :host {
display: block;
font-size: 0;
height: 100%;
user-select: none; user-select: none;
} }
#container {
height: 100%;
}
#track-container { #track-container {
width: 100%; height: 100%;
height: track-height;
} }
#track { #track {
@ -78,8 +77,7 @@ input {
panel-font() panel-font()
color: text-color; color: text-color;
height: track-height; height: 100%;
display: inline-block; display: inline-block;
background: transparent; background: transparent;
border: 0; border: 0;
@ -89,12 +87,11 @@ input {
text-align: center; text-align: center;
margin-left: padding; margin-left: padding;
width: 100%; width: 25%;
width: 22%;
transition: width 0.2s ease; transition: width 0.2s ease;
&:hover { &:hover {
width: 28%; width: 33%;
} }
&:focus { &:focus {
@ -106,6 +103,7 @@ input {
.slider-false & { .slider-false & {
// border-bottom: 1px solid number-color; // border-bottom: 1px solid number-color;
width: 100%;
} }
} }

View File

@ -13,12 +13,44 @@
} }
#row { #row {
debug( blue )
height: min-row-height;
transition: background-color 0.2s linear; transition: background-color 0.2s linear;
border-bottom: 1px solid #262626;
&:hover { &:hover {
background-color: #262626; background-color: #262626;
} }
} }
#controller {
height: 100%;
}
#name {
debug( magenta )
text-overflow: ellipsis;
word-wrap: break-word;
overflow: hidden;
padding: 0 padding;
box-sizing: border-box;
display: inline-block;
width: 40%;
cursor: default;
.comment-true & {
cursor: pointer;
}
}
#comment { #comment {
line-height: 16px; line-height: 16px;
@ -57,35 +89,14 @@
padding: padding; padding: padding;
} }
#name {
text-overflow: ellipsis;
word-wrap: break-word;
overflow: hidden;
padding: 0 padding;
box-sizing: border-box;
display: inline-block;
width: 40%;
height: 30px;
line-height: 30px;
cursor: default;
.comment-true & {
cursor: pointer;
}
}
.comment-true #nameInner { .comment-true #nameInner {
display: inline-block; display: inline-block;
border-bottom: 1px dotted light; // border-bottom: 1px dotted light;
&:after { &:after {
content: ' ?'; // content: ' ?';
color: light; // color: light;
} }
} }

View File

@ -1,6 +1,13 @@
@import 'nib'; @import 'nib';
use-debug = false
debug( color )
if use-debug
border: 1px solid color
panel-width = 245px panel-width = 245px
min-row-height = 30px
font-color = #eee font-color = #eee
panel-color = #1a1a1a panel-color = #1a1a1a