Merge pull request #230 from b952426/refine-for-stylelint

DevChu · web-flow · commit 9b5e12a1da44 · 2021-08-04T10:53:30.000+08:00
refine less for stylelint: no-duplicate-selectors
diff --git a/breeze/src/archive/web/js/zkmax/inp/less/cascader.less b/breeze/src/archive/web/js/zkmax/inp/less/cascader.less
@@ -145,6 +145,7 @@
 
 		.z-cascader-icon {
 			top: 0;
+			right: 5px;
 			line-height: @cascaderPopupItemHeight;
 			transform: none;
 			margin-left: 4px;
@@ -165,8 +166,4 @@
 		.verGradient(@activeGradientStart, @activeGradientEnd);
 		color: @cascaderPopupItemActiveColor;
 	}
-
-	&-item &-icon {
-		right: 5px;
-	}
 }
diff --git a/breeze/src/archive/web/js/zkmax/inp/less/timepicker.less b/breeze/src/archive/web/js/zkmax/inp/less/timepicker.less
@@ -23,6 +23,7 @@
 		&[readonly] {
 			border-color: @readonlyBorderColor;
 			background: @readonlyBackgroundColor;
+			cursor: pointer;
 		}
 		&[readonly]:focus {
 			.boxShadow('none');
@@ -46,7 +47,7 @@
 		padding: 4px;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
-		text-align: left;
+		text-align: center;
 		vertical-align: middle;
 		overflow: hidden;
 		cursor: pointer;
@@ -100,20 +101,10 @@
 	}
 }
 
-.z-timepicker-input {
-	&[readonly] {
-		cursor: pointer;
-	}
-}
-
 .z-timepicker-button.z-timepicker-disabled {
 	display: none;
 }
 
-.z-timepicker-button {
-	text-align: center;
-}
-
 .z-timepicker-inplace .z-timepicker-input {
 	border: 0;
 	padding: 3px;
@@ -128,10 +119,6 @@
 	visibility: hidden;
 }
 
-.z-timepicker-popup {
-	max-height: 200px;
-}
-
 .z-timepicker-option {
 	display: block;
 	padding: 3px 2px;
@@ -171,6 +158,7 @@
 	background: @popupBackgroundColor;
 	position: absolute;
 	overflow: auto;
+	max-height: 200px
 }
 
 .z-timepicker-content {
diff --git a/breeze/src/archive/web/js/zkmax/layout/less/portallayout.less b/breeze/src/archive/web/js/zkmax/layout/less/portallayout.less
@@ -14,11 +14,6 @@
 .z-portalchildren-content {
 	.size(100%, 100%);
 }
-.z-portallayout-horizontal { 
-	> .z-portalchildren {
-		height: 100%;
-	}
-}
 
 .z-portallayout-horizontal	.z-portalchildren-content {
 	> .z-panel,
@@ -124,6 +119,7 @@
 
 .z-portallayout-horizontal {
 	> .z-portalchildren {
+		height: 100%;
 		&-frame {
 			float: left;
 			clear: both;
diff --git a/breeze/src/archive/web/js/zul/inp/less/input.less b/breeze/src/archive/web/js/zul/inp/less/input.less
@@ -113,10 +113,12 @@
 	top: 8px;
 	right: 8px;
 	cursor: pointer;
+	.opacity(0.6);
 
 	&:hover {
 		border: 1px solid @errorboxBorderColor;
 		.borderRadius(@borderRadiusSmall - 1);
+		.opacity(1);
 	}
 }
 .z-errorbox-icon {
@@ -139,11 +141,4 @@
 }
 .z-errorbox-up ~ .z-errorbox-close {
 	top: 15px;
-}
-
-.z-errorbox-close {
-	.opacity(0.6);
-	&:hover {
-		.opacity(1);
-	}
 }
diff --git a/breeze/src/archive/web/js/zul/layout/less/borderlayout.less b/breeze/src/archive/web/js/zul/layout/less/borderlayout.less
@@ -89,6 +89,10 @@
 .z-west,
 .z-east {
 	height: 100%; // Fixed for B30-1902533.zul
+	&-title {
+		.transform('rotate(90deg)');
+		.applyCSS3('transform-origin', 'left bottom');
+	}
 }
 
 .z-west,
@@ -146,6 +150,13 @@
 		.opacity(0.5);
 		position: absolute;
 	}
+	&-title {
+		.fontStyle(@baseTitleFontFamily, @fontSizeMedium, bold, @textColorGray);
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		line-height: @baseButtonHeight;
+	}
 }
 .z-north-splitter,
 .z-south-splitter {
@@ -220,25 +231,4 @@
 .z-south-splitter-button {
 	.size(30px, 8px);
 	border-width: 0 1px;
-}
-
-.z-north,
-.z-south,
-.z-west,
-.z-east {
-	&-title {
-		.fontStyle(@baseTitleFontFamily, @fontSizeMedium, bold, @textColorGray);
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		overflow: hidden;
-		line-height: @baseButtonHeight;
-	}
-}
-
-.z-west,
-.z-east {
-	&-title {
-		.transform('rotate(90deg)');
-		.applyCSS3('transform-origin', 'left bottom');
-	}
 }
diff --git a/breeze/src/archive/web/js/zul/sel/less/tree.less b/breeze/src/archive/web/js/zul/sel/less/tree.less
@@ -63,9 +63,7 @@
 		background: transparent no-repeat center;
 		.encodeThemeURL(background-image, '~./zul/img/misc/progress.gif');
 	}
-}
-//tree open icon and indent space
-.z-tree {
+	//tree open icon and indent space
 	&-icon,
 	&-line {
 		.displaySize(inline-block, @baseIconWidth, @baseIconHeight);
diff --git a/sapphire/src/archive/web/js/zkmax/inp/less/cascader.less b/sapphire/src/archive/web/js/zkmax/inp/less/cascader.less
@@ -145,6 +145,7 @@
 
 		.z-cascader-icon {
 			top: 0;
+			right: 5px;
 			line-height: @cascaderPopupItemHeight;
 			transform: none;
 			margin-left: 4px;
@@ -174,8 +175,4 @@
 			color: @cascaderPopupItemActiveColor;
 		}
 	}
-
-	&-item &-icon {
-		right: 5px;
-	}
 }
diff --git a/sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less b/sapphire/src/archive/web/js/zkmax/inp/less/timepicker.less
@@ -23,6 +23,7 @@
 		&[readonly] {
 			border-color: @readonlyBorderColor;
 			background: @readonlyBackgroundColor;
+			cursor: pointer;
 		}
 		&[readonly]:focus {
 			.boxShadow('none');
@@ -46,7 +47,7 @@
 		padding: 4px;
 		line-height: @baseLineHeight;
 		background: @inputBackgroundColor;
-		text-align: left;
+		text-align: center;
 		vertical-align: middle;
 		overflow: hidden;
 		cursor: pointer;
@@ -100,20 +101,10 @@
 	}
 }
 
-.z-timepicker-input {
-	&[readonly] {
-		cursor: pointer;
-	}
-}
-
 .z-timepicker-button.z-timepicker-disabled {
 	display: none;
 }
 
-.z-timepicker-button {
-	text-align: center;
-}
-
 .z-timepicker-inplace .z-timepicker-input {
 	border: 0;
 	padding: 3px;
@@ -128,10 +119,6 @@
 	visibility: hidden;
 }
 
-.z-timepicker-popup {
-	max-height: 200px;
-}
-
 .z-timepicker-option {
 	display: block;
 	padding: 3px 2px;
@@ -171,6 +158,7 @@
 	background: @popupBackgroundColor;
 	position: absolute;
 	overflow: auto;
+	max-height: 200px;
 }
 
 .z-timepicker-content {
diff --git a/sapphire/src/archive/web/js/zkmax/layout/less/portallayout.less b/sapphire/src/archive/web/js/zkmax/layout/less/portallayout.less
@@ -5,7 +5,7 @@
 .z-portalchildren-content {
 	overflow: hidden;
 }
-.z-portallayout-vertical { 
+.z-portallayout-vertical {
 	> .z-portalchildren {
 		height: 100%;
 		float: left;
@@ -14,11 +14,6 @@
 .z-portalchildren-content {
 	.size(100%, 100%);
 }
-.z-portallayout-horizontal { 
-	> .z-portalchildren {
-		height: 100%;
-	}
-}
 
 .z-portallayout-horizontal	.z-portalchildren-content {
 	> .z-panel,
@@ -124,6 +119,7 @@
 
 .z-portallayout-horizontal {
 	> .z-portalchildren {
+		height: 100%;
 		&-frame {
 			float: left;
 			clear: both;
diff --git a/sapphire/src/archive/web/js/zul/inp/less/input.less b/sapphire/src/archive/web/js/zul/inp/less/input.less
@@ -113,10 +113,12 @@
 	top: 8px;
 	right: 8px;
 	cursor: pointer;
+	.opacity(0.6);
 
 	&:hover {
 		border: 1px solid @errorboxBorderColor;
 		.borderRadius(@borderRadiusSmall - 1);
+		.opacity(1);
 	}
 }
 .z-errorbox-icon {
@@ -139,11 +141,4 @@
 }
 .z-errorbox-up ~ .z-errorbox-close {
 	top: 15px;
-}
-
-.z-errorbox-close {
-	.opacity(0.6);
-	&:hover {
-		.opacity(1);
-	}
 }
diff --git a/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less b/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less
@@ -89,6 +89,10 @@
 .z-west,
 .z-east {
 	height: 100%; // Fixed for B30-1902533.zul
+	&-title {
+		.transform('rotate(90deg)');
+		.applyCSS3('transform-origin', 'left bottom');
+	}
 }
 
 .z-west,
@@ -220,25 +224,4 @@
 .z-south-splitter-button {
 	.size(30px, 8px);
 	border-width: 0 1px;
-}
-
-.z-north,
-.z-south,
-.z-west,
-.z-east {
-	&-title {
-		.fontStyle(@baseTitleFontFamily, @fontSizeMedium, bold, @textColorGray);
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		overflow: hidden;
-		line-height: @baseButtonHeight;
-	}
-}
-
-.z-west,
-.z-east {
-	&-title {
-		.transform('rotate(90deg)');
-		.applyCSS3('transform-origin', 'left bottom');
-	}
 }
diff --git a/sapphire/src/archive/web/js/zul/sel/less/tree.less b/sapphire/src/archive/web/js/zul/sel/less/tree.less
@@ -63,9 +63,7 @@
 		background: transparent no-repeat center;
 		.encodeThemeURL(background-image, '~./zul/img/misc/progress.gif');
 	}
-}
-//tree open icon and indent space
-.z-tree {
+	//tree open icon and indent space
 	&-icon,
 	&-line {
 		.displaySize(inline-block, @baseIconWidth, @baseIconHeight);
diff --git a/silvertail/src/archive/web/js/zkmax/inp/less/cascader.less b/silvertail/src/archive/web/js/zkmax/inp/less/cascader.less
@@ -145,6 +145,7 @@
 
 		.z-cascader-icon {
 			top: 0;
+			right: 5px;
 			line-height: @cascaderPopupItemHeight;
 			transform: none;
 			margin-left: 4px;
@@ -165,8 +166,4 @@
 		.verGradient(@activeGradientStart, @activeGradientEnd);
 		color: @cascaderPopupItemActiveColor;
 	}
-
-	&-item &-icon {
-		right: 5px;
-	}
 }
diff --git a/silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less b/silvertail/src/archive/web/js/zkmax/inp/less/timepicker.less
diff --git a/silvertail/src/archive/web/js/zkmax/layout/less/portallayout.less b/silvertail/src/archive/web/js/zkmax/layout/less/portallayout.less
diff --git a/silvertail/src/archive/web/js/zul/inp/less/input.less b/silvertail/src/archive/web/js/zul/inp/less/input.less
diff --git a/silvertail/src/archive/web/js/zul/layout/less/borderlayout.less b/silvertail/src/archive/web/js/zul/layout/less/borderlayout.less
diff --git a/silvertail/src/archive/web/js/zul/sel/less/tree.less b/silvertail/src/archive/web/js/zul/sel/less/tree.less

Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,12 @@`
`113`	`113`	`top: 8px;`
`114`	`114`	`right: 8px;`
`115`	`115`	`cursor: pointer;`
	`116`	`+ .opacity(0.6);`
`116`	`117`
`117`	`118`	`&:hover {`
`118`	`119`	`border: 1px solid @errorboxBorderColor;`
`119`	`120`	`.borderRadius(@borderRadiusSmall - 1);`
	`121`	`+ .opacity(1);`
`120`	`122`	`}`
`121`	`123`	`}`
`122`	`124`	`.z-errorbox-icon {`
`@@ -139,11 +141,4 @@`
`139`	`141`	`}`
`140`	`142`	`.z-errorbox-up ~ .z-errorbox-close {`
`141`	`143`	`top: 15px;`
`142`		`-}`
`143`		`-`
`144`		`-.z-errorbox-close {`
`145`		`- .opacity(0.6);`
`146`		`- &:hover {`
`147`		`- .opacity(1);`
`148`		`- }`
`149`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@`
`145`	`145`
`146`	`146`	`.z-cascader-icon {`
`147`	`147`	`top: 0;`
	`148`	`+ right: 5px;`
`148`	`149`	`line-height: @cascaderPopupItemHeight;`
`149`	`150`	`transform: none;`
`150`	`151`	`margin-left: 4px;`
`@@ -174,8 +175,4 @@`
`174`	`175`	`color: @cascaderPopupItemActiveColor;`
`175`	`176`	`}`
`176`	`177`	`}`
`177`		`-`
`178`		`- &-item &-icon {`
`179`		`- right: 5px;`
`180`		`- }`
`181`	`178`	`}`