Removed not used CSS fix.

ckeditor · Feb 15, 2018 · 633bdc1 · 633bdc1
1 parent 46523c0
commit 633bdc1
Showing 1 changed file with 0 additions and 43 deletions.
diff --git a/theme/ckeditor5-ui/components/editorui/editorui.css b/theme/ckeditor5-ui/components/editorui/editorui.css
@@ -28,46 +28,3 @@
 		margin-top: var(--ck-spacing-standard);
 	}
 }
-
-<<<<<<< HEAD
-=======
-.ck-editor-toolbar {
-	& .ck-button,
-	& .ck-button:focus {
-		border-width: 0;
-	}
-
-	/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/120 */
-	/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/131 */
-	& > .ck-button,
-	& > .ck-dropdown > .ck-button,
-	& > .ck-file-dialog-button > .ck-button,
-	& > .ck-dropdown > .ck-splitbutton > .ck-button {
-		&:not(:hover):not(:focus):not(.ck-on),
-		&.ck-disabled {
-			background: transparent;
-		}
-
-		&.ck-on {
-			@mixin ck-button-colors --ck-color-editor-toolbar-button-on;
-		}
-	}
-
-	@nest .ck-toolbar-container & {
-		background: var(--ck-color-editor-toolbar-background);
-	}
-}
-
->>>>>>> f223d6a2faf2e848edead9c49fdad72b4bc9c95f
-/* https://github.com/ckeditor/ckeditor5-theme-lark/issues/111 */
-/* .ck-toolbar-container.ck-editor-toolbar-container[class*="arrow_n"] {
-	&::after {
-		border-bottom-color: var(--ck-color-base-foreground);
-	}
-}
-
-.ck-toolbar-container.ck-editor-toolbar-container[class*="arrow_s"] {
-	&::after {
-		border-top-color: var(--ck-color-base-foreground);
-	}
-} */