Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit daca885

Browse files
committed
share: move style from js to css.
1 parent b731b53 commit daca885

File tree

4 files changed

+29
-4
lines changed

4 files changed

+29
-4
lines changed

core/src/core/src/pydio/Core/Services/LocaleService.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,19 @@ public static function clearMessagesCache()
165165
}
166166
}
167167

168-
168+
/**
169+
* @param $array
170+
*/
171+
public static function contributeMessages($array){
172+
$inst = self::getInstance();
173+
if(!isSet($inst->cache["ADDITIONAL_MESSAGES"])){
174+
$inst->cache["ADDITIONAL_MESSAGES"] = [];
175+
}
176+
$inst->cache["ADDITIONAL_MESSAGES"] = $inst->cache["ADDITIONAL_MESSAGES"] + $array;
177+
if(isset($inst->cache["MESSAGES"])){
178+
unset($inst->cache["MESSAGES"]);
179+
}
180+
}
169181

170182
/**
171183
* PRIVATE INSTANCE METHODS
@@ -238,6 +250,9 @@ private function getMessagesInst($forceRefresh = false)
238250
VarsFilter::filterI18nStrings($this->cache["CONF_MESSAGES"]);
239251
@file_put_contents($messageFile, "<?php \$MESSAGES = ".var_export($this->cache["MESSAGES"], true) ." ; \$CONF_MESSAGES = ".var_export($this->cache["CONF_MESSAGES"], true) ." ; ");
240252
}
253+
if(isSet($this->cache["ADDITIONAL_MESSAGES"])){
254+
$this->cache["MESSAGES"] = $this->cache["MESSAGES"] + $this->cache["ADDITIONAL_MESSAGES"];
255+
}
241256

242257
return $this->cache["MESSAGES"];
243258
}

core/src/plugins/action.share/res/react-share-form.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ div#react_share_form .mui-checkbox .mui-checkbox-icon {
1818
div#react_share_form div.headerPanel {
1919
background-color: #4aceb0 !important;
2020
}
21+
div#react_share_form div.headerPanel > div {
22+
color: white;
23+
font-size: 24px;
24+
padding: 20px 16px 14px;
25+
word-break: 'break-all';
26+
}
2127
div#react_share_form .mui-tabs-container .mui-tab-item-container {
2228
background-color: #4aceb0 !important;
2329
}

core/src/plugins/action.share/res/react-share-form.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ div#react_share_form {
3434
}
3535
div.headerPanel {
3636
background-color: @color0 !important;
37+
> div{
38+
color: white;
39+
font-size: 24px;
40+
padding:20px 16px 14px;
41+
word-break:'break-all';
42+
}
3743
}
3844
.mui-tabs-container {
3945
.mui-tab-item-container {

core/src/plugins/action.share/res/react/ShareDialog.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,7 @@
195195
*/
196196
return (
197197
<div className="headerPanel">
198-
<div
199-
style={{fontSize: 24, color:'white', padding:'20px 16px 14px', wordBreak:'break-all'}}
200-
>{this.context.getMessage('44').replace('%s', PathUtils.getBasename(nodePath))}</div>
198+
<div>{this.context.getMessage('44').replace('%s', PathUtils.getBasename(nodePath))}</div>
201199
</div>
202200
);
203201
}

0 commit comments

Comments
 (0)