mirror of
https://github.com/silverstripe/silverstripe-simple
synced 2024-10-22 11:05:50 +02:00
Merge pull request #65 from zzdjk6/master
FIX #64: TinyMCE text and image alignment issue
This commit is contained in:
commit
ec62a3b15a
@ -144,13 +144,13 @@ body {
|
|||||||
|
|
||||||
/* WYSIWYG EDITOR ALIGNMENT CLASSES
|
/* WYSIWYG EDITOR ALIGNMENT CLASSES
|
||||||
-------------------------------------------- */
|
-------------------------------------------- */
|
||||||
.typography .text-left {
|
.typography .text-left, .typography .left {
|
||||||
text-align: left
|
text-align: left
|
||||||
}
|
}
|
||||||
.typography .text-center {
|
.typography .text-center, .typography .center {
|
||||||
text-align: center
|
text-align: center
|
||||||
}
|
}
|
||||||
.typography .text-right {
|
.typography .text-right, .typography .right {
|
||||||
text-align: right
|
text-align: right
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,6 +178,12 @@ body {
|
|||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
.typography img.rightAlone {
|
||||||
|
float: right;
|
||||||
|
margin-left: 100%;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
.typography img.center {
|
.typography img.center {
|
||||||
float: none;
|
float: none;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
@ -212,14 +218,16 @@ body {
|
|||||||
.typography .captionImage.right img {
|
.typography .captionImage.right img {
|
||||||
margin-left: -10px;
|
margin-left: -10px;
|
||||||
}
|
}
|
||||||
.typography .captionImage.right p {
|
|
||||||
margin-left: -10px;
|
.typography .captionImage.leftAlone {
|
||||||
text-align: left;
|
float: left;
|
||||||
margin-left: -10px;
|
clear: both;
|
||||||
}
|
margin-right: 100%;
|
||||||
.typography .captionImage.leftAlone{
|
}
|
||||||
float:none;
|
.typography .captionImage.rightAlone {
|
||||||
margin: 0 20px 20px 0px;
|
float: right;
|
||||||
|
clear: both;
|
||||||
|
margin-left: 100%;
|
||||||
}
|
}
|
||||||
.typography .captionImage.center{
|
.typography .captionImage.center{
|
||||||
margin: 0 auto 20px;
|
margin: 0 auto 20px;
|
||||||
@ -230,6 +238,12 @@ body {
|
|||||||
font-style: italic;
|
font-style: italic;
|
||||||
color: #888;
|
color: #888;
|
||||||
}
|
}
|
||||||
|
.typography .captionImage p.caption.text-center {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.typography .captionImage p.caption.text-left {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* BLOCKQUOTES
|
/* BLOCKQUOTES
|
||||||
|
Loading…
Reference in New Issue
Block a user