Merge pull request #12931 from xundeenergie/dropzone-css
Modify dropzones css to take it into account of themes fixes #12924
This commit is contained in:
commit
f62cebccfe
|
@ -206,11 +206,12 @@
|
||||||
.dropzone {
|
.dropzone {
|
||||||
min-height: 150px;
|
min-height: 150px;
|
||||||
border: 1px solid rgba(0, 0, 0, 0.3);
|
border: 1px solid rgba(0, 0, 0, 0.3);
|
||||||
background: white;
|
padding: 2px 2px;
|
||||||
padding: 10px 10px;
|
|
||||||
}
|
}
|
||||||
.dropzone.dz-clickable {
|
.dropzone.dz-clickable {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
border-radius: 4px;
|
||||||
|
background-color: $background_color;
|
||||||
}
|
}
|
||||||
.dropzone.dz-clickable * {
|
.dropzone.dz-clickable * {
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -213,6 +213,7 @@ $options = [
|
||||||
];
|
];
|
||||||
|
|
||||||
$css_tpl = file_get_contents('view/theme/frio/css/style.css');
|
$css_tpl = file_get_contents('view/theme/frio/css/style.css');
|
||||||
|
$css_tpl .= file_get_contents('view/theme/frio/css/dropzone.min.frio.css');
|
||||||
|
|
||||||
// Get the content of the scheme css file and the time of the last file change.
|
// Get the content of the scheme css file and the time of the last file change.
|
||||||
if ($schemecssfile) {
|
if ($schemecssfile) {
|
||||||
|
|
|
@ -55,8 +55,6 @@
|
||||||
media="screen" />
|
media="screen" />
|
||||||
<link rel="stylesheet" href="view/theme/frio/css/font-awesome.custom.css?v={{$smarty.const.FRIENDICA_VERSION}}"
|
<link rel="stylesheet" href="view/theme/frio/css/font-awesome.custom.css?v={{$smarty.const.FRIENDICA_VERSION}}"
|
||||||
type="text/css" media="screen" />
|
type="text/css" media="screen" />
|
||||||
<link rel="stylesheet" href="view/theme/frio/css/dropzone.min.frio.css?v={{$smarty.const.FRIENDICA_VERSION}}"
|
|
||||||
type="text/css" media="screen" />
|
|
||||||
|
|
||||||
{{foreach $stylesheets as $stylesheetUrl => $media}}
|
{{foreach $stylesheets as $stylesheetUrl => $media}}
|
||||||
<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="{{$media}}" />
|
<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="{{$media}}" />
|
||||||
|
|
Loading…
Reference in New Issue
Block a user