Skip to content

V1.2.x #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: v1.2.x
Choose a base branch
from
Open

V1.2.x #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
40a4e8d
CHanged End of Line char to unix format
owenwangcong Mar 28, 2020
0280049
Added plugin Touch
owenwangcong Apr 2, 2020
d37d7b4
Added Plugin Filter
owenwangcong Apr 4, 2020
e54137d
Added Plugin Elasticsearch
owenwangcong Apr 5, 2020
917b194
Added Plugin RichText
owenwangcong Apr 5, 2020
5ecfef9
Added Plugin Categories
owenwangcong Apr 5, 2020
cd80d21
Added text color picker to Tinymce
owenwangcong Apr 6, 2020
e1e9d91
Added resource files for Categories plugin
owenwangcong Apr 6, 2020
6ff9f94
Updated default highlight style
owenwangcong Apr 6, 2020
4f874dc
Updated tinymce toolbar
owenwangcong May 3, 2020
49d0f09
modified rich text editor
owenwangcong Jan 15, 2022
aefd1aa
updated demo html
owenwangcong Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 45 additions & 8 deletions css/annotator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
/* Images
-------------------------------------------------------------------- */

/*
.annotator-adder {
background-image: url(../img/annotator-icon-sprite.png);
background-repeat: no-repeat;
}
*/

.annotator-resize,
.annotator-widget::after,
Expand Down Expand Up @@ -61,6 +63,7 @@
/* NB: If you change the list of classes for which z-index is set,
you should update Annotator._setupDynamicStyle() */
.annotator-adder,
.annotator-dict,
.annotator-outer,
.annotator-notice {
z-index: 1020;
Expand All @@ -71,6 +74,7 @@
}

.annotator-adder,
.annotator-dict,
.annotator-outer,
.annotator-widget,
.annotator-notice {
Expand All @@ -89,29 +93,62 @@

.annotator-adder {
margin-top: -48px;
margin-left: -24px;
width: 48px;
margin-left: -64px;
width: 64px;
height: 48px;
background-position: left top;
}

.annotator-adder:hover {
.annotator-adder button {
display: block;
width: 60px;
height: 41px;
margin: 0 auto;
border: none;
background: none;
text-indent: 0em;
cursor: pointer;
background-position: center top;
background-color: #e6e6e6;
}

.annotator-adder:active {
background-position: center right;
.annotator-adder button:hover {
background-color: lightgrey;
}

.annotator-adder button {
.annotator-adder button:active {
background-color: grey;
}

/* Annotator Dict
-------------------------------------------------------------------- */

.annotator-dict {
margin-top: -48px;
margin-left: -0px;
width: 64px;
height: 48px;
}

.annotator-dict button {
display: block;
width: 36px;
width: 60px;
height: 41px;
margin: 0 auto;
border: none;
background: none;
text-indent: -999em;
text-indent: 0em;
cursor: pointer;
background-position: center top;
background-color: #e6e6e6;
}

.annotator-dict button:hover {
background-color: lightgrey;
}

.annotator-dict button:active {
background-color: grey;
}

/* Annotator Widget
Expand Down
Loading