Merge pull request 'develop' (#86) from develop into master
Reviewed-on: #86
This commit is contained in:
commit
9871cb93d8
|
|
@ -1,5 +1,13 @@
|
|||
## [Unreleased]
|
||||
|
||||
## 2.2.0
|
||||
### Added
|
||||
- fix #84: update icons
|
||||
- fix #85: use Nextcloud colors by default
|
||||
|
||||
### Fixed
|
||||
- Fix categories order in large menu
|
||||
|
||||
## 2.1.0
|
||||
### Added
|
||||
- add compatibility with Nextcloud 23
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
|
|||
* [Donate with liberapay](https://liberapay.com/deblan)
|
||||
* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
|
||||
]]></description>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0</version>
|
||||
<licence>agpl</licence>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||
<namespace>SideMenu</namespace>
|
||||
|
|
|
|||
|
|
@ -1,6 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583">
|
||||
<g color="#000" fill="#fff">
|
||||
<rect transform="rotate(135)" ry=".545" rx=".545" y="-8.209" x="-3.608" height="1.451" width="7.216" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
|
||||
<rect transform="rotate(-135)" ry=".545" rx=".545" y="-.726" x="-11.091" height="1.451" width="7.216" style="marker:none" overflow="visible" paint-order="stroke markers fill"/>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" color="#000" transform="translate(-.067 .224)"><rect width="5.027" height=".777" x="-2.307" y="6.984" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none" transform="rotate(-45)"/><rect width="5.027" height=".777" x="4.859" y="-.595" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none" transform="rotate(45)"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 498 B After Width: | Height: | Size: 495 B |
|
|
@ -1,173 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="40"
|
||||
height="40"
|
||||
viewBox="0 0 10.583 10.583"
|
||||
version="1.1"
|
||||
id="svg935"
|
||||
sodipodi:docname="side-menu-opener-dark.svg"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||
<metadata
|
||||
id="metadata941">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs939" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1008"
|
||||
id="namedview937"
|
||||
showgrid="false"
|
||||
inkscape:zoom="8.34386"
|
||||
inkscape:cx="83.025045"
|
||||
inkscape:cy="14.304895"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="41"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg935" />
|
||||
<g
|
||||
transform="translate(.3 -286.074)"
|
||||
fill="#fff"
|
||||
color="#000"
|
||||
fill-opacity=".855"
|
||||
id="g933"
|
||||
style="fill:#000000;fill-opacity:0.89855075">
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="288.474"
|
||||
x="4.266"
|
||||
height="1.451"
|
||||
width="1.451"
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect909" />
|
||||
<g
|
||||
transform="translate(-.13)"
|
||||
id="g915"
|
||||
style="fill:#000000;fill-opacity:0.89855075">
|
||||
<rect
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="6.445"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect911" />
|
||||
<rect
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="2.345"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect913" />
|
||||
</g>
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="290.631"
|
||||
x="4.266"
|
||||
height="1.451"
|
||||
width="1.451"
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect917" />
|
||||
<g
|
||||
transform="translate(-.13 2.157)"
|
||||
id="g923"
|
||||
style="fill:#000000;fill-opacity:0.89855075">
|
||||
<rect
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="6.445"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect919" />
|
||||
<rect
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="2.345"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect921" />
|
||||
</g>
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="292.808"
|
||||
x="4.266"
|
||||
height="1.451"
|
||||
width="1.451"
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect925" />
|
||||
<g
|
||||
transform="translate(-.13 4.334)"
|
||||
id="g931"
|
||||
style="fill:#000000;fill-opacity:0.89855075">
|
||||
<rect
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="6.445"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect927" />
|
||||
<rect
|
||||
style="marker:none;fill:#000000;fill-opacity:0.89855075"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="2.345"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect929" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill-opacity=".898" color="#000" transform="matrix(.90559 0 0 .86896 .772 -247.893)"><rect width="1.451" height="1.451" x="4.266" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="290.631" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 2.157)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="292.808" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 4.334)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 1.6 KiB |
|
|
@ -1,102 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="40"
|
||||
height="40"
|
||||
viewBox="0 0 10.583 10.583"
|
||||
version="1.1"
|
||||
id="svg1090"
|
||||
sodipodi:docname="side-menu-opener-hamburger-2-dark.svg"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||
<metadata
|
||||
id="metadata1096">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs1094" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1008"
|
||||
id="namedview1092"
|
||||
showgrid="false"
|
||||
inkscape:zoom="8.34386"
|
||||
inkscape:cx="84.523455"
|
||||
inkscape:cy="12.270318"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="41"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg1090" />
|
||||
<rect
|
||||
overflow="visible"
|
||||
style="marker:none;fill:#000000;fill-opacity:1"
|
||||
width="4.806"
|
||||
height="1.256"
|
||||
x="2.888"
|
||||
y="2.787"
|
||||
rx="0"
|
||||
ry=".472"
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1082" />
|
||||
<rect
|
||||
overflow="visible"
|
||||
style="marker:none;fill:#000000;fill-opacity:1"
|
||||
width="4.806"
|
||||
height="1.256"
|
||||
x="2.888"
|
||||
y="4.655"
|
||||
rx="0"
|
||||
ry=".472"
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1084" />
|
||||
<rect
|
||||
overflow="visible"
|
||||
style="marker:none;fill:#000000;fill-opacity:1"
|
||||
width="4.806"
|
||||
height="1.256"
|
||||
x="2.888"
|
||||
y="6.54"
|
||||
rx="0"
|
||||
ry=".472"
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1086" />
|
||||
<path
|
||||
style="marker:none;fill:#000000;fill-opacity:1"
|
||||
d="M1.243.71A.469.469 0 0 0 .881.88a.469.469 0 0 0-.171.362V9.34c0 .146.067.275.171.362a.469.469 0 0 0 .362.171H9.34a.469.469 0 0 0 .362-.171.469.469 0 0 0 .171-.362V1.243a.469.469 0 0 0-.171-.362A.469.469 0 0 0 9.34.71zm.723 1.256h6.65v6.65h-6.65z"
|
||||
color="#000"
|
||||
overflow="visible"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="path1088" />
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><rect width="7.62" height="7.62" x="1.482" y="1.482" fill="none" stroke="#000" stroke-linecap="square" stroke-width=".777" color="#000" overflow="visible" paint-order="markers fill stroke" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="3.148" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="6.658" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="4.936" color="#000" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 786 B |
|
|
@ -1,101 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="40"
|
||||
height="40"
|
||||
viewBox="0 0 10.583 10.583"
|
||||
version="1.1"
|
||||
id="svg1443"
|
||||
sodipodi:docname="side-menu-opener-hamburger-2.svg"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||
<metadata
|
||||
id="metadata1449">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs1447" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1008"
|
||||
id="namedview1445"
|
||||
showgrid="false"
|
||||
inkscape:zoom="5.9"
|
||||
inkscape:cx="90.508475"
|
||||
inkscape:cy="4.5762712"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="41"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg1443" />
|
||||
<rect
|
||||
overflow="visible"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
width="4.806"
|
||||
height="1.256"
|
||||
x="2.888"
|
||||
y="2.787"
|
||||
rx="0"
|
||||
ry=".472"
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1435" />
|
||||
<rect
|
||||
overflow="visible"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
width="4.806"
|
||||
height="1.256"
|
||||
x="2.888"
|
||||
y="4.655"
|
||||
rx="0"
|
||||
ry=".472"
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1437" />
|
||||
<rect
|
||||
overflow="visible"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
width="4.806"
|
||||
height="1.256"
|
||||
x="2.888"
|
||||
y="6.54"
|
||||
rx="0"
|
||||
ry=".472"
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1439" />
|
||||
<path
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
d="M1.243.71A.469.469 0 0 0 .881.88a.469.469 0 0 0-.171.362V9.34c0 .146.067.275.171.362a.469.469 0 0 0 .362.171H9.34a.469.469 0 0 0 .362-.171.469.469 0 0 0 .171-.362V1.243a.469.469 0 0 0-.171-.362A.469.469 0 0 0 9.34.71zm.723 1.256h6.65v6.65h-6.65z"
|
||||
color="#000"
|
||||
overflow="visible"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
paint-order="stroke markers fill"
|
||||
id="path1441" />
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><rect width="7.62" height="7.62" x="1.482" y="1.482" fill="none" stroke="#fff" stroke-linecap="square" stroke-width=".777" color="#000" overflow="visible" paint-order="markers fill stroke" rx="0" ry="0" style="marker:none"/><g fill="#fff" color="#000" transform="translate(0 .034)"><rect width="5.027" height=".777" x="2.778" y="3.114" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="6.624" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.027" height=".777" x="2.778" y="4.903" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 809 B |
|
|
@ -1,92 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="40"
|
||||
height="40"
|
||||
viewBox="0 0 10.583 10.583"
|
||||
version="1.1"
|
||||
id="svg1168"
|
||||
sodipodi:docname="side-menu-opener-hamburger-dark.svg"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||
<metadata
|
||||
id="metadata1174">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs1172" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1008"
|
||||
id="namedview1170"
|
||||
showgrid="false"
|
||||
inkscape:zoom="5.9"
|
||||
inkscape:cx="112.71186"
|
||||
inkscape:cy="0.16949153"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="41"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg1168" />
|
||||
<g
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
transform="translate(0 -286.417)"
|
||||
id="g1166"
|
||||
style="fill:#000000;fill-opacity:0.99637681">
|
||||
<rect
|
||||
ry=".545"
|
||||
rx="0"
|
||||
y="288.816"
|
||||
x="2.516"
|
||||
height="1.451"
|
||||
width="5.551"
|
||||
style="marker:none;fill:#000000;fill-opacity:0.99637681"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1160" />
|
||||
<rect
|
||||
ry=".545"
|
||||
rx="0"
|
||||
y="290.973"
|
||||
x="2.516"
|
||||
height="1.451"
|
||||
width="5.551"
|
||||
style="marker:none;fill:#000000;fill-opacity:0.99637681"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1162" />
|
||||
<rect
|
||||
ry=".545"
|
||||
rx="0"
|
||||
y="293.15"
|
||||
x="2.516"
|
||||
height="1.451"
|
||||
width="5.551"
|
||||
style="marker:none;fill:#000000;fill-opacity:0.99637681"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1164" />
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g color="#000" transform="matrix(.85624 0 0 .9944 .747 .03)"><g transform="matrix(1.0055 0 0 1 -.013 0)"><rect width="5.839" height=".782" x="2.372" y="2.764" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.839" height=".782" x="2.372" y="7.037" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="5.871" height=".782" x="2.372" y="4.901" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 637 B |
|
|
@ -1,91 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="40"
|
||||
height="40"
|
||||
viewBox="0 0 10.583 10.583"
|
||||
version="1.1"
|
||||
id="svg1382"
|
||||
sodipodi:docname="side-menu-opener-hamburger.svg"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||
<metadata
|
||||
id="metadata1388">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs1386" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1008"
|
||||
id="namedview1384"
|
||||
showgrid="false"
|
||||
inkscape:zoom="5.9"
|
||||
inkscape:cx="108.13559"
|
||||
inkscape:cy="3.8983051"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="41"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg1382" />
|
||||
<g
|
||||
color="#000"
|
||||
fill="#fff"
|
||||
fill-opacity=".855"
|
||||
transform="translate(0 -286.417)"
|
||||
id="g1380"
|
||||
style="fill:#ffffff;fill-opacity:1">
|
||||
<rect
|
||||
ry=".545"
|
||||
rx="0"
|
||||
y="288.816"
|
||||
x="2.516"
|
||||
height="1.451"
|
||||
width="5.551"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1374" />
|
||||
<rect
|
||||
ry=".545"
|
||||
rx="0"
|
||||
y="290.973"
|
||||
x="2.516"
|
||||
height="1.451"
|
||||
width="5.551"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1376" />
|
||||
<rect
|
||||
ry=".545"
|
||||
rx="0"
|
||||
y="293.15"
|
||||
x="2.516"
|
||||
height="1.451"
|
||||
width="5.551"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:1"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1378" />
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" color="#000" transform="matrix(.85624 0 0 .9944 .747 .03)"><g transform="matrix(1.0055 0 0 1 -.013 0)"><rect width="5.839" height=".782" x="2.372" y="2.764" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="5.839" height=".782" x="2.372" y="7.037" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="5.871" height=".782" x="2.372" y="4.901" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 649 B |
|
|
@ -1,172 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="40"
|
||||
height="40"
|
||||
viewBox="0 0 10.583 10.583"
|
||||
version="1.1"
|
||||
id="svg1321"
|
||||
sodipodi:docname="side-menu-opener.svg"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||
<metadata
|
||||
id="metadata1327">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs1325" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1918"
|
||||
inkscape:window-height="1008"
|
||||
id="namedview1323"
|
||||
showgrid="false"
|
||||
inkscape:zoom="5.9"
|
||||
inkscape:cx="78.983051"
|
||||
inkscape:cy="5.5932203"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="41"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg1321" />
|
||||
<g
|
||||
transform="translate(.3 -286.074)"
|
||||
fill="#fff"
|
||||
color="#000"
|
||||
fill-opacity=".855"
|
||||
id="g1319"
|
||||
style="fill:#ffffff;fill-opacity:0.94565219">
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="288.474"
|
||||
x="4.266"
|
||||
height="1.451"
|
||||
width="1.451"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1295" />
|
||||
<g
|
||||
transform="translate(-.13)"
|
||||
id="g1301"
|
||||
style="fill:#ffffff;fill-opacity:0.94565219">
|
||||
<rect
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="6.445"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1297" />
|
||||
<rect
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="2.345"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1299" />
|
||||
</g>
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="290.631"
|
||||
x="4.266"
|
||||
height="1.451"
|
||||
width="1.451"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1303" />
|
||||
<g
|
||||
transform="translate(-.13 2.157)"
|
||||
id="g1309"
|
||||
style="fill:#ffffff;fill-opacity:0.94565219">
|
||||
<rect
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="6.445"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1305" />
|
||||
<rect
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="2.345"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1307" />
|
||||
</g>
|
||||
<rect
|
||||
ry="0"
|
||||
rx="0"
|
||||
y="292.808"
|
||||
x="4.266"
|
||||
height="1.451"
|
||||
width="1.451"
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1311" />
|
||||
<g
|
||||
transform="translate(-.13 4.334)"
|
||||
id="g1317"
|
||||
style="fill:#ffffff;fill-opacity:0.94565219">
|
||||
<rect
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="6.445"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1313" />
|
||||
<rect
|
||||
style="marker:none;fill:#ffffff;fill-opacity:0.94565219"
|
||||
width="1.451"
|
||||
height="1.451"
|
||||
x="2.345"
|
||||
y="288.474"
|
||||
rx="0"
|
||||
ry="0"
|
||||
overflow="visible"
|
||||
paint-order="stroke markers fill"
|
||||
id="rect1315" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 10.583 10.583"><g fill="#fff" fill-opacity=".946" color="#000" transform="matrix(.90559 0 0 .86896 .772 -247.893)"><rect width="1.451" height="1.451" x="4.266" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="290.631" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 2.157)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g><rect width="1.451" height="1.451" x="4.266" y="292.808" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><g transform="translate(-.13 4.334)"><rect width="1.451" height="1.451" x="6.445" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/><rect width="1.451" height="1.451" x="2.345" y="288.474" overflow="visible" paint-order="stroke markers fill" rx="0" ry="0" style="marker:none"/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 1.6 KiB |
|
|
@ -27,6 +27,8 @@ use OCP\AppFramework\Http\Response;
|
|||
use OCP\AppFramework\Http\TemplateResponse;
|
||||
use OCP\IRequest;
|
||||
use OCP\IUserSession;
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
use OCA\SideMenu\Service\Color;
|
||||
|
||||
class CssController extends Controller
|
||||
{
|
||||
|
|
@ -40,12 +42,30 @@ class CssController extends Controller
|
|||
*/
|
||||
protected $user;
|
||||
|
||||
public function __construct(string $appName, IRequest $request, ConfigProxy $config)
|
||||
/**
|
||||
* @var ThemingDefaults
|
||||
*/
|
||||
protected $theming;
|
||||
|
||||
/**
|
||||
* @var Color
|
||||
*/
|
||||
protected $color;
|
||||
|
||||
public function __construct(
|
||||
string $appName,
|
||||
IRequest $request,
|
||||
ConfigProxy $config,
|
||||
ThemingDefaults $theming,
|
||||
Color $color
|
||||
)
|
||||
{
|
||||
parent::__construct($appName, $request);
|
||||
|
||||
$this->user = OC::$server[IUserSession::class]->getUser();
|
||||
$this->config = $config;
|
||||
$this->theming = $theming;
|
||||
$this->color = $color;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -90,23 +110,29 @@ class CssController extends Controller
|
|||
|
||||
$isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled);
|
||||
|
||||
$primaryColor = $this->theming->getColorPrimary();
|
||||
$lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
|
||||
$darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
|
||||
$darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
|
||||
$textColor = $this->theming->getTextColorPrimary();
|
||||
|
||||
if ($isDarkMode) {
|
||||
$backgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
|
||||
$backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $backgroundColor);
|
||||
$currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', '#444444');
|
||||
$loaderColor = $this->config->getAppValue('dark-mode-loader-color', '#cccccc');
|
||||
$textColor = $this->config->getAppValue('dark-mode-text-color', '#FFFFFF');
|
||||
$backgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
|
||||
$backgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
|
||||
$currentAppBackgroundColor = $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2);
|
||||
$loaderColor = $this->config->getAppValue('dark-mode-loader-color', $lightenPrimaryColor);
|
||||
$textColor = $this->config->getAppValue('dark-mode-text-color', $textColor);
|
||||
$iconInvertFilter = abs($this->config->getAppValueInt('dark-mode-icon-invert-filter', '0')).'%';
|
||||
$iconOpacity = abs($this->config->getAppValueInt('dark-mode-icon-opacity', '100') / 100);
|
||||
$opener = $this->config->getAppValue('dark-mode-opener', 'side-menu-opener');
|
||||
|
||||
$backgroundOpacity = dechex($this->config->getAppValueInt('dark-mode-background-color-opacity', '100') * 255 / 100);
|
||||
} else {
|
||||
$backgroundColor = $this->config->getAppValue('background-color', '#333333');
|
||||
$backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
|
||||
$currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', '#444444');
|
||||
$loaderColor = $this->config->getAppValue('loader-color', '#0e75ac');
|
||||
$textColor = $this->config->getAppValue('text-color', '#FFFFFF');
|
||||
$backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
|
||||
$backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
|
||||
$currentAppBackgroundColor = $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2);
|
||||
$loaderColor = $this->config->getAppValue('loader-color', $lightenPrimaryColor);
|
||||
$textColor = $this->config->getAppValue('text-color', $textColor);
|
||||
$iconInvertFilter = abs($this->config->getAppValueInt('icon-invert-filter', '0')).'%';
|
||||
$iconOpacity = abs($this->config->getAppValueInt('icon-opacity', '100') / 100);
|
||||
$opener = $this->config->getAppValue('opener', 'side-menu-opener');
|
||||
|
|
|
|||
|
|
@ -187,9 +187,18 @@ class NavController extends Controller
|
|||
|
||||
usort($items, function ($a, $b) use ($categoriesLabels) {
|
||||
foreach ($categoriesLabels as $key => $value) {
|
||||
if ($a['categoryId'] === 'other') {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ($b['categoryId'] === 'other') {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ($a['categoryId'] === $key) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ($b['categoryId'] === $key) {
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
34
lib/Service/Color.php
Normal file
34
lib/Service/Color.php
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
namespace OCA\SideMenu\Service;
|
||||
|
||||
/**
|
||||
* class Color.
|
||||
*
|
||||
* @author Simon Vieille <simon@deblan.fr>
|
||||
*/
|
||||
class Color
|
||||
{
|
||||
/**
|
||||
* @thanks https://stackoverflow.com/posts/54393956/revision
|
||||
*/
|
||||
public function adjustBrightness(string $hexCode, float $adjustPercent): string
|
||||
{
|
||||
$hexCode = ltrim($hexCode, '#');
|
||||
|
||||
if (3 == strlen($hexCode)) {
|
||||
$hexCode = $hexCode[0].$hexCode[0].$hexCode[1].$hexCode[1].$hexCode[2].$hexCode[2];
|
||||
}
|
||||
|
||||
$hexCode = array_map('hexdec', str_split($hexCode, 2));
|
||||
|
||||
foreach ($hexCode as &$color) {
|
||||
$adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
|
||||
$adjustAmount = ceil($adjustableLimit * $adjustPercent);
|
||||
|
||||
$color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
|
||||
}
|
||||
|
||||
return '#'.implode($hexCode);
|
||||
}
|
||||
}
|
||||
|
|
@ -26,6 +26,8 @@ use OCP\AppFramework\Http\TemplateResponse;
|
|||
use OCP\IL10N;
|
||||
use OCP\ILogger;
|
||||
use OCP\Settings\ISettings;
|
||||
use OCA\Theming\ThemingDefaults;
|
||||
use OCA\SideMenu\Service\Color;
|
||||
|
||||
class Admin implements ISettings
|
||||
{
|
||||
|
|
@ -54,18 +56,32 @@ class Admin implements ISettings
|
|||
*/
|
||||
private $categoryRepository;
|
||||
|
||||
/**
|
||||
* @var ThemingDefaults
|
||||
*/
|
||||
protected $theming;
|
||||
|
||||
/**
|
||||
* @var Color
|
||||
*/
|
||||
protected $color;
|
||||
|
||||
public function __construct(
|
||||
IL10N $l,
|
||||
ILogger $logger,
|
||||
ConfigProxy $config,
|
||||
AppRepository $appRepository,
|
||||
CategoryRepository $categoryRepository
|
||||
CategoryRepository $categoryRepository,
|
||||
ThemingDefaults $theming,
|
||||
Color $color
|
||||
) {
|
||||
$this->l = $l;
|
||||
$this->logger = $logger;
|
||||
$this->config = $config;
|
||||
$this->appRepository = $appRepository;
|
||||
$this->categoryRepository = $categoryRepository;
|
||||
$this->theming = $theming;
|
||||
$this->color = $color;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -73,29 +89,35 @@ class Admin implements ISettings
|
|||
*/
|
||||
public function getForm()
|
||||
{
|
||||
$backgroundColor = $this->config->getAppValue('background-color', '#333333');
|
||||
$backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
|
||||
$primaryColor = $this->theming->getColorPrimary();
|
||||
$lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2);
|
||||
$darkenPrimaryColor = $this->color->adjustBrightness($primaryColor, -0.2);
|
||||
$darkenPrimaryColor2 = $this->color->adjustBrightness($primaryColor, -0.3);
|
||||
$textColor = $this->theming->getTextColorPrimary();
|
||||
|
||||
$darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', '#333333');
|
||||
$darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkModeBackgroundColor);
|
||||
$backgroundColor = $this->config->getAppValue('background-color', $darkenPrimaryColor);
|
||||
$backgroundColorTo = $this->config->getAppValue('background-color-to', $darkenPrimaryColor);
|
||||
|
||||
$darkModeBackgroundColor = $this->config->getAppValue('dark-mode-background-color', $darkenPrimaryColor);
|
||||
$darkModeBackgroundColorTo = $this->config->getAppValue('dark-mode-background-color-to', $darkenPrimaryColor);
|
||||
|
||||
$parameters = [
|
||||
'background-color' => $backgroundColor,
|
||||
'background-color-to' => $backgroundColorTo,
|
||||
'background-color-opacity' => $this->config->getAppValueInt('background-color-opacity', '100'),
|
||||
'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
|
||||
'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
|
||||
'current-app-background-color' => $this->config->getAppValue('current-app-background-color', $darkenPrimaryColor2),
|
||||
'loader-color' => $this->config->getAppValue('loader-color', $lightenPrimaryColor),
|
||||
'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
|
||||
'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
|
||||
'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
|
||||
'text-color' => $this->config->getAppValue('text-color', $textColor),
|
||||
'dark-mode-background-color' => $darkModeBackgroundColor,
|
||||
'dark-mode-background-color-to' => $darkModeBackgroundColorTo,
|
||||
'dark-mode-background-color-opacity' => $this->config->getAppValueInt('dark-mode-background-color-opacity', '100'),
|
||||
'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', '#444444'),
|
||||
'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', '#cccccc'),
|
||||
'dark-mode-current-app-background-color' => $this->config->getAppValue('dark-mode-current-app-background-color', $darkenPrimaryColor2),
|
||||
'dark-mode-loader-color' => $this->config->getAppValue('dark-mode-loader-color', $textColor),
|
||||
'dark-mode-icon-invert-filter' => $this->config->getAppValueInt('dark-mode-icon-invert-filter', '0'),
|
||||
'dark-mode-icon-opacity' => $this->config->getAppValueInt('dark-mode-icon-opacity', '100'),
|
||||
'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', '#FFFFFF'),
|
||||
'dark-mode-text-color' => $this->config->getAppValue('dark-mode-text-color', $textColor),
|
||||
'dark-mode-opener' => $this->config->getAppValue('dark-mode-opener', 'side-menu-opener'),
|
||||
'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
|
||||
'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
"stylelint:fix": "stylelint src --fix"
|
||||
},
|
||||
"dependencies": {
|
||||
"@nextcloud/axios": "^1.3.2",
|
||||
"@nextcloud/axios": "^1.8.0",
|
||||
"@nextcloud/vue": "^1.4.0",
|
||||
"axios": "^0.19.2",
|
||||
"axios": "^0.24.0",
|
||||
"trim": "0.0.1",
|
||||
"vue": "^2.6.11"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue