From 9af941741da423ca4554b84ed8fa2281dd8b3282 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Fri, 8 Dec 2017 17:30:45 +0100 Subject: [PATCH] Fix trailing whitespace and empty selectors in less --- .lesshintrc | 4 +--- customize.dist/src/less2/include/alertify.less | 13 +++++-------- customize.dist/src/less2/include/colortheme.less | 2 +- customize.dist/src/less2/include/infopages.less | 5 ++--- customize.dist/src/less2/pages/page-about.less | 2 +- customize.dist/src/less2/pages/page-index.less | 8 +------- customize.dist/src/less2/pages/page-login.less | 7 ++----- 7 files changed, 13 insertions(+), 28 deletions(-) diff --git a/.lesshintrc b/.lesshintrc index 8f743df8c..82df18925 100644 --- a/.lesshintrc +++ b/.lesshintrc @@ -29,7 +29,5 @@ // These rules are really good rules to have around IMO (Caleb) but they're not being honored. "duplicateProperty": false, "trailingSemicolon": false, - "emptyRule": false, - "maxCharPerLine": false, - "trailingWhitespace": false + "maxCharPerLine": false } diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less index ed0f1baf9..ce23938db 100644 --- a/customize.dist/src/less2/include/alertify.less +++ b/customize.dist/src/less2/include/alertify.less @@ -152,16 +152,13 @@ input:not(.form-control), textarea { background-color: @alertify-input-bg; - color: @alertify-input-fg; + color: @alertify-input-fg; border: 0px; margin-bottom: 15px; width: 100%; font-size: 100%; padding: @alertify_padding-base; - &:focus { - //outline-offset: -2px; - } } input[type="checkbox"] { @@ -244,7 +241,7 @@ &.bottom, &:not(.top) { bottom: 16px; - // Bottom left placement. Default. Use for transitions. + /* // Bottom left placement. Default. Use for transitions. &.left, &:not(.right) { > * { @@ -255,7 +252,7 @@ > * { } - } + }*/ } // All left positions. @@ -293,7 +290,7 @@ &.top { top: 0; - // Top left placement, use for transitions. + /* // Top left placement, use for transitions. &.left, &:not(.right) { > * { @@ -304,7 +301,7 @@ > * { } - } + }*/ } > * { diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 4f3d42584..afa40cfd4 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -103,7 +103,7 @@ @colortheme_sidebar-button-red-bg: #e54e4e; @colortheme_sidebar-button-alt-bg: #fff; -@cryptpad_color_blue: #4591C4; +@cryptpad_color_blue: #4591C4; @cryptpad_color_grey: #999999; @cryptpad_header_col: #1E1F1F; @cryptpad_text_col: #3F4141; diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index f6e752633..3c3bdef5e 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -89,7 +89,6 @@ color: #fff; padding-top: 30%; margin-bottom: 0; - } } @@ -152,8 +151,8 @@ } } -// navigation top bar -.navbar { +// navigation top bar +.navbar { background: #fff; .navbar-brand { display: block; diff --git a/customize.dist/src/less2/pages/page-about.less b/customize.dist/src/less2/pages/page-about.less index f8decce8f..2ce8ae540 100644 --- a/customize.dist/src/less2/pages/page-about.less +++ b/customize.dist/src/less2/pages/page-about.less @@ -112,4 +112,4 @@ } .cp-margin-bot { margin-bottom: 1.5em; -} +} diff --git a/customize.dist/src/less2/pages/page-index.less b/customize.dist/src/less2/pages/page-index.less index 49e179b75..57f61bea1 100644 --- a/customize.dist/src/less2/pages/page-index.less +++ b/customize.dist/src/less2/pages/page-index.less @@ -1,9 +1,6 @@ -//@import (once) "./variables.less"; - @import (once) "../include/infopages.less"; @import (once) "../include/colortheme-all.less"; - .infopages_main(); .infopages_topbar(); @@ -139,10 +136,7 @@ h4 { .bs-callout:hover { //color: white; transform: scale(1.05); - cursor: pointer; -} -.bs-callout:hover .fa { - //width: 100%; + cursor: pointer; } .bs-callout:hover.cp-callout-more { transform: none !important; diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index 28916f730..77dead84c 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -12,15 +12,12 @@ display: flex; align-items: center; justify-content: space-between; - width: 100%; - .login { - } } } .cp-container { #data { - background: #4591C4; + background: #4591C4; padding-top: 3em; padding-bottom: 7em; padding-left: 30px; @@ -61,7 +58,7 @@ border-radius: 0; &:hover { transform: scale(1.05); - } + } } } }