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

Added styles for FloatingToolbarView. Code refac in *ToolbarView styles.

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

+ 8 - 6
packages/ckeditor5-ui/theme/components/stickytoolbar.scss

@@ -2,13 +2,15 @@
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
 
 @include ck-editor {
 @include ck-editor {
-	.ck-toolbar.ck-toolbar_sticky {
-		position: fixed;
-		top: 0;
+	.ck-toolbar {
+		&.ck-toolbar_sticky {
+			position: fixed;
+			top: 0;
 
 
-		&.ck-toolbar_sticky_bottom-limit {
-			top: auto;
-			position: absolute;
+			&.ck-toolbar_sticky_bottom-limit {
+				top: auto;
+				position: absolute;
+			}
 		}
 		}
 	}
 	}
 }
 }

+ 1 - 1
packages/ckeditor5-ui/theme/components/floatingtoolbar.scss → packages/ckeditor5-ui/theme/components/toolbar/floatingtoolbar.scss

@@ -2,7 +2,7 @@
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 // For licensing, see LICENSE.md or http://ckeditor.com/license
 
 
 .ck-toolbar {
 .ck-toolbar {
-	.ck-toolbar_floating {
+	&.ck-toolbar_floating {
 		position: absolute;
 		position: absolute;
 		display: none;
 		display: none;
 
 

+ 14 - 0
packages/ckeditor5-ui/theme/components/toolbar/stickytoolbar.scss

@@ -0,0 +1,14 @@
+// Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+// For licensing, see LICENSE.md or http://ckeditor.com/license
+
+@include ck-editor {
+	.ck-toolbar.ck-toolbar_sticky {
+		position: fixed;
+		top: 0;
+
+		&.ck-toolbar_sticky_bottom-limit {
+			top: auto;
+			position: absolute;
+		}
+	}
+}

+ 0 - 0
packages/ckeditor5-ui/theme/components/toolbar.scss → packages/ckeditor5-ui/theme/components/toolbar/toolbar.scss


+ 3 - 3
packages/ckeditor5-ui/theme/theme.scss

@@ -9,11 +9,11 @@
 @import 'components/icon';
 @import 'components/icon';
 @import 'components/tooltip';
 @import 'components/tooltip';
 @import 'components/button';
 @import 'components/button';
-@import 'components/toolbar';
+@import 'components/toolbar/toolbar';
 @import 'components/dropdown';
 @import 'components/dropdown';
 @import 'components/list';
 @import 'components/list';
 @import 'components/label';
 @import 'components/label';
 @import 'components/balloonpanel';
 @import 'components/balloonpanel';
 @import 'components/editor';
 @import 'components/editor';
-@import 'components/stickytoolbar';
-@import 'components/floatingtoolbar';
+@import 'components/toolbar/stickytoolbar';
+@import 'components/toolbar/floatingtoolbar';