backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es17.01

Browse Source
This commit is contained in:
Jocelyn Fiat
2017-04-11 11:56:37 +02:00
parent 5a81d9a736 1f6fce1278
commit 87113e2f6f
22 changed files with 269 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/demo/site/modules/messaging/files/css/messaging.css
View File

@@ -1,5 +1,4 @@
.messaging-box fieldset {
resize: both;
display: flex;
flex-wrap: wrap;
align-items: flex-start;

1
examples/demo/site/modules/messaging/files/scss/messaging.scss
View File

@@ -1,6 +1,5 @@
.messaging-box {
fieldset {
resize: both;
display: flex;
flex-wrap: wrap;
align-items: flex-start;

6
examples/demo/site/themes/bootstrap/page.tpl
View File

@@ -4,11 +4,11 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- EWF CMS -->
<link rel="stylesheet" href="{$site_url/}theme/css/style.css">
<link rel="stylesheet" href="{$theme_path/}css/style.css">
<!-- jQuery dep -->
<script src="{$site_url/}theme/js/jquery-1.10.2.min.js"></script>
<script src="{$site_url/}theme/js/popup_search.js"></script>
<script src="{$theme_path/}js/jquery-1.10.2.min.js"></script>
<script src="{$theme_path/}js/popup_search.js"></script>
{if isset="$head"}{$head/}{/if}
{if isset="$styles"}{$styles/}{/if}