Skip to content

EspoCRM – Open Source CRM Application

LESS cleanup

Yuriiab176f6a2cb5
diff --git a/frontend/less/espo/bootstrap/mixins.less b/frontend/less/espo/bootstrap/mixins.less
index cca263f1fb..4f4d82b140 100644
--- a/frontend/less/espo/bootstrap/mixins.less
+++ b/frontend/less/espo/bootstrap/mixins.less
@@ -17,7 +17,6 @@
// Skins
@import "mixins/border-radius.less";
-@import "mixins/gradients.less";
// Layout
@import "mixins/clearfix.less";
diff --git a/frontend/less/espo/bootstrap/mixins/center-block.less b/frontend/less/espo/bootstrap/mixins/center-block.less
index d18d6de9ed..b3a5ea8ffe 100644
--- a/frontend/less/espo/bootstrap/mixins/center-block.less
+++ b/frontend/less/espo/bootstrap/mixins/center-block.less
@@ -1,7 +1,5 @@
-// Center-align a block level element
-
.center-block() {
- display: block;
- margin-left: auto;
- margin-right: auto;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
}
diff --git a/frontend/less/espo/bootstrap/mixins/clearfix.less b/frontend/less/espo/bootstrap/mixins/clearfix.less
index 3f7a3820c1..6f8a14476d 100644
--- a/frontend/less/espo/bootstrap/mixins/clearfix.less
+++ b/frontend/less/espo/bootstrap/mixins/clearfix.less
@@ -1,6 +1,3 @@
-// Clearfix
-//
-// For modern browsers
// 1. The space content is one way to avoid an Opera bug when the
// contenteditable attribute is included anywhere else in the document.
// Otherwise it causes space to appear at the top and bottom of elements
@@ -11,12 +8,13 @@
// Source: http://nicolasgallagher.com/micro-clearfix-hack/
.clearfix() {
- &:before,
- &:after {
- content: " "; // 1
- display: table; // 2
- }
- &:after {
- clear: both;
- }
+ &:before,
+ &:after {
+ content: " ";
+ display: table;
+ }
+
+ &:after {
+ clear: both;
+ }
}
diff --git a/frontend/less/espo/bootstrap/mixins/gradients.less b/frontend/less/espo/bootstrap/mixins/gradients.less
deleted file mode 100644
index 0b88a89cc5..0000000000
--- a/frontend/less/espo/bootstrap/mixins/gradients.less
+++ /dev/null
@@ -1,59 +0,0 @@
-// Gradients
-
-#gradient {
-
- // Horizontal gradient, from left to right
- //
- // Creates two color stops, start and end, by specifying a color and position for each color stop.
- // Color stops are not available in IE9 and below.
- .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
- background-image: -webkit-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+
- background-image: -o-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Opera 12
- background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
- background-repeat: repeat-x;
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down
- }
-
- // Vertical gradient, from top to bottom
- //
- // Creates two color stops, start and end, by specifying a color and position for each color stop.
- // Color stops are not available in IE9 and below.
- .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
- background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+
- background-image: -o-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Opera 12
- background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
- background-repeat: repeat-x;
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down
- }
-
- .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {
- background-repeat: repeat-x;
- background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+
- background-image: -o-linear-gradient(@deg, @start-color, @end-color); // Opera 12
- background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
- }
- .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
- background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
- background-image: -o-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
- background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);
- background-repeat: no-repeat;
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
- }
- .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
- background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
- background-image: -o-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
- background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);
- background-repeat: no-repeat;
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
- }
- .radial(@inner-color: #555; @outer-color: #333) {
- background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);
- background-image: radial-gradient(circle, @inner-color, @outer-color);
- background-repeat: no-repeat;
- }
- .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {
- background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
- background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
- }
-}
diff --git a/frontend/less/espo/bootstrap/mixins/grid-framework.less b/frontend/less/espo/bootstrap/mixins/grid-framework.less
index b1cb4adcd3..0ab91abb66 100644
--- a/frontend/less/espo/bootstrap/mixins/grid-framework.less
+++ b/frontend/less/espo/bootstrap/mixins/grid-framework.less
@@ -1,91 +1,97 @@
-// Framework grid generation
-//
-// Used only by Bootstrap to generate the correct number of grid classes given
-// any value of `@grid-columns`.
-
.make-grid-columns() {
- // Common styles for all sizes of grid columns, widths 1-12
- .col(@index) { // initial
- @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
- .col((@index + 1), @item);
- }
- .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
- @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
- .col((@index + 1), ~"@{list}, @{item}");
- }
- .col(@index, @list) when (@index > @grid-columns) { // terminal
- @{list} {
- position: relative;
- // Prevent columns from collapsing when empty
- min-height: 1px;
- // Inner gutter via padding
- padding-left: var(--grid-gutter-width-half);
- padding-right: var(--grid-gutter-width-half);
+ // Common styles for all sizes of grid columns, widths 1-12
+ .col(@index) { // initial
+ @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
+ .col((@index + 1), @item);
+ }
+
+ .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
+ @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
+ .col((@index + 1), ~"@{list}, @{item}");
}
- }
- .col(1); // kickstart it
+
+ .col(@index, @list) when (@index > @grid-columns) { // terminal
+ @{list} {
+ position: relative;
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: var(--grid-gutter-width-half);
+ padding-right: var(--grid-gutter-width-half);
+ }
+ }
+
+ .col(1); // kickstart it
}
.float-grid-columns(@class) {
- .col(@index) { // initial
- @item: ~".col-@{class}-@{index}";
- .col((@index + 1), @item);
- }
- .col(@index, @list) when (@index =< @grid-columns) { // general
- @item: ~".col-@{class}-@{index}";
- .col((@index + 1), ~"@{list}, @{item}");
- }
- .col(@index, @list) when (@index > @grid-columns) { // terminal
- @{list} {
- float: left;
+ .col(@index) { // initial
+ @item: ~".col-@{class}-@{index}";
+ .col((@index + 1), @item);
}
- }
- .col(1); // kickstart it
+
+ .col(@index, @list) when (@index =< @grid-columns) { // general
+ @item: ~".col-@{class}-@{index}";
+ .col((@index + 1), ~"@{list}, @{item}");
+ }
+
+ .col(@index, @list) when (@index > @grid-columns) { // terminal
+ @{list} {
+ float: left;
+ }
+ }
+
+ .col(1); // kickstart it
}
.calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {
- .col-@{class}-@{index} {
- width: percentage((@index / @grid-columns));
- }
+ .col-@{class}-@{index} {
+ width: percentage((@index / @grid-columns));
+ }
}
+
.calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) {
- .col-@{class}-push-@{index} {
- left: percentage((@index / @grid-columns));
- }
+ .col-@{class}-push-@{index} {
+ left: percentage((@index / @grid-columns));
+ }
}
+
.calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) {
- .col-@{class}-push-0 {
- left: auto;
- }
+ .col-@{class}-push-0 {
+ left: auto;
+ }
}
+
.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) {
- .col-@{class}-pull-@{index} {
- right: percentage((@index / @grid-columns));
- }
+ .col-@{class}-pull-@{index} {
+ right: percentage((@index / @grid-columns));
+ }
}
+
.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) {
- .col-@{class}-pull-0 {
- right: auto;
- }
+ .col-@{class}-pull-0 {
+ right: auto;
+ }
}
+
.calc-grid-column(@index, @class, @type) when (@type = offset) {
- .col-@{class}-offset-@{index} {
- margin-left: percentage((@index / @grid-columns));
- }
+ .col-@{class}-offset-@{index} {
+ margin-left: percentage((@index / @grid-columns));
+ }
}
// Basic looping in LESS
.loop-grid-columns(@index, @class, @type) when (@index >= 0) {
- .calc-grid-column(@index, @class, @type);
- // next iteration
- .loop-grid-columns((@index - 1), @class, @type);
+ .calc-grid-column(@index, @class, @type);
+ // next iteration
+ .loop-grid-columns((@index - 1), @class, @type);
}
// Create grid for specific class
.make-grid(@class) {
- .float-grid-columns(@class);
- .loop-grid-columns(@grid-columns, @class, width);
- .loop-grid-columns(@grid-columns, @class, pull);
- .loop-grid-columns(@grid-columns, @class, push);
- .loop-grid-columns(@grid-columns, @class, offset);
+ .float-grid-columns(@class);
+ .loop-grid-columns(@grid-columns, @class, width);
+ .loop-grid-columns(@grid-columns, @class, pull);
+ .loop-grid-columns(@grid-columns, @class, push);
+ .loop-grid-columns(@grid-columns, @class, offset);
}
diff --git a/frontend/less/espo/bootstrap/mixins/grid.less b/frontend/less/espo/bootstrap/mixins/grid.less
index 2ea805e226..95d336eec8 100644
--- a/frontend/less/espo/bootstrap/mixins/grid.less
+++ b/frontend/less/espo/bootstrap/mixins/grid.less
@@ -1,7 +1,3 @@
-// Grid system
-//
-// Generate semantic grid columns with these mixins.
-
// Centered container element
.container-fixed() {
margin-right: auto;
@@ -30,13 +26,13 @@
padding-right: var(--grid-gutter-width-half);
}
.make-xs-column-offset(@columns) {
- margin-left: percentage((@columns / @grid-columns));
+ margin-left: percentage((@columns / @grid-columns));
}
.make-xs-column-push(@columns) {
- left: percentage((@columns / @grid-columns));
+ left: percentage((@columns / @grid-columns));
}
.make-xs-column-pull(@columns) {
- right: percentage((@columns / @grid-columns));
+ right: percentage((@columns / @grid-columns));
}
// Generate the small columns
@@ -46,25 +42,25 @@
padding-left: var(--grid-gutter-width-half);
padding-right: var(--grid-gutter-width-half);
- @media (min-width: @screen-sm-min) {
- float: left;
- width: percentage((@columns / @grid-columns));
- }
+ @media (min-width: @screen-sm-min) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
}
.make-sm-column-offset(@columns) {
- @media (min-width: @screen-sm-min) {
- margin-left: percentage((@columns / @grid-columns));
- }
+ @media (min-width: @screen-sm-min) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
}
.make-sm-column-push(@columns) {
- @media (min-width: @screen-sm-min) {
- left: percentage((@columns / @grid-columns));
- }
+ @media (min-width: @screen-sm-min) {
+ left: percentage((@columns / @grid-columns));
+ }
}
.make-sm-column-pull(@columns) {
- @media (min-width: @screen-sm-min) {
- right: percentage((@columns / @grid-columns));
- }
+ @media (min-width: @screen-sm-min) {
+ right: percentage((@columns / @grid-columns));
+ }
}
// Generate the medium columns
diff --git a/frontend/less/espo/bootstrap/progress-bars.less b/frontend/less/espo/bootstrap/progress-bars.less
index 39dfda2a52..f860aebd1b 100644
--- a/frontend/less/espo/bootstrap/progress-bars.less
+++ b/frontend/less/espo/bootstrap/progress-bars.less
@@ -1,54 +1,45 @@
-// Progress bars
-
-
@keyframes progress-bar-stripes {
- from { background-position: var(--40px) 0; }
- to { background-position: 0 0; }
+ from { background-position: var(--40px) 0; }
+ to { background-position: 0 0; }
}
.progress {
- overflow: hidden;
- height: var(--line-height-computed);
- margin-bottom: var(--line-height-computed);
- background-color: var(--default-heading-bg-color);
+ overflow: hidden;
+ height: var(--line-height-computed);
+ margin-bottom: var(--line-height-computed);
+ background-color: var(--default-heading-bg-color);
}
// Bar of progress
.progress-bar {
- float: left;
- width: 0;
- height: 100%;
- font-size: var(--font-size-small);
- line-height: var(--line-height-computed);
- color: var(--white-color);
- text-align: center;
- background-color: var(--brand-primary);
- .transition(width .6s ease);
-}
-
-.progress-striped .progress-bar,
-.progress-bar-striped {
- #gradient > .striped();
- background-size: var(--40px) var(--40px);
+ float: left;
+ width: 0;
+ height: 100%;
+ font-size: var(--font-size-small);
+ line-height: var(--line-height-computed);
+ color: var(--white-color);
+ text-align: center;
+ background-color: var(--brand-primary);
+ .transition(width .6s ease);
}
.progress.active .progress-bar,
.progress-bar.active {
- .animation(progress-bar-stripes 2s linear infinite);
+ .animation(progress-bar-stripes 2s linear infinite);
}
.progress-bar-success {
- .progress-bar-variant(var(--brand-success));
+ .progress-bar-variant(var(--brand-success));
}
.progress-bar-info {
- .progress-bar-variant(var(--brand-info));
+ .progress-bar-variant(var(--brand-info));
}
.progress-bar-warning {
- .progress-bar-variant(var(--brand-warning));
+ .progress-bar-variant(var(--brand-warning));
}
.progress-bar-danger {
- .progress-bar-variant(var(--brand-danger));
+ .progress-bar-variant(var(--brand-danger));
}
diff --git a/frontend/less/espo/bootstrap/utilities.less b/frontend/less/espo/bootstrap/utilities.less
index 559e6d298a..28775867e2 100644
--- a/frontend/less/espo/bootstrap/utilities.less
+++ b/frontend/less/espo/bootstrap/utilities.less
@@ -7,22 +7,22 @@
// -------------------------
.clearfix {
- .clearfix();
+ .clearfix();
}
.center-block {
- .center-block();
+ .center-block();
}
.pull-right {
- float: right !important;
+ float: right !important;
}
.pull-left {
- float: left !important;
+ float: left !important;
}
.pull-start {
- float: inline-start !important;
+ float: inline-start !important;
}
.pull-end {
- float: inline-end !important;
+ float: inline-end !important;
}