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

Adjusted visual styles for editor with ck-rounded-corners mixin.

Aleksander Nowodzinski 9 лет назад
Родитель
Сommit
bd30ccf14a

+ 11 - 8
packages/ckeditor5-theme-lark/theme/components/editor.scss

@@ -3,6 +3,8 @@
 
 // TODO/NOTE: This along with _editor helper will probably become a creator theme.
 @include ck-editor {
+	@include ck-rounded-corners();
+
 	.ck-editor__top {
 		.ck-toolbar {
 			border-top: 0;
@@ -28,16 +30,11 @@
 		overflow: auto;
 		padding: 0 ck-spacing();
 	}
-}
-
-.ck-editor,
-.ck-editor-bottom {
-	background: ck-color( 'foreground' );
-	border: 1px solid ck-border-color( 'foreground' );
-}
 
-@include ck-editor {
 	.ck-toolbar {
+		// Toolbars should not react to ck-rounded-corners() mixin.
+		border-radius: 0;
+
 		.ck-button {
 			border-width: 0;
 		}
@@ -64,3 +61,9 @@
 		}
 	}
 }
+
+.ck-editor,
+.ck-editor-bottom {
+	background: ck-color( 'foreground' );
+	border: 1px solid ck-border-color( 'foreground' );
+}

+ 1 - 1
packages/ckeditor5-theme-lark/theme/helpers/_rounded.scss

@@ -6,7 +6,7 @@
  *
  * @access public
  */
-$ck-border-radius: 3px !default;
+$ck-border-radius: 2px !default;
 
 /**
  * Implements rounded corner interface for .ck-rounded-corners class.