Skip to content

Commit 88ce838

Browse files
authored
Merge pull request #2238 from opensource-workshop/wysiwyg-editor-cursor
[WYSIWYG]カーソル位置を左端にしたときにキャレットが表示されるようにしました
2 parents a54e4e6 + 4c7a8e6 commit 88ce838

File tree

17 files changed

+127
-120
lines changed

17 files changed

+127
-120
lines changed

public/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/connect.css

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -7,124 +7,6 @@ body {
77
background-color: #ffffff;
88
}
99

10-
/* WYSIWYG
11-
------------------------------------- */
12-
/* 追加選択肢の背景色が微妙なので打ち消す設定(TableのClassなど) */
13-
.mce-text {
14-
color: #000 !important;
15-
background-color: transparent !important;
16-
}
17-
18-
.mce-active .mce-text {
19-
/* color: #fff !important;*/
20-
background-color: transparent !important;
21-
}
22-
23-
.mce-active {
24-
background-color: #ededee !important;
25-
}
26-
27-
/* WYSIWYG のプレビューでGoogle Map が表示されない問題の対応
28-
WYSIWYG のプレビュー時に、embed-responsive と iframe の間にspan が生成され、
29-
そのspan の position が relative になっていることが原因のため、static に設定する。 */
30-
.embed-responsive span.mce-preview-object {
31-
position: static;
32-
}
33-
34-
/* WYSIWYG で設定できる記事の書式
35-
------------------------------------- */
36-
/* 囲み(グレー) */
37-
.cc-column {
38-
margin: 15px 0;
39-
padding: 25px;
40-
background-color: #f2f2f2;
41-
border-radius: 7px;
42-
}
43-
/*
44-
#ccMainArea .card-body .column {
45-
margin: 25px 0;
46-
border: #999 2px solid;
47-
background-color: #fff;
48-
}
49-
*/
50-
/* 注意ポイント */
51-
.cc-exclamation {
52-
padding-left: 1.1rem;
53-
text-indent: -1.2rem;
54-
}
55-
.cc-exclamation::before {
56-
content: "";
57-
display: inline-block;
58-
width: 1rem;
59-
height: 1rem;
60-
background: url("images/acc_exclamation.png") no-repeat;
61-
background-size: contain;
62-
vertical-align: middle;
63-
margin: 0 5px 3px 0;
64-
}
65-
/* ※印ポイント */
66-
.cc-note {
67-
padding-left: 0.8rem;
68-
text-indent: -0.8rem;
69-
}
70-
.cc-note::before {
71-
content: "";
72-
display: inline-block;
73-
width: .8rem;
74-
height: .8rem;
75-
background: url("images/acc_note.png") no-repeat;
76-
background-size: contain;
77-
vertical-align: middle;
78-
margin: 0 3px 2px 0;
79-
}
80-
.cc-note + .cc-note {
81-
margin-top: -10px;
82-
}
83-
/* アイコン(PDF) */
84-
a.cc-icon-pdf:after {
85-
content: "";
86-
display: inline-block;
87-
width: 1.25rem;
88-
height: 1.25rem;
89-
background: url("images/icon_pdf.png") no-repeat;
90-
background-size: contain;
91-
vertical-align: middle;
92-
margin: 0 0 3px 5px;
93-
}
94-
/* アイコン(Excel) */
95-
a.cc-icon-excel:after {
96-
content: "";
97-
display: inline-block;
98-
width: 1.25rem;
99-
height: 1.25rem;
100-
background: url("images/icon_excel.png") no-repeat;
101-
background-size: contain;
102-
vertical-align: middle;
103-
margin: 0 0 3px 5px;
104-
}
105-
/* アイコン(Word) */
106-
a.cc-icon-word:after {
107-
content: "";
108-
display: inline-block;
109-
width: 1.25rem;
110-
height: 1.25rem;
111-
background: url("images/icon_word.png") no-repeat;
112-
background-size: contain;
113-
vertical-align: middle;
114-
margin: 0 0 3px 5px;
115-
}
116-
/* アイコン(外部サイト) */
117-
a.cc-icon-external:after {
118-
content: "";
119-
display: inline-block;
120-
width: 1rem;
121-
height: 1rem;
122-
background: url("images/icon_external.png") no-repeat;
123-
background-size: contain;
124-
vertical-align: middle;
125-
margin: 0 0 3px 5px;
126-
}
127-
12810
/* Tempus Dominus Date/Time Picker
12911
------------------------------------- */
13012
/* DateTimePickerの土日 */
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"/js/app.js": "/js/app.js?id=e11e836611ea451c83fd5f2e76bd804d",
3-
"/css/app.css": "/css/app.css?id=369c846d4ff4ffb259bf19d2d9fcdaae"
3+
"/css/app.css": "/css/app.css?id=218ddec1fa538cbf1ea5189c9c7322f3"
44
}
380 Bytes
Loading

0 commit comments

Comments
 (0)