From 772269c786b65605486ffc0767b316d936ad5220 Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 29 Oct 2015 11:32:07 +0100 Subject: [PATCH] =?UTF-8?q?Modification=20background=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/style.css | 7 +- img/hourglass.svg | 115 ++++-------------- .../{launcher => common}/crossfade-image.js | 2 +- src/components/launcher/launcher-view.js | 2 +- 4 files changed, 32 insertions(+), 94 deletions(-) rename src/components/{launcher => common}/crossfade-image.js (96%) diff --git a/css/style.css b/css/style.css index b06b662..6f81888 100644 --- a/css/style.css +++ b/css/style.css @@ -17,6 +17,10 @@ html, body { height: 100%; color: white; overflow-x: hidden; + background: url('../img/background.svg'); + background-size: cover; + background-repeat: no-repeat; + background-position: center; } @@ -31,7 +35,6 @@ html, body { background-position: center center; background-size: contain; background-repeat: no-repeat; - transition: background-image 250ms ease-in-out; } .full-width { @@ -56,7 +59,6 @@ html, body { right: 0; bottom: 0; top: 0; - z-index: -1; } .launcher .crossfade-image .top, @@ -82,6 +84,7 @@ html, body { align-items: center; display: flex; width: 60px; + z-index: 10; } .launcher .nav a.goback { diff --git a/img/hourglass.svg b/img/hourglass.svg index f73d114..a75ae8a 100644 --- a/img/hourglass.svg +++ b/img/hourglass.svg @@ -7,9 +7,9 @@ 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="50px" - height="50px" - viewBox="0 0 100 100" + width="32.529999" + height="37.5" + viewBox="0 0 65.059998 75" preserveAspectRatio="xMidYMid" class="uil-hourglass" id="svg2" @@ -43,112 +43,47 @@ id="namedview30" showgrid="false" inkscape:zoom="13.350176" - inkscape:cx="-10.530194" - inkscape:cy="27.889305" + inkscape:cx="-3.9872051" + inkscape:cy="18.89309" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="g6" /> + inkscape:current-layer="g6" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + id="rect4" + style="fill:none" /> + id="g6" + transform="translate(-17.46875,-13)"> - - - - - - - - - - - - + style="fill:#a4a4a4;fill-opacity:1;stroke:#ffffff;stroke-width:5;stroke-miterlimit:10" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1" + inkscape:connector-curvature="0" /> - + style="fill:#ffffff;fill-opacity:1" + inkscape:connector-curvature="0" /> diff --git a/src/components/launcher/crossfade-image.js b/src/components/common/crossfade-image.js similarity index 96% rename from src/components/launcher/crossfade-image.js rename to src/components/common/crossfade-image.js index 3cb1068..1456927 100644 --- a/src/components/launcher/crossfade-image.js +++ b/src/components/common/crossfade-image.js @@ -40,7 +40,7 @@ module.exports = React.createClass({ ; return ( -
+
{bottom} {top} diff --git a/src/components/launcher/launcher-view.js b/src/components/launcher/launcher-view.js index b1eecbb..44a2748 100644 --- a/src/components/launcher/launcher-view.js +++ b/src/components/launcher/launcher-view.js @@ -6,7 +6,7 @@ var AnimateMixin = require('../mixins/animate'); var actions = require('../../store/actions'); var connect = require('react-redux').connect; var debug = require('../../util/debug')('launcher-view'); -var CrossfadeImage = require('./crossfade-image'); +var CrossfadeImage = require('../common/crossfade-image'); var path = require('path'); var DEFAULT_PROFILE = path.join(__dirname, '..', '..', '..', 'default-profile.json');