Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge pull request #240 from ckeditor/t/ckeditor5-theme-lark/239
Browse files Browse the repository at this point in the history
Other: The `.ck-progress-bar` styles should not be under with `.ck-content`. Additionaly removed two unused custom properties: `--ck-color-upload-infinite-background` and `--ck-image-upload-progress-line-width`. Closes https://github.com/ckeditor/ckeditor5-theme-lark/issues/239. Closes ckeditor/ckeditor5#1915.
  • Loading branch information
oleq authored Jul 31, 2019
2 parents d8afbae + b60873e commit cb92793
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
19 changes: 7 additions & 12 deletions theme/ckeditor5-image/imageuploadprogress.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/

/* Infinite progress bar default width. */
:root {
--ck-image-upload-progress-line-width: 30px;
}

.ck-content .image {
/* Showing animation. */
&.ck-appear {
animation: fadeIn 700ms;
}
}

/* Upload progress bar. */
& .ck-progress-bar {
height: 2px;
width: 0;
background: var(--ck-color-upload-bar-background);
transition: width 100ms;
}
/* Upload progress bar. */
.ck .ck-progress-bar {
height: 2px;
width: 0;
background: var(--ck-color-upload-bar-background);
transition: width 100ms;
}

@keyframes fadeIn {
Expand Down
1 change: 0 additions & 1 deletion theme/ckeditor5-ui/globals/_colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@
/* -- Upload -------------------------------------------------------------------------------- */

--ck-color-upload-bar-background: hsl(209, 92%, 70%);
--ck-color-upload-infinite-background: hsla(0, 0%, 0%, 0.1);

/* -- Link -------------------------------------------------------------------------------- */

Expand Down

0 comments on commit cb92793

Please sign in to comment.