8
0
Просмотр исходного кода

Fixed border-radius of ck-dropdown__panel and ck-list.

dkonopka 8 лет назад
Родитель
Сommit
31d8d944bd

+ 69 - 65
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/dropdown/dropdown.css

@@ -3,68 +3,72 @@
  * For licensing, see LICENSE.md.
  */
 
-@import "../../../mixins/_rounded.css";
-@import "../../../mixins/_disabled.css";
-@import "../../../mixins/_shadow.css";
-
-:root {
-	--ck-dropdown-arrow-size: calc(0.5 * var(--ck-icon-size));
-}
-
-.ck-dropdown {
-	/* Enable font size inheritance, which allows fluid UI scaling. */
-	font-size: inherit;
-
-	& .ck-dropdown__arrow {
-		right: var(--ck-spacing-standard);
-		width: var(--ck-dropdown-arrow-size);
-	}
-
-	&.ck-disabled .ck-dropdown__arrow {
-		@mixin ck-disabled;
-	}
-
-	& .ck-button.ck-dropdown__button {
-		/* A space to accommodate the triangle. */
-		padding-right: calc(2.5 * var(--ck-spacing-standard));
-
-		&:not(.ck-button_with-text) {
-			/* Make sure dropdowns with just an icon have the right inner spacing */
-			padding-left: var(--ck-spacing-small);
-		}
-
-		/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/70 */
-		&.ck-disabled .ck-button__label {
-			@mixin ck-disabled;
-		}
-
-		&.ck-on {
-			border-bottom-left-radius: 0;
-			border-bottom-right-radius: 0;
-		}
-
-		/* #23 */
-		& .ck-button__label {
-			width: 7em;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-}
-
-.ck-dropdown__panel {
-	@mixin ck-rounded-corners;
-	@mixin ck-drop-shadow;
-
-	@nest .ck-dropdown & {
-		/* Disabled radius of top-left border to be consistent with .dropdown__button */
-		border-top-left-radius: 0;
-	}
-
-	background: var(--ck-color-dropdown-panel-background);
-	border: 1px solid var(--ck-color-dropdown-panel-border);
-	bottom: 0;
-
-	/* Make sure the panel is at least as wide as the dropdown's button. */
-	min-width: 100%;
-}
+ @import "../../../mixins/_rounded.css";
+ @import "../../../mixins/_disabled.css";
+ @import "../../../mixins/_shadow.css";
+ 
+ :root {
+	 --ck-dropdown-arrow-size: calc(0.5 * var(--ck-icon-size));
+ }
+ 
+ .ck-dropdown {
+	 /* Enable font size inheritance, which allows fluid UI scaling. */
+	 font-size: inherit;
+ 
+	 & .ck-dropdown__arrow {
+		 right: var(--ck-spacing-standard);
+		 width: var(--ck-dropdown-arrow-size);
+	 }
+ 
+	 &.ck-disabled .ck-dropdown__arrow {
+		 @mixin ck-disabled;
+	 }
+ 
+	 & .ck-button.ck-dropdown__button {
+		 /* A space to accommodate the triangle. */
+		 padding-right: calc(2.5 * var(--ck-spacing-standard));
+ 
+		 &:not(.ck-button_with-text) {
+			 /* Make sure dropdowns with just an icon have the right inner spacing */
+			 padding-left: var(--ck-spacing-small);
+		 }
+ 
+		 /* https://github.com/ckeditor/ckeditor5-theme-lark/issues/70 */
+		 &.ck-disabled .ck-button__label {
+			 @mixin ck-disabled;
+		 }
+ 
+		 &.ck-on {
+			 border-bottom-left-radius: 0;
+			 border-bottom-right-radius: 0;
+		 }
+ 
+		 /* #23 */
+		 & .ck-button__label {
+			 width: 7em;
+			 overflow: hidden;
+			 text-overflow: ellipsis;
+		 }
+	 }
+ }
+ 
+ .ck-dropdown__panel {
+	 @mixin ck-rounded-corners;
+	 @mixin ck-drop-shadow;
+ 
+	 @nest .ck-dropdown & {
+		 /* Disabled radius of top-left border to be consistent with .dropdown__button */
+		 border-top-left-radius: 0;
+	 }
+	 
+	 /* https://github.com/ckeditor/ckeditor5-theme-lark/pull/146 */
+	 overflow: hidden;
+ 
+	 background: var(--ck-color-dropdown-panel-background);
+	 border: 1px solid var(--ck-color-dropdown-panel-border);
+	 bottom: 0;
+ 
+	 /* Make sure the panel is at least as wide as the dropdown's button. */
+	 min-width: 100%;
+ }
+ 

+ 0 - 2
packages/ckeditor5-theme-lark/theme/ckeditor5-ui/components/list/list.css

@@ -7,8 +7,6 @@
 @import "../../../mixins/_shadow.css";
 
 .ck-list {
-	@mixin ck-rounded-corners;
-
 	list-style-type: none;
 	background: var(--ck-color-list-background);
 }