From aea40d64cffd8f428628bea37148286c0d80a41d Mon Sep 17 00:00:00 2001 From: Raghavendra Kamath Date: Thu, 29 Mar 2018 12:56:49 +0530 Subject: [PATCH] Lint variable.less and common.less (#5291) * Lint variables.less * lint common.less --- frappe/public/less/common.less | 59 ++++++++------ frappe/public/less/variables.less | 124 +++++++++++++----------------- 2 files changed, 91 insertions(+), 92 deletions(-) diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index c15a6ed49e..d967b2756f 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -9,9 +9,15 @@ a { cursor: pointer; } -a, a:hover, a:active, a:focus, -.btn, .btn:hover, .btn:active, .btn:focus { - outline: 0; +a, +a:hover, +a:active, +a:focus, +.btn, +.btn:hover, +.btn:active, +.btn:focus { + outline: 0; } img { @@ -19,17 +25,13 @@ img { } p { - margin: 10px 0px; + margin: 10px 0; } .text-color { color: @text-color !important; } -.text-muted { - color: @text-muted !important; -} - .text-extra-muted { color: @border-color !important; } @@ -44,22 +46,33 @@ a, .transition(background-color .2s); } -a.disabled, a.disabled:hover { +a.disabled, +a.disabled:hover { color: #888; cursor: default; text-decoration: none; } -a.grey, .sidebar-section a, .control-value a, .data-row a { +a.grey, +.sidebar-section a, +.control-value a, +.data-row a { text-decoration: none; } -a.grey:hover, .sidebar-section a:hover, .control-value a:hover, .data-row a:hover, -a.grey:focus, .sidebar-section a:focus, .control-value a:focus, .data-row a:focus { +a.grey:hover, +.sidebar-section a:hover, +.control-value a:hover, +.data-row a:hover, +a.grey:focus, +.sidebar-section a:focus, +.control-value a:focus, +.data-row a:focus { text-decoration: underline; } -a.text-muted, a.text-extra-muted { +a.text-muted, +a.text-extra-muted { text-decoration: none; } @@ -81,11 +94,15 @@ kbd { background-color: @btn-bg; } -.btn [class^="fa fa-"], .nav [class^="fa fa-"], .btn [class*="fa fa-"], .nav [class*="fa fa-"] { +.btn [class^="fa fa-"], +.nav [class^="fa fa-"], +.btn [class*="fa fa-"], +.nav [class*="fa fa-"] { display: inline-block; } -// dropdowns +/* dropdowns */ + .dropdown-menu > li > a { padding: 14px; white-space: normal; @@ -97,10 +114,8 @@ kbd { font-size: @text-medium; max-height: 400px; overflow: auto; - // only rounded bottoms border-radius: 0px 0px 4px 4px; - } .dropdown-menu .dropdown-header { @@ -118,7 +133,7 @@ a.badge-hover& { &:hover .badge, &:focus .badge, &:active .badge { - background-color: #D8DFE5; + background-color: #d8dfe5; } } @@ -163,9 +178,10 @@ a.badge-hover& { color: inherit; display: inline-block; } + .close-inline:hover, .close-inline:focus { - text-decoration: none; + text-decoration: none; } .middle { @@ -191,7 +207,7 @@ a.badge-hover& { #freeze { z-index: 1020; - bottom: 0px; + bottom: 0; opacity: 0; background-color: @light-bg; @@ -202,7 +218,6 @@ a.badge-hover& { .freeze-message { .full-center; text-align: center; - // color: #fff !important; color: @text-color !important; } } @@ -225,7 +240,6 @@ a.no-decoration& { &:active { text-decoration: none; color: inherit; - } } @@ -266,4 +280,3 @@ a.no-decoration& { .ellipsis { .text-ellipsis(); } - diff --git a/frappe/public/less/variables.less b/frappe/public/less/variables.less index 7e427863df..5474a38411 100644 --- a/frappe/public/less/variables.less +++ b/frappe/public/less/variables.less @@ -1,95 +1,81 @@ -@brand-primary: #5E64FF; +@brand-primary: #5e64ff; @erpnext-blue: #7575ff; @border-color: #d1d8dd; -@light-border-color: #EBEFF2; -@text-color: #36414C; +@light-border-color: #ebeff2; +@text-color: #36414c; @text-light: #6c7680; -@text-muted: #8D99A6; -@btn-bg: #F0F4F7; -@panel-bg: #F7FAFC; +@text-muted: #8d99a6; +@btn-bg: #f0f4f7; +@panel-bg: #f7fafc; @grey-link-color: #212a33; -@disabled-background: #f2f5f7; -@navbar-bg: #f5f7fa; -@light-bg: #fafbfc; +@disabled-background: #f2f5f7; +@navbar-bg: #f5f7fa; +@light-bg: #fafbfc; @modal-backdrop-bg: #334143; @light-yellow: #fffce7; -@extra-light-yellow: #fffdf4; +@extra-light-yellow: #fffdf4; @text-extra-muted: @border-color; @text-regular: 14px; @text-medium: 12px; @text-small: 10px; -@text-dark: #2E3338; +@text-dark: #2e3338; @indicator-blue: #5e64ff; @indicator-red: #ff5858; @indicator-green: #98d85b; @indicator-orange: #ffa00a; @indicator-purple: #743ee2; -@indicator-darkgrey: #b8c2cc; -@indicator-yellow: #FEEF72; -@indicator-light-blue: #7CD6FD; - -@heart-color: @indicator-red; - -@navbar-default-color: #6C7680; -@navbar-inverse-color: #9D9D9D; -@navbar-default-bg: #f5f7fa; -@navbar-default-border: #EBEFF2; -@breadcrumb-divider-color: #C0C9D2; - -@label-primary-bg: #D9F6FF; -@label-success-bg: #E4FFC1; -@label-info-bg: #E8DDFF; -@label-warning-bg: #FFE6BF; -@label-danger-bg: #FFDCDC; - -@checkbox-color: #3b99fc; - -@screen-xs: 767px; -@screen-sm: 991px; -@screen-md: 1199px; - -@font-stack: -apple-system, BlinkMacSystemFont, - "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", - "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - -// palette colors -@red: #FC4F51; -@red-light: #FD8B8B; -@red-extra-light: #FEC3C5; -@red-dark: #A63336; - -@blue: #7679FC; -@blue-light: #A3A5FC; -@blue-extra-light: #D1D3FC; -@blue-dark: #4C51A2; - -@green: #C6EA6C; -@green-light: #D9F29E; -@green-extra-light: #EBF7CF; -@green-dark: #7C9142; - -@yellow: #FEEF72; -@yellow-light: #FFF5A0; -@yellow-extra-light: #FEF9CF; -@yellow-dark: #A99E4C; - -@orange: #FD784F; -@orange-light: #FDA688; -@orange-extra-light: #FDD2C2; -@orange-dark: #A64F33; - -@skyblue: #7BD7FC; -@skyblue-light: #AAE3FE; -@skyblue-extra-light: #D4F1FF; -@skyblue-dark: #548DA8; +@indicator-darkgrey: #b8c2cc; +@indicator-yellow: #feef72; +@indicator-light-blue: #7cd6fd; +@heart-color: @indicator-red; +@navbar-default-color: #6c7680; +@navbar-inverse-color: #9d9d9d; +@navbar-default-bg: #f5f7fa; +@navbar-default-border: #ebeff2; +@breadcrumb-divider-color: #c0c9d2; +@label-primary-bg: #d9f6ff; +@label-success-bg: #e4ffc1; +@label-info-bg: #e8ddff; +@label-warning-bg: #ffe6bf; +@label-danger-bg: #ffdcdc; +@checkbox-color: #3b99fc; +@screen-xs: 767px; +@screen-sm: 991px; +@screen-md: 1199px; +@font-stack: -apple-system, BlinkMacSystemFont,"Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell","Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; +/* palette colors*/ +@red: #fc4f51; +@red-light: #fd8b8b; +@red-extra-light: #fec3c5; +@red-dark: #a63336; +@blue: #7679fc; +@blue-light: #a3a5fc; +@blue-extra-light: #d1d3fc; +@blue-dark: #4c51a2; +@green: #c6ea6c; +@green-light: #d9f29e; +@green-extra-light: #ebf7cf; +@green-dark: #7c9142; +@yellow: #feef72; +@yellow-light: #fff5a0; +@yellow-extra-light: #fef9cf; +@yellow-dark: #a99e4c; +@orange: #fd784f; +@orange-light: #fda688; +@orange-extra-light: #fdd2c2; +@orange-dark: #a64f33; +@skyblue: #7bd7fc; +@skyblue-light: #aae3fe; +@skyblue-extra-light: #d4f1ff; +@skyblue-dark: #548da8;