mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-28 08:39:57 +02:00
Code Issues Releases Wiki Activity

Closes #4228 TinyMce can now load the frontend theme in the editor when 'wysiwyg' is found in the scope of a declared css file within theme.xml

Browse Source 
Fixes #4371 - FontAwesome5 is now loaded in the TinyMce editor when detected in the frontend theme.
This commit is contained in:
Cameron
2021-02-11 16:39:50 -08:00
parent d985b830f4
commit 7133d4bb6f
13 changed files with 301 additions and 1062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_themes/bootstrap3/css/modern-dark.css
View File

@@ -1493,7 +1493,8 @@ input[type=date],input[type=time],input[type=datetime-local],input[type=month],i
legend{color:#fff}
.input-group-addon{background-image:-webkit-linear-gradient(#303030,#212121 60%,#171717);background-image:-o-linear-gradient(#303030,#212121 60%,#171717);background-image:linear-gradient(#303030,#212121 60%,#171717);background-repeat:no-repeat;filter:none;color:#fff}
.breadcrumb,.darkwell,.form-control,.hero-unit,.progress,.uneditable-input,code,input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],pre,select,textarea{box-shadow:0 1px 0 rgba(255,255,255,.1),0 1px 7px 0 rgba(0,0,0,.8) inset}
optgroup{background-color:#494949}
/*optgroup{background-color:#494949}*/
optgroup[label] { font-weight:bold; }
.nav-pills>li>a{border:0;background:0 0}
.nav-pills>li>a:hover{background:#3c3c3c;border:0}
.nav-pills>li.active>a{background-color:#337ab7}

6
e107_themes/bootstrap3/theme.xml
View File

@@ -19,12 +19,12 @@
<image>preview_frontend.png</image>
</screenshots>
<libraries>
<library name="bootstrap" version="3" scope="all"/>
<library name="fontawesome" version="5" scope="all"/>
<library name="bootstrap" version="3" scope="front,admin,wysiwyg"/>
<library name="fontawesome" version="5" scope="front,admin,wysiwyg"/>
<library name="bootstrap.editable" scope="admin"/>
</libraries>
<stylesheets>
<css file="style.css" name="Default"/>
<css file="style.css" name="Default" scope="front" />
<css file="css/modern-light.css" name="Modern Light" description="A high-contrast light skin" thumbnail='images/admin_modern-light.webp' scope='admin' exclude='bootstrap'/>
<css file="css/modern-dark.css" name="Modern Dark" description="A high-contrast dark skin" thumbnail='images/admin_modern-dark.webp' scope='admin' exclude='bootstrap'/>
<css file="css/bootstrap-dark.min.css" name="Legacy Dark Admin" description="A dark admin area skin" thumbnail='images/admin_bootstrap-dark.webp' scope='admin' exclude='bootstrap'/>