Browse Source

Other: Removed the contextualtoolbar.scss sass file. Converted the ck-editor-toolbar mixin into a class. Closes #75.

Aleksander Nowodzinski 8 years ago
parent
commit
95cc916759

+ 7 - 1
packages/ckeditor5-theme-lark/theme/components/editor.scss

@@ -1,7 +1,7 @@
 // Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
-@mixin ck-editor-toolbar {
+.ck-editor-toolbar {
 	// Toolbars should not react to ck-rounded-corners() mixin.
 	border-radius: 0;
 
@@ -25,4 +25,10 @@
 			background: ck-color( 'background' );
 		}
 	}
+
+	.ck-toolbar__container & {
+		background: ck-color( 'foreground' );
+		border: 0;
+	}
 }
+

+ 18 - 0
packages/ckeditor5-theme-lark/theme/components/panel/balloonpanel.scss

@@ -111,4 +111,22 @@ $ck-balloon-arrow-half-width: 10px;
 			}
 		}
 	}
+
+	&.ck-toolbar__container {
+		&_arrow_n,
+		&_arrow_ne,
+		&_arrow_nw {
+			&:after {
+				border-bottom-color: ck-color( 'foreground' );
+			}
+		}
+
+		&_arrow_s,
+		&_arrow_se,
+		&_arrow_sw {
+			&:after {
+				border-top-color: ck-color( 'foreground' );
+			}
+		}
+	}
 }

+ 0 - 30
packages/ckeditor5-theme-lark/theme/components/toolbar/contextualtoolbar.scss

@@ -1,30 +0,0 @@
-// Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-// For licensing, see LICENSE.md or http://ckeditor.com/license
-
-.ck-toolbar__container {
-	background: ck-color( 'foreground' );
-
-	.ck-toolbar {
-		@include ck-editor-toolbar;
-
-		border: 0;
-	}
-
-	&.ck-balloon-panel {
-		&_arrow_n,
-		&_arrow_ne,
-		&_arrow_nw {
-			&:after {
-				border-bottom-color: ck-color( 'foreground' );
-			}
-		}
-
-		&_arrow_s,
-		&_arrow_se,
-		&_arrow_sw {
-			&:after {
-				border-top-color: ck-color( 'foreground' );
-			}
-		}
-	}
-}

+ 1 - 0
packages/ckeditor5-theme-lark/theme/components/toolbar/toolbar.scss

@@ -30,3 +30,4 @@
 		margin-right: 0;
 	}
 }
+

+ 0 - 1
packages/ckeditor5-theme-lark/theme/theme.scss

@@ -22,5 +22,4 @@
 @import 'components/inputtext';
 @import 'components/panel/balloonpanel';
 @import 'components/editor';
-@import 'components/toolbar/contextualtoolbar';
 @import 'components/toolbar/stickytoolbar';