diff --git a/data/calamares_polkit b/data/calamares_polkit index 9bce0f82f..a32f1c451 100644 --- a/data/calamares_polkit +++ b/data/calamares_polkit @@ -1,6 +1,6 @@ #!/bin/bash if [ $(which pkexec) ]; then - pkexec --disable-internal-agent "/usr/bin/calamares" "$@" + pkexec --disable-internal-agent env DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" DISPLAY="$DISPLAY" GNOME_DESKTOP_SESSION_ID="GNOME_DESKTOP_SESSION_ID" HOME="$HOME" KDE_FULL_SESSION="$KDE_FULL_SESSION" KDE_SESSION_VERSION="$KDE_SESSION_VERSION" QT_STYLE_OVERRIDE="$QT_STYLE_OVERRIDE" QT_QPA_PLATFORMTHEME="$QT_QPA_PLATFORMTHEME" QT_XCB_FORCE_SOFTWARE_OPENGL="$QT_XCB_FORCE_SOFTWARE_OPENGL" XAUTHORITY="$XAUTHORITY" XDG_CURRENT_DESKTOP="XDG_CURRENT_DESKTOP" "/usr/bin/calamares" "-D6" "$@" else - /usr/bin/calamares "$@" + /usr/bin/calamares "-D6" "$@" fi diff --git a/src/branding/manjaro/branding.desc b/src/branding/manjaro/branding.desc index 8b96a6dd3..1b04c8e98 100644 --- a/src/branding/manjaro/branding.desc +++ b/src/branding/manjaro/branding.desc @@ -123,10 +123,10 @@ navigation: widget strings: productName: Manjaro Linux shortProductName: Manjaro - version: 23.0.0 - shortVersion: 23.0 - versionedName: Manjaro Linux 23.0 - shortVersionedName: Manjaro 23.0 + version: 22.0.0 + shortVersion: 22.0 + versionedName: Manjaro Linux 22.0 + shortVersionedName: Manjaro 22.0 bootloaderEntryName: Manjaro productUrl: https://manjaro.org/ supportUrl: https://forum.manjaro.org/ @@ -180,10 +180,10 @@ images: # branding component also ships a stylesheet.qss. Then they are # the corresponding CSS attributes of #sidebarApp. style: - SidebarBackground: "#263238" - SidebarText: "#efefef" - SidebarTextCurrent: "#4d915e" - SidebarBackgroundCurrent: "#1a1c1b" + sidebarBackground: "#263238" + sidebarText: "#efefef" + sidebarTextSelect: "#4d915e" + sidebarTextHighlight: "#1a1c1b" ### SLIDESHOW diff --git a/src/branding/manjaro/slideshow/Artwork.qml b/src/branding/manjaro/slideshow/Artwork.qml index de3176e56..147bb258b 100644 --- a/src/branding/manjaro/slideshow/Artwork.qml +++ b/src/branding/manjaro/slideshow/Artwork.qml @@ -3,47 +3,290 @@ import QtQuick 2.15 Rectangle { id: root - color: "#103e49" - state: "onGround" - onHeightChanged: { - sizeChangeTimeout.restart(); + // Max size of the scene - needed to load heavy assets only once and also set star field sizes + QtObject { + id: maxSceneSize + property int width: 6075 + property int height: 6950 } + + SystemPalette { + id: systemPalette + } + + color: "#103e49" + + Image { + id: comet + source: "comet.svg" + sourceSize { + width: 50 + height: 50 + } + opacity: 0 + + Timer { + id: cometShowupTimeout + running: true + interval: 6000 + repeat: true + onTriggered: { + comet.x = Math.floor(Math.random() * root.width); + comet.y = Math.floor(Math.random() * root.height); + cometShowupAnimation.start(); + } + } + + ParallelAnimation { + id: cometShowupAnimation + loops: 1 + + SequentialAnimation { + NumberAnimation { + target: comet + property: "opacity" + duration: 200 + from: 0 + to: 1 + } + NumberAnimation { + target: comet + property: "opacity" + duration: 200 + from: 1 + to: 0 + } + } + NumberAnimation { + target: comet + properties: "x" + duration: 700 + easing.type: Easing.OutQuad + to: comet.x - 100 + } + NumberAnimation { + target: comet + properties: "y" + duration: 700 + easing.type: Easing.OutQuad + to: comet.y + 100 + } + } + } + + Column { + id: starsClose + + anchors { + left: parent.left + right: parent.right + top: parent.top + topMargin: -starsClose1.sourceSize.height + } + height: starsClose1.height + starsClose2.height + + Image { + id: starsClose1 + fillMode: Image.Tile + source: 'starsClose.svg' + + height: maxSceneSize.height + width: maxSceneSize.width + } + Image { + id: starsClose2 + fillMode: Image.Tile + source: 'starsClose.svg' + + height: maxSceneSize.height + width: maxSceneSize.width + } + NumberAnimation { + id: starsCloseMovingAnimation + running: true + loops: -1 + + duration: 100000 + target: starsClose + property: "anchors.topMargin" + from: -starsClose1.sourceSize.height + to: 0 + } + } + + Column { + id: starsFar + + anchors { + left: parent.left + right: parent.right + top: parent.top + topMargin: -starsFar1.sourceSize.height + } + height: starsFar1.height + starsFar2.height + + Image { + id: starsFar1 + fillMode: Image.Tile + source: 'starsFar.svg' + + height: maxSceneSize.height + width: maxSceneSize.width + } + Image { + id: starsFar2 + fillMode: Image.Tile + source: 'starsFar.svg' + + height: maxSceneSize.height + width: maxSceneSize.width + } + + NumberAnimation { + id: starsFarMovingAnimation + running: true + loops: -1 + duration: 200000 + target: starsFar + property: "anchors.topMargin" + from: -starsFar1.sourceSize.height + to: 0 + } + } + + Image { + id: moon + source: "moon.svg" + sourceSize.height: height + sourceSize.width: width + x: -height + height: 70 + width: height + + Timer { + id: moonShowupTimeout + running: true + interval: 25000 + repeat: true + onTriggered: { + moon.height = Math.floor(Math.random() * (45 - 200) + 200); + moon.x = Math.floor(Math.random() * root.width); + moonShowupAnimation.start(); + } + } + NumberAnimation { + id: moonShowupAnimation + target: moon + properties: "y" + duration: 25000 + from: -moon.height + to: maxSceneSize.height + moon.height + } + } + + Image { + id: background + anchors.fill: parent + + mipmap: true + source: systemPalette.window.hslLightness > 0.5 ? "background.svg" : "background_dark.svg" + } + + Loader { + source: "sponsor/SponsoredBy.qml" + + anchors { + bottom: parent.bottom + right: parent.right + margins: 10 + } + } + + Item { + id: smoke + + anchors { + bottom: parent.bottom + right: parent.right + left: parent.left + } + height: smokeAsset.paintedHeight + + Rectangle { + anchors { + bottom: parent.bottom + right: parent.right + left: parent.left + } + height: 57 + + color: "#eff0f1" + } + Image { + id: smokeAsset + anchors { + bottom: parent.bottom + horizontalCenter: parent.horizontalCenter + } + source: "smoke.svg" + sourceSize.width: width + sourceSize.height: height + } + } + + Rocket { + id: rocket + property int lift: 0 + + anchors { + bottom: parent.bottom + bottomMargin: -(height - lift) + horizontalCenter: parent.horizontalCenter + horizontalCenterOffset: -235 + } + width: 100 + showSmoke: true + } + + state: "onGround" + states: [ State { name: "onGround" - PropertyChanges { target: rocket lift: 180 } - PropertyChanges { target: background anchors.topMargin: -root.height anchors.bottomMargin: 20 opacity: 1 } - PropertyChanges { - target: starfield.particleSystem - paused: true + target: starsCloseMovingAnimation + running: false + } + PropertyChanges { + target: starsFarMovingAnimation + running: false + } + PropertyChanges { + target: moonShowupTimeout + running: false } - PropertyChanges { target: cometShowupTimeout running: false } - }, State { extend: "onGround" name: "nearGround" - PropertyChanges { target: rocket lift: root.height / 2 + 150 } - PropertyChanges { target: smoke anchors.bottomMargin: -smoke.height / 2 + 100 @@ -54,58 +297,56 @@ Rectangle { anchors.bottomMargin: -(root.height * 0.2) anchors.topMargin: -root.height + root.height * 0.2 } - }, State { extend: "nearGround" name: "inAtmosphere" - PropertyChanges { target: rocket showSmoke: false } - PropertyChanges { target: rocket lift: root.height / 2 + 100 } - - PropertyChanges { - target: starfield.particleSystem - paused: false - } - PropertyChanges { target: background anchors.bottomMargin: -root.height * 0.9 anchors.topMargin: 0 } - }, State { extend: "inAtmosphere" name: "inSpace" - PropertyChanges { target: background anchors.bottomMargin: -(root.height * 2) anchors.topMargin: root.height } - + PropertyChanges { + target: starsCloseMovingAnimation + running: true + } + PropertyChanges { + target: starsFarMovingAnimation + running: true + } + PropertyChanges { + target: moonShowupTimeout + running: true + } PropertyChanges { target: cometShowupTimeout running: true } - } ] + transitions: [ Transition { id: transition1 - from: "onGround" to: "nearGround" - SequentialAnimation { NumberAnimation { target: rocket @@ -113,61 +354,48 @@ Rectangle { duration: 10000 easing.type: Easing.InQuad } - ScriptAction { script: root.state = "inAtmosphere" } - } - NumberAnimation { target: smoke property: "bottomMargin" duration: 10000 easing.type: Easing.InQuad } - NumberAnimation { target: background properties: "anchors.topMargin,anchors.bottomMargin" duration: 10000 easing.type: Easing.InQuad } - }, Transition { id: transition2 - from: "nearGround" to: "inAtmosphere" - NumberAnimation { target: rocket property: "lift" duration: 5000 easing.type: Easing.OutQuad } - SequentialAnimation { NumberAnimation { target: background properties: "anchors.topMargin,anchors.bottomMargin" duration: 5000 } - ScriptAction { script: root.state = "inSpace" } - } - }, Transition { id: transition3 - from: "inAtmosphere" to: "inSpace" - NumberAnimation { target: rocket property: "lift" @@ -181,206 +409,45 @@ Rectangle { duration: 15000 from: -root.height } - NumberAnimation { target: background properties: "anchors.topMargin" duration: 15000 from: 0 } - } ] - QtObject { - id: maxSceneSize - - property int width: 7680 - property int height: 4320 - } - - SystemPalette { - id: systemPalette - } - - Image { - id: comet - - source: "comet.svg" - opacity: 0 - - sourceSize { - width: 50 - height: 50 - } - - Timer { - id: cometShowupTimeout - - running: true - interval: 6000 - repeat: true - onTriggered: { - comet.x = Math.floor(Math.random() * root.width); - comet.y = Math.floor(Math.random() * root.height); - cometShowupAnimation.start(); - } - } - - ParallelAnimation { - id: cometShowupAnimation - - loops: 1 - - SequentialAnimation { - NumberAnimation { - target: comet - easing.type: Easing.InQuad - property: "opacity" - duration: 200 - from: 0 - to: 1 - } - - NumberAnimation { - target: comet - easing.type: Easing.OutQuad - property: "opacity" - duration: 200 - from: 1 - to: 0 - } - - } - - NumberAnimation { - target: comet - properties: "x" - duration: 700 - easing.type: Easing.OutQuad - to: comet.x - 60 - } - - NumberAnimation { - target: comet - properties: "y" - duration: 700 - easing.type: Easing.OutQuad - to: comet.y + 70 - } - - } - - } - - Starfield { - id: starfield - - maxSceneSize: maxSceneSize - anchors.fill: parent - } - - Image { - id: background - - anchors.fill: parent - mipmap: true - cache: false - source: visible ? systemPalette.window.hslLightness > 0.5 ? "background.svg" : "background_dark.svg" : "" - - sourceSize { - height: root.height - width: root.width - } - - } - - Item { - id: smoke - - height: smokeAsset.paintedHeight - - anchors { - bottom: parent.bottom - right: parent.right - left: parent.left - } - - Rectangle { - height: 57 - color: "#eff0f1" - - anchors { - bottom: parent.bottom - right: parent.right - left: parent.left - } - - } - - Image { - id: smokeAsset - - source: "smoke.svg" - sourceSize.width: width - sourceSize.height: height - - anchors { - bottom: parent.bottom - horizontalCenter: parent.horizontalCenter - } - - } - - } - - Rocket { - id: rocket - - property int lift: 0 - - width: 100 - showSmoke: true - - anchors { - bottom: parent.bottom - bottomMargin: -(height - lift) - horizontalCenter: parent.horizontalCenter - horizontalCenterOffset: -235 - } - - } - // Animation objects don't bind properties - so we have to reset the animation when a window size changes. In our case it's only about height. // Timeout is needed to ensure that properties already have needed values set. Timer { id: sizeChangeTimeout - interval: 1 + onTriggered: { switch (state) { case "nearGround": if (!transition1.running) - return ; - + return; state = "onGround"; state = "nearGround"; break; case "inAtmosphere": if (!transition2.running) - return ; - + return; state = "nearGround"; state = "inAtmosphere"; break; case "inSpace": if (!transition3.running) - return ; - + return; state = "inAtmosphere"; state = "inSpace"; } } } + onHeightChanged: { + sizeChangeTimeout.restart(); + } } diff --git a/src/branding/manjaro/slideshow/Rocket.qml b/src/branding/manjaro/slideshow/Rocket.qml index 75ccffa68..cddbdd28c 100644 --- a/src/branding/manjaro/slideshow/Rocket.qml +++ b/src/branding/manjaro/slideshow/Rocket.qml @@ -1,70 +1,58 @@ import QtQuick 2.15 - Item { + property bool showSmoke: false Item { id: rocketNoSmoke - property bool rocketFrame: false - visible: !showSmoke - width: 250 - height: Math.min(rocket_a.paintedHeight, rocket_b.paintedHeight) - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - Timer { interval: 200 running: !showSmoke repeat: true onTriggered: rocketNoSmoke.rocketFrame = !rocketNoSmoke.rocketFrame } - + width: 250 + height: Math.min(rocket_a.paintedHeight, rocket_b.paintedHeight) + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top Image { + opacity: rocketNoSmoke.rocketFrame?1:0 + width: parent.width id: rocket_a - - opacity: rocketNoSmoke.rocketFrame ? 1 : 0 - width: parent.width fillMode: Image.PreserveAspectFit + source: "rocket_a.svg" + } Image { - id: rocket_b - - opacity: rocketNoSmoke.rocketFrame ? 0 : 1 + opacity: rocketNoSmoke.rocketFrame?0:1 width: parent.width + id: rocket_b fillMode: Image.PreserveAspectFit + source: "rocket_b.svg" - } - MouseArea { - anchors.fill: parent - onClicked: { - breakAnimation.start(); - } } - } - Image { - id: rocketSmoke - opacity: showSmoke ? 1 : 0 + + Image { + opacity: showSmoke?1:0 width: 250 anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter + id: rocketSmoke fillMode: Image.PreserveAspectFit - cache: false - source: showSmoke ? "rocket_smoke.svg" : "" + + source: "rocket_smoke.svg" Behavior on opacity { - NumberAnimation { - } - + NumberAnimation{} } - } } diff --git a/src/branding/manjaro/slideshow/SlideShow.qml b/src/branding/manjaro/slideshow/SlideShow.qml index 63956c4ae..0493398d5 100644 --- a/src/branding/manjaro/slideshow/SlideShow.qml +++ b/src/branding/manjaro/slideshow/SlideShow.qml @@ -70,50 +70,5 @@ Item { horizontalCenterOffset: -100 verticalCenterOffset: -57 } - } - - Row { - id: sponsoredBy - - spacing: 5 - - anchors { - bottom: parent.bottom - right: parent.right - margins: 10 - } - - Text { - height: 30 - font.family: "Montserrat" - color: "white" - text: qsTr("Brought to you by") - verticalAlignment: Text.AlignVCenter - } - - Image { - source: "sponsor.svg" - onStatusChanged: { - if ((status == Image.Error)) - sponsoredBy.visible = false; - - } - - sourceSize { - height: 30 - } - - MouseArea { - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: { - Qt.openUrlExternally("./sponsor.html"); - } - } - - } - - } - } diff --git a/src/branding/manjaro/slideshow/Slider.qml b/src/branding/manjaro/slideshow/Slider.qml index be5f832a3..79baad3dd 100644 --- a/src/branding/manjaro/slideshow/Slider.qml +++ b/src/branding/manjaro/slideshow/Slider.qml @@ -2,6 +2,7 @@ import QtQuick 2.15 Item { property list slides + property int currentSlideIndex: 0 property int _currentSlideIndex: 0 property int slidesSize: slides.length @@ -17,6 +18,7 @@ Item { firstIteration = false; currentSlideIndex = 0; } + transitionAnimation.start(); } @@ -26,128 +28,104 @@ Item { Text { id: titleText - - color: "white" - text: slides[_currentSlideIndex].title - font { family: "Montserrat" capitalization: Font.AllUppercase weight: Font.DemiBold pointSize: 18 } - + color: "white" + text: slides[_currentSlideIndex].title } - Text { id: secondaryTitleText - - color: "white" - text: slides[_currentSlideIndex].secondaryTitle ?? "" - font { family: "Montserrat" weight: Font.Light pointSize: 12 } - + color: "white" + text: slides[_currentSlideIndex].secondaryTitle ?? "" } - Text { id: bodyText - + font { + family: "Montserrat" + pointSize: 12 + } width: 400 color: "white" text: slides[_currentSlideIndex].body wrapMode: Text.Wrap - - font { - family: "Montserrat" - pointSize: 12 - } - } Text { id: footerText - - width: 400 - color: "white" - text: slides[_currentSlideIndex].footer ?? "" - wrapMode: Text.Wrap - font { family: "Montserrat" weight: Font.Light pointSize: 12 } - + width: 400 + color: "white" + text: slides[_currentSlideIndex].footer ?? "" + wrapMode: Text.Wrap } - } SequentialAnimation { id: transitionAnimation - property int duration: 700 ParallelAnimation { OpacityAnimator { target: titleText - from: 1 - to: 0 + from: 1.0 + to: 0.0 duration: transitionAnimation.duration } - OpacityAnimator { target: secondaryTitleText - from: 1 - to: 0 + from: 1.0 + to: 0.0 duration: transitionAnimation.duration } - OpacityAnimator { target: bodyText - from: 1 - to: 0 + from: 1.0 + to: 0.0 duration: transitionAnimation.duration } - OpacityAnimator { target: footerText - from: 1 - to: 0 + from: 1.0 + to: 0.0 duration: transitionAnimation.duration } - XAnimator { target: titleText from: 0 to: -30 duration: transitionAnimation.duration } - XAnimator { target: secondaryTitleText from: 0 to: -30 duration: transitionAnimation.duration } - XAnimator { target: bodyText from: 0 to: -25 duration: transitionAnimation.duration } - XAnimator { target: footerText from: 0 to: -25 duration: transitionAnimation.duration } - } ScriptAction { @@ -157,62 +135,52 @@ Item { ParallelAnimation { OpacityAnimator { target: titleText - from: 0 - to: 1 + from: 0.0 + to: 1.0 duration: transitionAnimation.duration } - OpacityAnimator { target: secondaryTitleText - from: 0 - to: 1 + from: 0.0 + to: 1.0 duration: transitionAnimation.duration } - OpacityAnimator { target: bodyText - from: 0 - to: 1 + from: 0.0 + to: 1.0 duration: transitionAnimation.duration } - OpacityAnimator { target: footerText - from: 0 - to: 1 + from: 0.0 + to: 1.0 duration: transitionAnimation.duration } - XAnimator { target: titleText from: 30 to: 0 duration: transitionAnimation.duration } - XAnimator { target: secondaryTitleText from: 30 to: 0 duration: transitionAnimation.duration } - XAnimator { target: bodyText from: 25 to: 0 duration: transitionAnimation.duration } - XAnimator { target: footerText from: 25 to: 0 duration: transitionAnimation.duration } - } - } - } diff --git a/src/branding/manjaro/slideshow/Starfield.qml b/src/branding/manjaro/slideshow/Starfield.qml deleted file mode 100644 index 379d95648..000000000 --- a/src/branding/manjaro/slideshow/Starfield.qml +++ /dev/null @@ -1,105 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Particles 2.15 - -Item { - id: root - - property var particleSystem - property var maxSceneSize - - Item { - id: emmitterContainer - - anchors.top: parent.top - anchors.topMargin: -300 - width: maxSceneSize.width - - Emitter { - id: closeEmitter - - group: "close" - anchors.fill: parent - system: particleSystem - emitRate: 40 - lifeSpan: (maxSceneSize.height + (-emmitterContainer.anchors.topMargin)) / (velocity.magnitude - velocity.magnitudeVariation) * 1000 - size: 25 - sizeVariation: 8 - - velocity: AngleDirection { - angle: 90 - angleVariation: 0 - magnitude: 90 - magnitudeVariation: 0 - } - - } - - Emitter { - id: farEmitter - - group: "far" - anchors.fill: parent - system: particleSystem - emitRate: 40 - lifeSpan: (maxSceneSize.height + (-emmitterContainer.anchors.topMargin)) / (velocity.magnitude - velocity.magnitudeVariation) * 1000 - size: 5 - sizeVariation: 1 - - velocity: AngleDirection { - angle: 90 - angleVariation: 0 - magnitude: 60 - magnitudeVariation: 0 - } - - } - - Emitter { - id: moonEmitter - - group: "moon" - anchors.fill: parent - anchors.topMargin: -100 - system: particleSystem - emitRate: 0.1 - lifeSpan: (maxSceneSize.height + (-emmitterContainer.anchors.topMargin)) / (velocity.magnitude - velocity.magnitudeVariation) * 1000 - size: 200 - sizeVariation: 100 - - velocity: AngleDirection { - angle: 90 - angleVariation: 0 - magnitude: 240 - magnitudeVariation: 50 - } - - } - - } - - ImageParticle { - groups: ["far"] - entryEffect: ImageParticle.None - system: particleSystem - source: "star_far.svg" - } - - ImageParticle { - groups: ["close"] - entryEffect: ImageParticle.None - system: particleSystem - source: "star_close.svg" - } - - ImageParticle { - groups: ["moon"] - entryEffect: ImageParticle.None - system: particleSystem - source: "moon.svg" - } - - particleSystem: ParticleSystem { - id: particleSystem - } - -} diff --git a/src/branding/manjaro/slideshow/rocket_b.svg b/src/branding/manjaro/slideshow/rocket_b.svg index ad24bb79e..0e40f6486 100644 --- a/src/branding/manjaro/slideshow/rocket_b.svg +++ b/src/branding/manjaro/slideshow/rocket_b.svg @@ -7,8 +7,8 @@ viewBox="0 0 50.609068 246.19337" version="1.1" id="svg8" - inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" - sodipodi:docname="rocket_b.svg" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" + sodipodi:docname="rocket_smoke2b.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -49,9 +49,9 @@ borderopacity="1" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="7.9195959" - inkscape:cx="44.762385" - inkscape:cy="136.81254" + inkscape:zoom="2.8" + inkscape:cx="66.25" + inkscape:cy="145" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" diff --git a/src/branding/manjaro/slideshow/rocket_c.svg b/src/branding/manjaro/slideshow/rocket_c.svg deleted file mode 100644 index 0a7b35ee7..000000000 --- a/src/branding/manjaro/slideshow/rocket_c.svg +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/branding/manjaro/slideshow/rocket_smoke.svg b/src/branding/manjaro/slideshow/rocket_smoke.svg index 40be996f8..69c25fd24 100644 --- a/src/branding/manjaro/slideshow/rocket_smoke.svg +++ b/src/branding/manjaro/slideshow/rocket_smoke.svg @@ -2,12 +2,12 @@ - - + id="defs2" /> + transform="translate(-116.02842,-610.36914)"> + id="path250403" + style="display:inline;fill:#eff0f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.46489;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:markers fill stroke" + d="m 170.0562,714.59209 c 9.38797,0 14.50417,53.62433 17.00032,114.68438 8.24465,1098.39983 1.91828,1138.93853 33.79043,1941.61563 -46.56792,0 -58.65508,0 -108.81853,0 34.53647,-791.4836 28.78177,-828.0114 41.02962,-1941.62914 2.4963,-61.06021 7.61008,-114.68446 16.99812,-114.68446 v -8.5e-4 z" + sodipodi:nodetypes="sccccscs" /> + + +image/svg+xml diff --git a/src/branding/manjaro/slideshow/star_close.svg b/src/branding/manjaro/slideshow/star_close.svg deleted file mode 100644 index 950305be7..000000000 --- a/src/branding/manjaro/slideshow/star_close.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - diff --git a/src/branding/manjaro/slideshow/star_far.svg b/src/branding/manjaro/slideshow/star_far.svg deleted file mode 100644 index 2a4a5a493..000000000 --- a/src/branding/manjaro/slideshow/star_far.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - diff --git a/src/branding/manjaro/slideshow/stars_close.svg b/src/branding/manjaro/slideshow/starsClose.svg similarity index 100% rename from src/branding/manjaro/slideshow/stars_close.svg rename to src/branding/manjaro/slideshow/starsClose.svg diff --git a/src/branding/manjaro/slideshow/stars_far.svg b/src/branding/manjaro/slideshow/starsFar.svg similarity index 100% rename from src/branding/manjaro/slideshow/stars_far.svg rename to src/branding/manjaro/slideshow/starsFar.svg