8
0
Pārlūkot izejas kodu

Merge branch 'no-compilation'

Piotrek Koszuliński 9 gadi atpakaļ
vecāks
revīzija
b72ea9985d

+ 13 - 21
packages/ckeditor5-theme-lark/tests/manual/theme.js

@@ -5,20 +5,20 @@
 
 /* globals document */
 
-import testUtils from 'tests/ui/_utils/utils.js';
+import testUtils from 'ckeditor5-ui/tests/_utils/utils';
 
-import Collection from 'ckeditor5/utils/collection.js';
-import Model from 'ckeditor5/ui/model.js';
-import View from 'ckeditor5/ui/view.js';
-import Template from 'ckeditor5/ui/template.js';
+import Collection from 'ckeditor5-utils/src/collection';
+import Model from 'ckeditor5-ui/src/model';
+import View from 'ckeditor5-ui/src/view';
+import Template from 'ckeditor5-ui/src/template';
 
-import iconManagerModel from 'theme/iconmanagermodel.js';
-import IconManagerView from 'ckeditor5/ui/iconmanager/iconmanagerview.js';
+import IconView from 'ckeditor5-ui/src/icon/iconview';
+import ButtonView from 'ckeditor5-ui/src/button/buttonview';
+import createListDropdown from 'ckeditor5-ui/src/dropdown/list/createlistdropdown';
+import ToolbarView from 'ckeditor5-ui/src/toolbar/toolbarview';
 
-import IconView from 'ckeditor5/ui/icon/iconview.js';
-import ButtonView from 'ckeditor5/ui/button/buttonview.js';
-import createListDropdown from 'ckeditor5/ui/dropdown/list/createlistdropdown.js';
-import ToolbarView from 'ckeditor5/ui/toolbar/toolbarview.js';
+// TODO needs to be filled with icon imports.
+const availableIcons = [];
 
 testUtils.createTestUIView( {
 	'iconPlain1':					'#icon-plain-1',
@@ -56,14 +56,6 @@ testUtils.createTestUIView( {
 } );
 
 function renderIcon( ui ) {
-	// --- IconManager ------------------------------------------------------------
-
-	const iconManager =  new IconManagerView();
-
-	iconManager.sprite = iconManagerModel.sprite;
-
-	ui.body.add( iconManager );
-
 	// --- In-text ------------------------------------------------------------
 
 	ui.iconPlain1.add( icon( 'bold' ) );
@@ -73,7 +65,7 @@ function renderIcon( ui ) {
 
 	// --- Availability ------------------------------------------------------------
 
-	iconManagerModel.icons.forEach( i => {
+	availableIcons.forEach( i => {
 		ui.iconAvailability.add( icon( i ) );
 		ui.iconAvailabilityColor.add( icon( i ) );
 	} );
@@ -117,7 +109,7 @@ function renderButton( ui ) {
 
 	// --- Icon ------------------------------------------------------------
 
-	iconManagerModel.icons.forEach( i => {
+	availableIcons.forEach( i => {
 		ui.buttonIcon.add( button( {
 			label: i,
 			icon: i

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

@@ -0,0 +1,30 @@
+// Copyright (c) 2003-2016, 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_s,
+		&_arrow_se,
+		&_arrow_sw {
+			&:after {
+				border-bottom-color: ck-color( 'foreground' );
+			}
+		}
+
+		&_arrow_n,
+		&_arrow_ne,
+		&_arrow_nw {
+			&:after {
+				border-top-color: ck-color( 'foreground' );
+			}
+		}
+	}
+}

+ 0 - 50
packages/ckeditor5-theme-lark/theme/components/editor.scss

@@ -41,53 +41,3 @@
 		}
 	}
 }
-
-// TODO/NOTE: This along with _editor helper will probably become a creator theme.
-@include ck-editor {
-	@include ck-rounded-corners();
-
-	// All the elements within `.ck-editor` are positioned relatively to it.
-	// If any element needs to be positioned with respect to the <body>, etc.,
-	// it must land outside of the `.ck-editor` in DOM.
-	position: relative;
-
-	.ck-editor__top {
-		.ck-toolbar {
-			@include ck-editor-toolbar();
-
-			border-top: 0;
-			border-left: 0;
-			border-right: 0;
-		}
-	}
-
-	.ck-editor__main {
-		background: ck-color();
-	}
-
-	.ck-editor__bottom {
-		border-bottom: 0;
-		border-left: 0;
-		border-right: 0;
-
-		padding: ck-spacing();
-	}
-
-	.ck-editor__editable {
-		&.ck-focused {
-			@include ck-focus-ring( 'outline' );
-			@include ck-box-shadow( $ck-inner-shadow );
-		}
-
-		&_inline {
-			overflow: auto;
-			padding: 0 ck-spacing();
-		}
-	}
-}
-
-.ck-editor,
-.ck-editor-bottom {
-	background: ck-color( 'foreground' );
-	border: 1px solid ck-border-color( 'foreground' );
-}

+ 19 - 0
packages/ckeditor5-theme-lark/theme/components/stickytoolbar.scss

@@ -0,0 +1,19 @@
+// Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+// For licensing, see LICENSE.md or http://ckeditor.com/license
+
+@include ck-editor {
+	.ck-toolbar.ck-toolbar_sticky {
+		@include ck-drop-shadow();
+
+		position: fixed;
+		top: 0;
+		border: 1px solid ck-border-color();
+		border-width: 0 0 1px;
+		background: ck-color( 'foreground' );
+
+		&.ck-toolbar_sticky_bottom-limit {
+			top: auto;
+			position: absolute;
+		}
+	}
+}

+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/align-center.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.5.2 (25235) - http://www.bohemiancoding.com/sketch -->
-    <title>align-center</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="align-center" sketch:type="MSArtboardGroup" fill="#444444">
-            <g id="icon:align-center" sketch:type="MSLayerGroup" transform="translate(2.000000, 4.000000)">
-                <path d="M2,6 L2,7 L14,7 L14,6 L2,6 L2,6 Z M3,12 L3,13 L13,13 L13,12 L3,12 L3,12 Z M0,9 L0,10 L16,10 L16,9 L0,9 L0,9 Z M2,0 L2,1 L14,1 L14,0 L2,0 L2,0 Z M0,3 L0,4 L16,4 L16,3 L0,3 L0,3 Z" id="path4634-copy-3" sketch:type="MSShapeGroup" transform="translate(8.000000, 6.500000) scale(-1, 1) translate(-8.000000, -6.500000) "></path>
-            </g>
-        </g>
-    </g>
-</svg>

+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/align-left.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.5.2 (25235) - http://www.bohemiancoding.com/sketch -->
-    <title>align-left</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="align-left" sketch:type="MSArtboardGroup" fill="#444444">
-            <g id="icon:align-left" sketch:type="MSLayerGroup" transform="translate(3.000000, 4.000000)">
-                <path d="M0,6 L0,7 L12,7 L12,6 L0,6 L0,6 Z M0,12 L0,13 L10,13 L10,12 L0,12 L0,12 Z M0,9 L0,10 L15,10 L15,9 L0,9 L0,9 Z M0,0 L0,1 L12,1 L12,0 L0,0 L0,0 Z M0,3 L0,4 L15,4 L15,3 L0,3 L0,3 Z" id="path4634" sketch:type="MSShapeGroup"></path>
-            </g>
-        </g>
-    </g>
-</svg>

+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/align-right.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.5.2 (25235) - http://www.bohemiancoding.com/sketch -->
-    <title>align-right</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="align-right" sketch:type="MSArtboardGroup" fill="#444444">
-            <g id="icon:align-right" sketch:type="MSLayerGroup" transform="translate(2.000000, 4.000000)">
-                <path d="M0,6 L0,7 L12,7 L12,6 L0,6 L0,6 Z M0,12 L0,13 L10,13 L10,12 L0,12 L0,12 Z M0,9 L0,10 L15,10 L15,9 L0,9 L0,9 Z M0,0 L0,1 L12,1 L12,0 L0,0 L0,0 Z M0,3 L0,4 L15,4 L15,3 L0,3 L0,3 Z" id="path4634-copy" sketch:type="MSShapeGroup" transform="translate(7.500000, 6.500000) scale(-1, 1) translate(-7.500000, -6.500000) "></path>
-            </g>
-        </g>
-    </g>
-</svg>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/bold.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/bulletedlist.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/image.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/italic.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 17
packages/ckeditor5-theme-lark/theme/icons/link.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 19
packages/ckeditor5-theme-lark/theme/icons/numberedlist.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 16
packages/ckeditor5-theme-lark/theme/icons/picker.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/quote.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 16
packages/ckeditor5-theme-lark/theme/icons/source.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 14
packages/ckeditor5-theme-lark/theme/icons/table.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 15
packages/ckeditor5-theme-lark/theme/icons/underline.svg


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 17
packages/ckeditor5-theme-lark/theme/icons/unlink.svg


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

@@ -21,3 +21,5 @@
 @import 'components/inputtext';
 @import 'components/balloonpanel';
 @import 'components/editor';
+@import 'components/contextualtoolbar';
+@import 'components/stickytoolbar';