[Frontend] Layout and positioning fixes for TC controls
open #889 IN PROGRESS - Smaller font used on range value; - More space allocated to left and right for slider range values; - Style tweaks to slider look; - Layout and style of datetime inputs fixed; - Input error colors fixed, moved to theme constants;
This commit is contained in:
@@ -48,7 +48,7 @@ $uePaneMiniTabW: 10px;
|
|||||||
$uePaneMiniTabCollapsedW: 11px;
|
$uePaneMiniTabCollapsedW: 11px;
|
||||||
$ueEditLeftPaneW: 75%;
|
$ueEditLeftPaneW: 75%;
|
||||||
$treeSearchInputBarH: 25px;
|
$treeSearchInputBarH: 25px;
|
||||||
$ueTimeControlH: (33px, 23px, 15px);
|
$ueTimeControlH: (33px, 15px, 15px);
|
||||||
// Panes
|
// Panes
|
||||||
$ueBrowseLeftPaneTreeMinW: 150px;
|
$ueBrowseLeftPaneTreeMinW: 150px;
|
||||||
$ueBrowseLeftPaneTreeMaxW: 35%;
|
$ueBrowseLeftPaneTreeMaxW: 35%;
|
||||||
|
|||||||
@@ -63,9 +63,10 @@ input, textarea {
|
|||||||
font-family: Helvetica, Arial, sans-serif;
|
font-family: Helvetica, Arial, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type="text"] {
|
input[type="text"],
|
||||||
|
input[type="search"] {
|
||||||
vertical-align: baseline;
|
vertical-align: baseline;
|
||||||
padding: 3px 5px !important;
|
padding: 3px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1, h2, h3 {
|
h1, h2, h3 {
|
||||||
|
|||||||
@@ -322,13 +322,13 @@
|
|||||||
color: $fg;
|
color: $fg;
|
||||||
outline: none;
|
outline: none;
|
||||||
&.error {
|
&.error {
|
||||||
background: rgba(red, 0.5);
|
background-color: $colorFormFieldErrorBg;
|
||||||
|
color: $colorFormFieldErrorFg;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin nice-input($bg: $colorInputBg, $fg: $colorInputFg) {
|
@mixin nice-input($bg: $colorInputBg, $fg: $colorInputFg) {
|
||||||
@include input-base($bg, $fg);
|
@include input-base($bg, $fg);
|
||||||
padding: 0 $interiorMarginSm;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin contextArrow() {
|
@mixin contextArrow() {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
.accordion-head {
|
.accordion-head {
|
||||||
$op: 0.2;
|
$op: 0.2;
|
||||||
border-radius: $basicCr * 0.75;
|
border-radius: $basicCr * 0.75;
|
||||||
box-sizing: "border-box";
|
box-sizing: border-box;
|
||||||
background: rgba($colorBodyFg, $op);
|
background: rgba($colorBodyFg, $op);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
font-size: 0.75em;
|
font-size: 0.75em;
|
||||||
|
|||||||
@@ -10,8 +10,8 @@
|
|||||||
$knobHOffset: 0px;
|
$knobHOffset: 0px;
|
||||||
$knobM: ($sliderKnobW + $knobHOffset) * -1;
|
$knobM: ($sliderKnobW + $knobHOffset) * -1;
|
||||||
$rangeValPad: $interiorMargin;
|
$rangeValPad: $interiorMargin;
|
||||||
$rangeValOffset: $sliderKnobW;
|
$rangeValOffset: $sliderKnobW + $interiorMargin;
|
||||||
$timeRangeSliderLROffset: 80px + ($sliderKnobW * 2);
|
$timeRangeSliderLROffset: 150px + ($sliderKnobW * 2);
|
||||||
$r1H: nth($ueTimeControlH,1);
|
$r1H: nth($ueTimeControlH,1);
|
||||||
$r2H: nth($ueTimeControlH,2);
|
$r2H: nth($ueTimeControlH,2);
|
||||||
$r3H: nth($ueTimeControlH,3);
|
$r3H: nth($ueTimeControlH,3);
|
||||||
@@ -38,7 +38,6 @@
|
|||||||
|
|
||||||
.l-time-range-inputs-holder {
|
.l-time-range-inputs-holder {
|
||||||
height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
|
height: $r1H; bottom: $r2H + $r3H + ($interiorMarginSm * 2);
|
||||||
//padding-top: $interiorMargin;
|
|
||||||
border-top: 1px solid $colorInteriorBorder;
|
border-top: 1px solid $colorInteriorBorder;
|
||||||
&.l-flex-row {
|
&.l-flex-row {
|
||||||
@include align-items(center);
|
@include align-items(center);
|
||||||
@@ -51,7 +50,7 @@
|
|||||||
font-size: 120%;
|
font-size: 120%;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.l-time-range-input,
|
.l-time-range-input-w,
|
||||||
.l-time-range-inputs-elem {
|
.l-time-range-inputs-elem {
|
||||||
margin-right: $interiorMargin;
|
margin-right: $interiorMargin;
|
||||||
.lbl {
|
.lbl {
|
||||||
@@ -59,7 +58,21 @@
|
|||||||
}
|
}
|
||||||
.ui-symbol.icon {
|
.ui-symbol.icon {
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
width: 11px;
|
}
|
||||||
|
}
|
||||||
|
.l-time-range-input-w {
|
||||||
|
// Wraps a datetime text input field
|
||||||
|
position: relative;
|
||||||
|
input[type="text"] {
|
||||||
|
width: 200px;
|
||||||
|
&.picker-icon {
|
||||||
|
padding-right: 20px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.icon-calendar {
|
||||||
|
position: absolute;
|
||||||
|
right: 5px;
|
||||||
|
top: 5px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -80,26 +93,14 @@
|
|||||||
width: $myW;
|
width: $myW;
|
||||||
height: auto;
|
height: auto;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
&:before,
|
|
||||||
&:after {
|
|
||||||
background-color: $myC;
|
|
||||||
//content: "";
|
|
||||||
position: absolute;
|
|
||||||
}
|
|
||||||
&:before {
|
&:before {
|
||||||
// Vert line
|
// Vert line
|
||||||
|
background-color: $myC;
|
||||||
|
position: absolute;
|
||||||
content: "";
|
content: "";
|
||||||
top: 0; right: auto; bottom: -10px; left: floor($myW/2) - 1;
|
top: 0; right: auto; bottom: -10px; left: floor($myW/2) - 1;
|
||||||
width: 1px;
|
width: 1px;
|
||||||
}
|
}
|
||||||
/* &:after {
|
|
||||||
// Circle element
|
|
||||||
border-radius: $myW;
|
|
||||||
@include transform(translateY(-50%));
|
|
||||||
top: 50%; right: 0; bottom: auto; left: 0;
|
|
||||||
width: auto;
|
|
||||||
height: $myW;
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
&:hover .toi-line {
|
&:hover .toi-line {
|
||||||
@include toiLineHovEffects;
|
@include toiLineHovEffects;
|
||||||
@@ -149,10 +150,10 @@
|
|||||||
.range-value {
|
.range-value {
|
||||||
@include trans-prop-nice-fade(.25s);
|
@include trans-prop-nice-fade(.25s);
|
||||||
font-size: 0.7rem;
|
font-size: 0.7rem;
|
||||||
padding: 0 $rangeValOffset;
|
|
||||||
position: absolute;
|
position: absolute;
|
||||||
height: $r2H;
|
height: $r2H;
|
||||||
line-height: $r2H/2;
|
line-height: $r2H;
|
||||||
|
white-space: nowrap;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
&:hover {
|
&:hover {
|
||||||
@@ -181,7 +182,7 @@
|
|||||||
.l-time-domain-selector {
|
.l-time-domain-selector {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
bottom: 43px;
|
bottom: $r2H + $r3H + $interiorMargin;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -272,7 +273,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@include tablet {
|
@include tablet {
|
||||||
.l-time-controller {
|
.l-time-controller {
|
||||||
height: 17px;
|
height: 17px;
|
||||||
|
|||||||
@@ -19,18 +19,17 @@
|
|||||||
this source code distribution or the Licensing information page available
|
this source code distribution or the Licensing information page available
|
||||||
at runtime from the About dialog for additional information.
|
at runtime from the About dialog for additional information.
|
||||||
-->
|
-->
|
||||||
<span class="s-btn"
|
<span ng-controller="DateTimeFieldController">
|
||||||
ng-controller="DateTimeFieldController">
|
|
||||||
<input type="text"
|
<input type="text"
|
||||||
ng-model="textValue"
|
ng-model="textValue"
|
||||||
ng-blur="restoreTextValue(); ngBlur()"
|
ng-blur="restoreTextValue(); ngBlur()"
|
||||||
ng-class="{
|
ng-class="{
|
||||||
error: textInvalid ||
|
error: textInvalid ||
|
||||||
(structure.validate &&
|
(structure.validate &&
|
||||||
!structure.validate(ngModel[field]))
|
!structure.validate(ngModel[field])),
|
||||||
|
'picker-icon': structure.format === 'utc' || !structure.format
|
||||||
}">
|
}">
|
||||||
</input>
|
</input><a class="ui-symbol icon icon-calendar"
|
||||||
<a class="ui-symbol icon icon-calendar"
|
|
||||||
ng-if="structure.format === 'utc' || !structure.format"
|
ng-if="structure.format === 'utc' || !structure.format"
|
||||||
ng-click="picker.active = !picker.active">
|
ng-click="picker.active = !picker.active">
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
<form class="l-time-range-inputs-holder l-flex-row"
|
<form class="l-time-range-inputs-holder l-flex-row"
|
||||||
ng-submit="trCtrl.updateBoundsFromForm()">
|
ng-submit="trCtrl.updateBoundsFromForm()">
|
||||||
<span class="l-time-range-inputs-elem ui-symbol type-icon flex-elem">C</span>
|
<span class="l-time-range-inputs-elem ui-symbol type-icon flex-elem">C</span>
|
||||||
<span class="l-time-range-input flex-elem">
|
<span class="l-time-range-input-w flex-elem">
|
||||||
<mct-control key="'datetime-field'"
|
<mct-control key="'datetime-field'"
|
||||||
structure="{
|
structure="{
|
||||||
format: parameters.format,
|
format: parameters.format,
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
|
|
||||||
<span class="l-time-range-inputs-elem lbl flex-elem">to</span>
|
<span class="l-time-range-inputs-elem lbl flex-elem">to</span>
|
||||||
|
|
||||||
<span class="l-time-range-input flex-elem" ng-controller="ToggleController as t2">
|
<span class="l-time-range-input-w flex-elem" ng-controller="ToggleController as t2">
|
||||||
<mct-control key="'datetime-field'"
|
<mct-control key="'datetime-field'"
|
||||||
structure="{
|
structure="{
|
||||||
format: parameters.format,
|
format: parameters.format,
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
ng-blur="trCtrl.updateBoundsFromForm()"
|
ng-blur="trCtrl.updateBoundsFromForm()"
|
||||||
field="'end'"
|
field="'end'"
|
||||||
class="time-range-end">
|
class="time-range-end">
|
||||||
</mct-control>
|
</mct-control>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<input type="submit" class="hidden">
|
<input type="submit" class="hidden">
|
||||||
|
|||||||
@@ -70,8 +70,10 @@ $colorCreateMenuText: $colorMenuFg;
|
|||||||
$colorCheck: $colorKey;
|
$colorCheck: $colorKey;
|
||||||
$colorFormRequired: $colorAlt1;
|
$colorFormRequired: $colorAlt1;
|
||||||
$colorFormValid: #33cc33;
|
$colorFormValid: #33cc33;
|
||||||
$colorFormError: #cc0000;
|
$colorFormError: #990000;
|
||||||
$colorFormInvalid: #ff3300;
|
$colorFormInvalid: #ff3300;
|
||||||
|
$colorFormFieldErrorBg: $colorFormError;
|
||||||
|
$colorFormFieldErrorFg: rgba(#fff, 0.6);
|
||||||
$colorFormLines: rgba(#fff, 0.1);
|
$colorFormLines: rgba(#fff, 0.1);
|
||||||
$colorFormSectionHeader: rgba(#fff, 0.1);
|
$colorFormSectionHeader: rgba(#fff, 0.1);
|
||||||
$colorInputBg: rgba(#000, 0.1);
|
$colorInputBg: rgba(#000, 0.1);
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ $sliderColorKnob: rgba($sliderColorBase, 0.5);
|
|||||||
$sliderColorKnobHov: rgba($sliderColorBase, 0.7);
|
$sliderColorKnobHov: rgba($sliderColorBase, 0.7);
|
||||||
$sliderColorRangeValHovBg: $sliderColorRange; //rgba($sliderColorBase, 0.1);
|
$sliderColorRangeValHovBg: $sliderColorRange; //rgba($sliderColorBase, 0.1);
|
||||||
$sliderColorRangeValHovFg: $colorBodyFg;
|
$sliderColorRangeValHovFg: $colorBodyFg;
|
||||||
$sliderKnobW: 5px; //nth($ueTimeControlH,2)/2;
|
$sliderKnobW: 10px;
|
||||||
$sliderKnobR: 2px;
|
$sliderKnobR: 2px;
|
||||||
$timeControllerToiLineColor: $colorBodyFg;
|
$timeControllerToiLineColor: $colorBodyFg;
|
||||||
$timeControllerToiLineColorHov: #0052b5;
|
$timeControllerToiLineColorHov: #0052b5;
|
||||||
@@ -70,8 +70,10 @@ $colorCreateMenuText: $colorBodyFg;
|
|||||||
$colorCheck: $colorKey;
|
$colorCheck: $colorKey;
|
||||||
$colorFormRequired: $colorKey;
|
$colorFormRequired: $colorKey;
|
||||||
$colorFormValid: #33cc33;
|
$colorFormValid: #33cc33;
|
||||||
$colorFormError: #cc0000;
|
$colorFormError: #990000;
|
||||||
$colorFormInvalid: #ff2200;
|
$colorFormInvalid: #ff2200;
|
||||||
|
$colorFormFieldErrorBg: $colorFormError;
|
||||||
|
$colorFormFieldErrorFg: rgba(#fff, 0.6);
|
||||||
$colorFormLines: rgba(#000, 0.1);
|
$colorFormLines: rgba(#000, 0.1);
|
||||||
$colorFormSectionHeader: rgba(#000, 0.05);
|
$colorFormSectionHeader: rgba(#000, 0.05);
|
||||||
$colorInputBg: $colorGenBg;
|
$colorInputBg: $colorGenBg;
|
||||||
|
|||||||
Reference in New Issue
Block a user