Skip to content

N
nexpie-grafana-theme
Commit 7403b94b by Torkel Ödegaard
Options

Merge branch 'checkboxv2' of github.com:grafana/grafana into checkboxv2

parents d40cc323 fc983f97
Showing with 63 additions and 106 deletions
public/app/features/panel/partials/panelTime.html
......@@ -9,7 +9,7 @@
<input type="text" class="gf-form-input max-width-8" placeholder="1h"
empty-to-null ng-model="ctrl.panel.timeFrom" valid-time-span
ng-change="ctrl.refresh()" ng-model-onblur>
ng-change="ctrl.refresh()" ng-model-onblur></input>
</div>
<div class="gf-form">
......@@ -20,14 +20,18 @@
<span class="gf-form-label width-6">Amount</span>
<input type="text" class="gf-form-input max-width-8" placeholder="1h"
empty-to-null ng-model="ctrl.panel.timeShift" valid-time-span
ng-change="ctrl.refresh()" ng-model-onblur>
ng-change="ctrl.refresh()" ng-model-onblur></input>
</div>
<div class="gf-form">
<span class="gf-form-label">
<i class="fa fa-clock-o"></i>
</span>
<editor-checkbox text="Hide time override info" model="ctrl.panel.hideTimeOverride" change="ctrl.refresh()"></editor-checkbox>
<label class="gf-form-label width-12">Hide time override info</label>
<div class="gf-form-switch max-width-6">
<input id="cmn-toggle-122" type="checkbox" ng-model="ctrl.panel.hideTimeOverride" change="ctrl.refresh()">
<label for="cmn-toggle-122" data-on="Yes" data-off="No"></label>
</div>
</div>
</div>
......
public/sass/_variables.dark.scss
......@@ -124,7 +124,7 @@ $btn-primary-bg: $brand-primary;
$btn-primary-bg-hl: lighten($brand-primary, 8%);
$btn-secondary-bg: $blue-dark;
$btn-secondary-bg-hl: lighten($blue-dark, 3%);
$btn-secondary-bg-hl: lighten($blue-dark, 5%);
$btn-success-bg: lighten($green, 3%);
$btn-success-bg-hl: darken($green, 3%);
......
public/sass/components/_switch.scss
......@@ -3,113 +3,66 @@ $switch-width: 3.5rem;
$switch-height: 1.5rem;
/* ============================================================
COMMON
SWITCH 3 - YES NO
============================================================ */
.cmn-toggle {
position: absolute;
margin-left: -9999px;
visibility: hidden;
}
.cmn-toggle + label {
display: block;
position: relative;
cursor: pointer;
outline: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
/* ============================================================
SWITCH 1 - ROUND
============================================================ */
input.cmn-toggle-round + label {
padding: 2px;
width: $switch-width;
height: $switch-height;
background-color: $dark-1;
border-radius: $switch-border-radius;
}
input.cmn-toggle-round + label:before, input.cmn-toggle-round + label:after {
display: block;
position: absolute;
top: 1px;
left: 1px;
bottom: 1px;
content: "";
}
input.cmn-toggle-round + label:before {
right: 1px;
background-color: $card-background;
border-radius: $switch-border-radius;
box-shadow: $card-shadow;
transition: background 0.4s;
}
input.cmn-toggle-round + label:after {
width: $switch-height;
background-color: $dark-5;
border-radius: 100%;
box-shadow: $card-shadow;
transition: margin 0.4s;
}
input.cmn-toggle-round:checked + label:before {
background-color: $blue;
}
.gf-form-switch {
position: relative;
max-width: 4.5rem;
flex-grow: 1;
min-width: 4.0rem;
input.cmn-toggle-round:checked + label:after {
margin-left: $switch-width - $switch-height;
}
input {
position: absolute;
margin-left: -9999px;
visibility: hidden;
display: none;
}
/* ============================================================
SWITCH 3 - YES NO
============================================================ */
input.cmn-toggle-yes-no + label {
padding: 2px;
width: 5rem;
height: 2.6rem;
padding: $input-padding-y $input-padding-x;
background-color: $input-bg;
}
input + label {
display: block;
position: relative;
cursor: pointer;
outline: none;
user-select: none;
width: 100%;
height: 2.65rem;
background-color: $page-bg;
}
input.cmn-toggle-yes-no + label:before, input.cmn-toggle-yes-no + label:after {
display: block;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
color: #fff;
font-family: "Open Sans";
font-size: $font-size-sm;
text-align: center;
line-height: 2.6rem;
}
input + label:before, input + label:after {
display: block;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
color: #fff;
font-size: $font-size-sm;
text-align: center;
line-height: 2.6rem;
}
input.cmn-toggle-yes-no + label:before {
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl);
content: attr(data-off);
transition: transform 0.5s;
backface-visibility: hidden;
}
input + label:before {
@include buttonBackground($input-bg, lighten($input-bg, 5%));
content: attr(data-off);
transition: transform 0.5s;
backface-visibility: hidden;
}
input.cmn-toggle-yes-no + label:after {
//@include buttonBackground($btn-success-bg, $btn-success-bg-hl);
@include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl);
content: attr(data-on);
transition: transform 0.5s;
transform: rotateY(180deg);
backface-visibility: hidden;
}
input + label:after {
@include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl);
content: attr(data-on);
transition: transform 0.5s;
transform: rotateY(180deg);
backface-visibility: hidden;
}
input.cmn-toggle-yes-no:checked + label:before {
transform: rotateY(180deg);
}
input:checked + label:before {
transform: rotateY(180deg);
}
input.cmn-toggle-yes-no:checked + label:after {
transform: rotateY(0);
input:checked + label:after {
transform: rotateY(0);
}
}
public/sass/utils/_widths.scss
......@@ -6,13 +6,13 @@
// widths
@for $i from 1 through 30 {
.width-#{$i} {
width: ($spacer * $i) - $gf-form-margin;
width: ($spacer * $i) - $gf-form-margin !important;
}
}
@for $i from 1 through 30 {
.max-width-#{$i} {
max-width: ($spacer * $i) - $gf-form-margin;
max-width: ($spacer * $i) - $gf-form-margin !important;
flex-grow: 1;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment