Skip to content

N
nexpie-grafana-theme
Commit ce0dcd5c by Torkel Ödegaard
Options

Husky and sasslint fixes, fixes #14638

parent 66a13b28
Showing with 117 additions and 85 deletions
package.json
...@@ -59,8 +59,7 @@ ...@@ -59,8 +59,7 @@
"grunt-newer": "^1.3.0", "grunt-newer": "^1.3.0",
"grunt-notify": "^0.4.5", "grunt-notify": "^0.4.5",
"grunt-postcss": "^0.8.0", "grunt-postcss": "^0.8.0",
"grunt-sass": "^2.0.0", "grunt-sass-lint": "^0.2.4",
"grunt-sass-lint": "^0.2.2",
"grunt-usemin": "3.1.1", "grunt-usemin": "3.1.1",
"grunt-webpack": "^3.0.2", "grunt-webpack": "^3.0.2",
"html-loader": "^0.5.1", "html-loader": "^0.5.1",
...@@ -116,7 +115,12 @@ ...@@ -116,7 +115,12 @@
"typecheck": "tsc --noEmit", "typecheck": "tsc --noEmit",
"jest": "jest --notify --watch", "jest": "jest --notify --watch",
"api-tests": "jest --notify --watch --config=tests/api/jest.js", "api-tests": "jest --notify --watch --config=tests/api/jest.js",
"precommit": "lint-staged && grunt precommit" "precommit": "grunt precommit"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged && grunt precommit"
}
}, },
"lint-staged": { "lint-staged": {
"*.{ts,tsx}": [ "*.{ts,tsx}": [
......
public/sass/.sass-lint.yml
options: options:
formatter: stylish formatter: stylish
files:
include: '**/*.s+(a|c)ss'
ignore:
- './utils/*.scss'
rules: rules:
quotes:
- 0
-
style: 'single'
brace-style:
- 2
-
style: '1tbs'
space-before-brace:
- 2
no-duplicate-properties:
- 0
-
exclude:
- 'font-size'
- 'word-break'
empty-line-between-blocks:
- 0
-
allow-single-line-rulesets: 1
# Extends # Extends
extends-before-mixins: 0 extends-before-mixins: 0
extends-before-declarations: 0 extends-before-declarations: 0
placeholder-in-extend: 0 placeholder-in-extend: 0
# Mixins # Mixins
mixins-before-declarations: 0 mixins-before-declarations: 0
# Line Spacing # Line Spacing
one-declaration-per-line: 0 one-declaration-per-line: 0
empty-line-between-blocks: 0
single-line-per-selector: 0 single-line-per-selector: 0
# Disallows # Disallows
...@@ -25,7 +43,6 @@ rules: ...@@ -25,7 +43,6 @@ rules:
no-color-literals: 0 no-color-literals: 0
no-css-comments: 0 no-css-comments: 0
no-debug: 0 no-debug: 0
no-duplicate-properties: 0
no-empty-rulesets: 1 no-empty-rulesets: 1
no-extends: 0 no-extends: 0
no-ids: 0 no-ids: 0
...@@ -40,6 +57,7 @@ rules: ...@@ -40,6 +57,7 @@ rules:
no-vendor-prefixes: 0 no-vendor-prefixes: 0
no-warn: 0 no-warn: 0
property-units: 0 property-units: 0
pseudo-element: 0
# Nesting # Nesting
force-attribute-nesting: 0 force-attribute-nesting: 0
...@@ -57,7 +75,6 @@ rules: ...@@ -57,7 +75,6 @@ rules:
# Style Guide # Style Guide
bem-depth: 0 bem-depth: 0
border-zero: 0 border-zero: 0
brace-style: 0
clean-import-paths: 0 clean-import-paths: 0
empty-args: 0 empty-args: 0
hex-length: 0 hex-length: 0
...@@ -66,7 +83,6 @@ rules: ...@@ -66,7 +83,6 @@ rules:
leading-zero: 0 leading-zero: 0
nesting-depth: 0 nesting-depth: 0
property-sort-order: 0 property-sort-order: 0
quotes: 0
shorthand-values: 0 shorthand-values: 0
url-quotes: 0 url-quotes: 0
variable-for-property: 0 variable-for-property: 0
...@@ -76,12 +92,10 @@ rules: ...@@ -76,12 +92,10 @@ rules:
space-after-comma: 0 space-after-comma: 0
space-before-colon: 0 space-before-colon: 0
space-after-colon: 0 space-after-colon: 0
space-before-brace: 0
space-before-bang: 0 space-before-bang: 0
space-after-bang: 0 space-after-bang: 0
space-between-parens: 0 space-between-parens: 0
space-around-operator: 0 space-around-operator: 0
# Final Items # Final Items
trailing-semicolon: 0
final-newline: 0 final-newline: 0
public/sass/components/_drop.scss
...@@ -5,13 +5,13 @@ $useDropShadow: false; ...@@ -5,13 +5,13 @@ $useDropShadow: false;
$attachmentOffset: 0%; $attachmentOffset: 0%;
$easing: cubic-bezier(0, 0, 0.265, 1); $easing: cubic-bezier(0, 0, 0.265, 1);
@include drop-theme("error", $popover-error-bg, $popover-color); @include drop-theme('error', $popover-error-bg, $popover-color);
@include drop-theme("popover", $popover-bg, $popover-color, $popover-border-color); @include drop-theme('popover', $popover-bg, $popover-color, $popover-border-color);
@include drop-theme("help", $popover-help-bg, $popover-help-color); @include drop-theme('help', $popover-help-bg, $popover-help-color);
@include drop-animation-scale("drop", "help", $attachmentOffset: $attachmentOffset, $easing: $easing); @include drop-animation-scale('drop', 'help', $attachmentOffset: $attachmentOffset, $easing: $easing);
@include drop-animation-scale("drop", "error", $attachmentOffset: $attachmentOffset, $easing: $easing); @include drop-animation-scale('drop', 'error', $attachmentOffset: $attachmentOffset, $easing: $easing);
@include drop-animation-scale("drop", "popover", $attachmentOffset: $attachmentOffset, $easing: $easing); @include drop-animation-scale('drop', 'popover', $attachmentOffset: $attachmentOffset, $easing: $easing);
.drop-element { .drop-element {
z-index: 10000; z-index: 10000;
......
public/sass/components/_filter-list.scss
...@@ -67,17 +67,17 @@ ...@@ -67,17 +67,17 @@
text-transform: uppercase; text-transform: uppercase;
&.online { &.online {
background-image: url("/img/online.svg"); background-image: url('/img/online.svg');
color: $online; color: $online;
} }
&.warn { &.warn {
background-image: url("/img/warn-tiny.svg"); background-image: url('/img/warn-tiny.svg');
color: $warn; color: $warn;
} }
&.critical { &.critical {
background-image: url("/img/critical.svg"); background-image: url('/img/critical.svg');
color: $critical; color: $critical;
} }
} }
......
public/sass/components/_jsontree.scss
...@@ -3,16 +3,20 @@ json-tree { ...@@ -3,16 +3,20 @@ json-tree {
.json-tree-key { .json-tree-key {
vertical-align: middle; vertical-align: middle;
} }
.expandable { .expandable {
position: relative; position: relative;
&::before { &::before {
pointer-events: none; pointer-events: none;
} }
&::before, &::before,
& > .json-tree-key { & > .json-tree-key {
cursor: pointer; cursor: pointer;
} }
} }
.json-tree-branch-preview { .json-tree-branch-preview {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
...@@ -24,36 +28,44 @@ json-tree { ...@@ -24,36 +28,44 @@ json-tree {
ul { ul {
padding-left: $spacer; padding-left: $spacer;
} }
li, li,
ul { ul {
list-style: none; list-style: none;
} }
li { li {
line-height: 1.3rem; line-height: 1.3rem;
} }
.json-tree-key { .json-tree-key {
color: $variable; color: $variable;
padding: 5px 10px 5px 15px; padding: 5px 10px 5px 15px;
&::after { &::after {
content: ":"; content: ':';
} }
} }
json-node.expandable { json-node.expandable {
&::before { &::before {
content: "\25b6"; content: '\25b6';
position: absolute; position: absolute;
left: 0px; left: 0px;
font-size: 8px; font-size: 8px;
transition: transform 0.1s ease; transition: transform 0.1s ease;
} }
&.expanded::before { &.expanded::before {
transform: rotate(90deg); transform: rotate(90deg);
} }
} }
.json-tree-leaf-value, .json-tree-leaf-value,
.json-tree-branch-preview { .json-tree-branch-preview {
word-break: break-all; word-break: break-all;
} }
.json-tree-branch-preview { .json-tree-branch-preview {
overflow: hidden; overflow: hidden;
font-style: italic; font-style: italic;
......
public/sass/components/_panel_editor.scss
...@@ -174,7 +174,6 @@ ...@@ -174,7 +174,6 @@
} }
.panel-editor-tabs { .panel-editor-tabs {
position: relative;
z-index: 2; z-index: 2;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -221,7 +220,6 @@ ...@@ -221,7 +220,6 @@
&:hover { &:hover {
filter: $panel-editor-side-menu-shadow; filter: $panel-editor-side-menu-shadow;
transform: translate(-2px, -2px);
transform: scale(1.1); transform: scale(1.1);
} }
} }
......
public/sass/components/_panel_gettingstarted.scss
...@@ -51,8 +51,7 @@ $path-position: $marker-size-half - ($path-height / 2); ...@@ -51,8 +51,7 @@ $path-position: $marker-size-half - ($path-height / 2);
min-width: $marker-size; min-width: $marker-size;
&::after { &::after {
right: -50%; content: '';
content: "";
display: block; display: block;
position: absolute; position: absolute;
z-index: 1; z-index: 1;
...@@ -105,7 +104,7 @@ $path-position: $marker-size-half - ($path-height / 2); ...@@ -105,7 +104,7 @@ $path-position: $marker-size-half - ($path-height / 2);
// change icon to check // change icon to check
.icon-gf::before { .icon-gf::before {
content: "\e604"; content: '\e604';
} }
} }
.progress-text { .progress-text {
......
public/sass/components/_panel_graph.scss
...@@ -368,7 +368,6 @@ ...@@ -368,7 +368,6 @@
font-size: $font-size-sm; font-size: $font-size-sm;
position: absolute; position: absolute;
text-align: center; text-align: center;
font-size: 12px;
} }
.alert-handle-wrapper { .alert-handle-wrapper {
......
public/sass/components/_shortcuts.scss
...@@ -33,9 +33,8 @@ ...@@ -33,9 +33,8 @@
text-align: center; text-align: center;
margin-right: 0.3rem; margin-right: 0.3rem;
padding: 3px 5px; padding: 3px 5px;
font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace; font: 11px Consolas, 'Liberation Mono', Menlo, Courier, monospace;
line-height: 10px; line-height: 10px;
color: #555;
vertical-align: middle; vertical-align: middle;
background-color: $btn-inverse-bg; background-color: $btn-inverse-bg;
border: solid 1px $btn-inverse-bg-hl; border: solid 1px $btn-inverse-bg-hl;
......
public/sass/components/_sidemenu.scss
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
.sidemenu-open { .sidemenu-open {
.sidemenu { .sidemenu {
background: $side-menu-bg; background: $side-menu-bg;
position: initial;
height: auto; height: auto;
box-shadow: $side-menu-shadow; box-shadow: $side-menu-shadow;
position: relative; position: relative;
z-index: $zindex-sidemenu; z-index: $zindex-sidemenu;
} }
.sidemenu__top, .sidemenu__top,
.sidemenu__bottom { .sidemenu__bottom {
display: block; display: block;
...@@ -212,7 +212,6 @@ li.sidemenu-org-switcher { ...@@ -212,7 +212,6 @@ li.sidemenu-org-switcher {
.sidemenu { .sidemenu {
width: 100%; width: 100%;
background: $side-menu-bg-mobile; background: $side-menu-bg-mobile;
position: initial;
height: auto; height: auto;
box-shadow: $side-menu-shadow; box-shadow: $side-menu-shadow;
position: relative; position: relative;
......
public/sass/components/_slate_editor.scss
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
left: -10000px; left: -10000px;
opacity: 0; opacity: 0;
border-radius: $border-radius; border-radius: $border-radius;
transition: opacity 0.75s;
border: $panel-border; border: $panel-border;
max-height: calc(66vh); max-height: calc(66vh);
overflow-y: scroll; overflow-y: scroll;
......
public/sass/components/_submenu.scss
...@@ -22,10 +22,8 @@ ...@@ -22,10 +22,8 @@
} }
.submenu-item { .submenu-item {
margin-right: 20px;
display: inline-block; display: inline-block;
margin-right: 15px; margin-right: 15px;
display: inline-block;
float: left; float: left;
.fa-caret-down { .fa-caret-down {
...@@ -42,7 +40,6 @@ ...@@ -42,7 +40,6 @@
background-color: $input-bg; background-color: $input-bg;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
border-radius: $input-border-radius; border-radius: $input-border-radius;
color: $input-color;
box-sizing: content-box; box-sizing: content-box;
display: inline-block; display: inline-block;
color: $text-color; color: $text-color;
......
public/sass/components/_switch.scss
...@@ -19,15 +19,14 @@ gf-form-switch[disabled] { ...@@ -19,15 +19,14 @@ gf-form-switch[disabled] {
} }
.gf-form-switch { .gf-form-switch {
display: flex;
position: relative; position: relative;
display: inline-block;
width: 60px; width: 60px;
height: $gf-form-input-height; height: $gf-form-input-height;
background: $switch-bg; background: $switch-bg;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
border-left: none; border-left: none;
border-radius: $input-border-radius; border-radius: $input-border-radius;
display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -77,14 +76,13 @@ input:checked + .gf-form-switch__slider::before { ...@@ -77,14 +76,13 @@ input:checked + .gf-form-switch__slider::before {
.gf-form-checkbox { .gf-form-checkbox {
position: relative; position: relative;
display: inline-block; display: flex;
width: 50px; width: 50px;
height: $gf-form-input-height; height: $gf-form-input-height;
background: $switch-bg; background: $switch-bg;
border: 1px solid $input-border-color; border: 1px solid $input-border-color;
border-left: none; border-left: none;
border-radius: $input-border-radius; border-radius: $input-border-radius;
display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
......
public/sass/components/_tabbed_view.scss
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
.tabbed-view-close-btn { .tabbed-view-close-btn {
float: right; float: right;
padding: 0;
margin: 0; margin: 0;
background-color: transparent; background-color: transparent;
border: none; border: none;
......
public/sass/components/_tags.scss
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
box-shadow: 0 0 1px rgba($white, 0.2); box-shadow: 0 0 1px rgba($white, 0.2);
.icon-tag { .icon-tag {
position: relative; position: relative;
top: 1px; top: 1px;
......
public/sass/components/_tagsinput.scss
...@@ -24,12 +24,15 @@ ...@@ -24,12 +24,15 @@
[data-role='remove'] { [data-role='remove'] {
margin-left: 8px; margin-left: 8px;
cursor: pointer; cursor: pointer;
&::after { &::after {
content: 'x'; content: 'x';
padding: 0px 2px; padding: 0px 2px;
} }
&:hover { &:hover {
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
&:active { &:active {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
} }
......
public/sass/components/_timepicker.scss
...@@ -60,9 +60,11 @@ ...@@ -60,9 +60,11 @@
list-style: none; list-style: none;
float: left; float: left;
margin: 0 30px 10px 0px; margin: 0 30px 10px 0px;
li { li {
line-height: 22px; line-height: 22px;
} }
li.active { li.active {
border-bottom: 1px solid $blue; border-bottom: 1px solid $blue;
margin: 3px 0; margin: 3px 0;
...@@ -77,26 +79,32 @@ ...@@ -77,26 +79,32 @@
td { td {
padding: 1px; padding: 1px;
} }
button { button {
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl); @include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl);
background-image: none; background-image: none;
border: none; border: none;
color: $text-color; color: $text-color;
&.active span { &.active span {
color: $blue; color: $blue;
font-weight: bold; font-weight: bold;
} }
.text-info { .text-info {
color: $orange; color: $orange;
font-weight: bold; font-weight: bold;
} }
&.btn-sm { &.btn-sm {
font-size: $font-size-sm; font-size: $font-size-sm;
padding: 5px 11px; padding: 5px 11px;
} }
&:hover { &:hover {
color: $text-color-strong; color: $text-color-strong;
} }
&[disabled] { &[disabled] {
color: $text-color; color: $text-color;
} }
...@@ -119,6 +127,7 @@ ...@@ -119,6 +127,7 @@
.fa-chevron-left::before { .fa-chevron-left::before {
content: '\f053'; content: '\f053';
} }
.fa-chevron-right::before { .fa-chevron-right::before {
content: '\f054'; content: '\f054';
} }
......
public/sass/components/_tooltip.scss
...@@ -11,21 +11,26 @@ ...@@ -11,21 +11,26 @@
font-size: 11px; font-size: 11px;
line-height: 1.4; line-height: 1.4;
@include opacity(0); @include opacity(0);
&.in { &.in {
@include opacity(100); @include opacity(100);
} }
&.top { &.top {
margin-top: -3px; margin-top: -3px;
padding: 5px 0; padding: 5px 0;
} }
&.right { &.right {
margin-left: 3px; margin-left: 3px;
padding: 0 5px; padding: 0 5px;
} }
&.bottom { &.bottom {
margin-top: 3px; margin-top: 3px;
padding: 5px 0; padding: 5px 0;
} }
&.left { &.left {
margin-left: -3px; margin-left: -3px;
padding: 0 5px; padding: 0 5px;
...@@ -60,6 +65,7 @@ ...@@ -60,6 +65,7 @@
border-width: $tooltipArrowWidth $tooltipArrowWidth 0; border-width: $tooltipArrowWidth $tooltipArrowWidth 0;
border-top-color: $tooltipArrowColor; border-top-color: $tooltipArrowColor;
} }
&.right .tooltip-arrow { &.right .tooltip-arrow {
top: 50%; top: 50%;
left: 0; left: 0;
...@@ -67,6 +73,7 @@ ...@@ -67,6 +73,7 @@
border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0; border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0;
border-right-color: $tooltipArrowColor; border-right-color: $tooltipArrowColor;
} }
&.left .tooltip-arrow { &.left .tooltip-arrow {
top: 50%; top: 50%;
right: 0; right: 0;
...@@ -74,6 +81,7 @@ ...@@ -74,6 +81,7 @@
border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth; border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth;
border-left-color: $tooltipArrowColor; border-left-color: $tooltipArrowColor;
} }
&.bottom .tooltip-arrow { &.bottom .tooltip-arrow {
top: 0; top: 0;
left: 50%; left: 50%;
...@@ -98,6 +106,7 @@ ...@@ -98,6 +106,7 @@
max-height: 600px; max-height: 600px;
overflow: hidden; overflow: hidden;
line-height: 14px; line-height: 14px;
a { a {
color: $tooltipLinkColor; color: $tooltipLinkColor;
} }
......
public/sass/components/_view_states.scss
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
.navbar-page-btn { .navbar-page-btn {
transform: translate3d(-36px, 0, 0); transform: translate3d(-36px, 0, 0);
i { i {
opacity: 0; opacity: 0;
} }
...@@ -40,9 +41,11 @@ ...@@ -40,9 +41,11 @@
.navbar { .navbar {
display: none; display: none;
} }
.scroll-canvas--dashboard { .scroll-canvas--dashboard {
height: 100%; height: 100%;
} }
.submenu-controls { .submenu-controls {
display: none; display: none;
} }
......
public/sass/components/edit_sidemenu.scss
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
li { li {
float: left; float: left;
} }
a { a {
margin: 0.3rem 1rem; margin: 0.3rem 1rem;
} }
......
public/sass/fonts.scss
@import "base/fonts"; @import 'base/fonts';
public/sass/grafana.dark.scss
@import "variables"; @import 'variables';
@import "variables.dark"; @import 'variables.dark';
@import "grafana"; @import 'grafana';
public/sass/grafana.light.scss
@import "variables"; @import 'variables';
@import "variables.light"; @import 'variables.light';
@import "grafana"; @import 'grafana';
public/sass/layout/_page.scss
...@@ -42,15 +42,13 @@ ...@@ -42,15 +42,13 @@
overflow: auto; overflow: auto;
height: 100%; height: 100%;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
display: flex;
flex-direction: column;
&--dashboard { &--dashboard {
height: calc(100% - 56px); height: calc(100% - 56px);
} }
// Sticky footer
display: flex;
flex-direction: column;
> div { > div {
flex-grow: 1; flex-grow: 1;
} }
......
public/sass/mixins/_forms.scss
...@@ -13,16 +13,9 @@ ...@@ -13,16 +13,9 @@
.custom-control { .custom-control {
color: $color; color: $color;
} }
// Set the border and box shadow on specific inputs to match
.form-control { .form-control {
border-color: $color; border-color: $color;
// @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
// border-color: darken($border-color, 10%);
// $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%);
// @include box-shadow($shadow);
}
} }
// Set validation states also for addons // Set validation states also for addons
......
public/sass/pages/_history.scss
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
white-space: nowrap; white-space: nowrap;
position: relative; position: relative;
&:before,
&:after {
}
&:after { &:after {
left: -40px; left: -40px;
} }
......
public/sass/pages/_login.scss
...@@ -13,9 +13,11 @@ $login-border: #8daac5; ...@@ -13,9 +13,11 @@ $login-border: #8daac5;
background-image: url(../img/heatmap_bg_test.svg); background-image: url(../img/heatmap_bg_test.svg);
background-size: cover; background-size: cover;
color: #d8d9da; color: #d8d9da;
& a { & a {
color: #d8d9da !important; color: #d8d9da !important;
} }
& .btn-primary { & .btn-primary {
@include buttonBackground(#ff6600, #bc3e06); @include buttonBackground(#ff6600, #bc3e06);
} }
...@@ -198,6 +200,10 @@ select:-webkit-autofill:focus { ...@@ -198,6 +200,10 @@ select:-webkit-autofill:focus {
border: none; border: none;
font-size: 15px; font-size: 15px;
padding: 10px 10px; padding: 10px 10px;
font-weight: bold;
display: inline-block;
width: 170px;
color: $text-color;
&.active { &.active {
background: darken($tight-form-bg, 5%); background: darken($tight-form-bg, 5%);
...@@ -207,11 +213,6 @@ select:-webkit-autofill:focus { ...@@ -207,11 +213,6 @@ select:-webkit-autofill:focus {
&:focus { &:focus {
outline: 0; outline: 0;
} }
font-weight: bold;
display: inline-block;
width: 170px;
color: $text-color;
} }
.password-strength { .password-strength {
...@@ -222,10 +223,12 @@ select:-webkit-autofill:focus { ...@@ -222,10 +223,12 @@ select:-webkit-autofill:focus {
padding-top: 3px; padding-top: 3px;
color: darken($text-color, 20%); color: darken($text-color, 20%);
border-top: 3px solid $red; border-top: 3px solid $red;
&.password-strength-ok { &.password-strength-ok {
width: 40%; width: 40%;
border-top: 3px solid lighten($yellow, 10%); border-top: 3px solid lighten($yellow, 10%);
} }
&.password-strength-good { &.password-strength-good {
width: 100%; width: 100%;
border-top: 3px solid lighten($green, 10%); border-top: 3px solid lighten($green, 10%);
...@@ -252,6 +255,7 @@ select:-webkit-autofill:focus { ...@@ -252,6 +255,7 @@ select:-webkit-autofill:focus {
.password-recovery { .password-recovery {
background: $tight-form-bg; background: $tight-form-bg;
padding: 10px; padding: 10px;
a { a {
color: $gray-2; color: $gray-2;
} }
......
public/sass/pages/_plugins.scss
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
font-size: $font-size-sm; font-size: $font-size-sm;
position: relative; position: relative;
top: 1.2rem; top: 1.2rem;
&:hover { &:hover {
color: $link-hover-color; color: $link-hover-color;
} }
img { img {
vertical-align: top; vertical-align: top;
} }
...@@ -18,12 +20,12 @@ ...@@ -18,12 +20,12 @@
} }
.plugin-info-list-item { .plugin-info-list-item {
img {
width: 16px;
}
white-space: nowrap; white-space: nowrap;
max-width: $page-sidebar-width; max-width: $page-sidebar-width;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
img {
width: 16px;
}
} }
public/sass/utils/_validation.scss
input[type='text'].ng-dirty.ng-invalid {
}
input.validation-error, input.validation-error,
input.ng-dirty.ng-invalid { input.ng-dirty.ng-invalid {
box-shadow: inset 0 0px 5px $red; box-shadow: inset 0 0px 5px $red;
......
scripts/grunt/options/sasslint.js
...@@ -4,10 +4,9 @@ module.exports = function(config) { ...@@ -4,10 +4,9 @@ module.exports = function(config) {
options: { options: {
configFile: 'public/sass/.sass-lint.yml', configFile: 'public/sass/.sass-lint.yml',
}, },
// src: ['public/sass#<{(||)}>#*'], src: [
target: [ 'public/sass/**/*.scss',
'public/sass/*.scss', 'packages/**/*.scss',
'public/sass/components/*.scss', ],
]
}; };
}; };
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