diff --git a/css/style.css b/css/style.css index cc0053b..5474663 100644 --- a/css/style.css +++ b/css/style.css @@ -17,10 +17,13 @@ html, body { height: 100%; color: white; overflow-x: hidden; - background: url('../img/background.svg'); - background-size: cover; - background-repeat: no-repeat; - background-position: center; + background: + url(../img/pitaya.png) no-repeat bottom 15px left 30px, + url(../img/cadoles.png) no-repeat bottom 15px right 30px, + radial-gradient(circle at top left, rgba(255,207,104, 0.9), rgba(255,207,104, 0)), + linear-gradient(30deg, rgba(241,26,96,0.7), rgba(6,188,137,0.8)), + linear-gradient(145deg, rgba(254,139,85,0.7), rgba(59,23,119,1)); + background-size: 120px, 100px, cover, cover, cover; } @@ -85,14 +88,16 @@ html, body { display: flex; width: 60px; z-index: 10; + padding-left: 40px; } .launcher .nav a.goback { text-decoration: none; color: white; - font-size: 60px; + font-size: 75px; text-shadow: 1px 1px #444; - font-family: sans-serif; + font-family: arrows; + } .launcher .nav a.goback:hover { diff --git a/default-profile.json b/default-profile.json index 0263a45..e517b56 100644 --- a/default-profile.json +++ b/default-profile.json @@ -6,7 +6,6 @@ { "label": "Level 1", "icon": "chromium-browser", - "background": "./img/background2.jpg", "items": [ { "label": "Level 2-1", diff --git a/fonts/fontello/LICENSE.txt b/fonts/fontello/LICENSE.txt new file mode 100644 index 0000000..91b6f51 --- /dev/null +++ b/fonts/fontello/LICENSE.txt @@ -0,0 +1,39 @@ +Font license info + + +## Elusive + + Copyright (C) 2013 by Aristeides Stathopoulos + + Author: Aristeides Stathopoulos + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://aristeides.com/ + + +## Web Symbols + + Copyright (c) 2011 by Just Be Nice studio. All rights reserved. + + Author: Just Be Nice studio + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://www.justbenicestudio.com/ + + +## Typicons + + (c) Stephen Hutchings 2012 + + Author: Stephen Hutchings + License: SIL (http://scripts.sil.org/OFL) + Homepage: http://typicons.com/ + + +## Font Awesome + + Copyright (C) 2012 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + diff --git a/fonts/fontello/README.txt b/fonts/fontello/README.txt new file mode 100644 index 0000000..beaab33 --- /dev/null +++ b/fonts/fontello/README.txt @@ -0,0 +1,75 @@ +This webfont is generated by http://fontello.com open source project. + + +================================================================================ +Please, note, that you should obey original font licenses, used to make this +webfont pack. Details available in LICENSE.txt file. + +- Usually, it's enough to publish content of LICENSE.txt file somewhere on your + site in "About" section. + +- If your project is open-source, usually, it will be ok to make LICENSE.txt + file publicly available in your repository. + +- Fonts, used in Fontello, don't require a clickable link on your site. + But any kind of additional authors crediting is welcome. +================================================================================ + + +Comments on archive content +--------------------------- + +- /font/* - fonts in different formats + +- /css/* - different kinds of css, for all situations. Should be ok with + twitter bootstrap. Also, you can skip style and assign icon classes + directly to text elements, if you don't mind about IE7. + +- demo.html - demo file, to show your webfont content + +- LICENSE.txt - license info about source fonts, used to build your one. + +- config.json - keeps your settings. You can import it back into fontello + anytime, to continue your work + + +Why so many CSS files ? +----------------------- + +Because we like to fit all your needs :) + +- basic file, .css - is usually enough, it contains @font-face + and character code definitions + +- *-ie7.css - if you need IE7 support, but still don't wish to put char codes + directly into html + +- *-codes.css and *-ie7-codes.css - if you like to use your own @font-face + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. See fontello source code for examples. + +- *-embedded.css - basic css file, but with embedded WOFF font, to avoid + CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. + We strongly recommend to resolve this issue by `Access-Control-Allow-Origin` + server headers. But if you ok with dirty hack - this file is for you. Note, + that data url moved to separate @font-face to avoid problems with + + + + + + + +
+

+ arrows + font demo +

+ +
+
+
+
icon-left-open0xe800
+
icon-left-open-10xe801
+
icon-left0xe802
+
icon-left-big0xe803
+
+
+
icon-left-circled0xe804
+
icon-angle-circled-left0xe805
+
+
+
Generated by fontello.com
+ + \ No newline at end of file diff --git a/fonts/fontello/font/arrows.eot b/fonts/fontello/font/arrows.eot new file mode 100644 index 0000000..f4e69ff Binary files /dev/null and b/fonts/fontello/font/arrows.eot differ diff --git a/fonts/fontello/font/arrows.svg b/fonts/fontello/font/arrows.svg new file mode 100644 index 0000000..09d9b4d --- /dev/null +++ b/fonts/fontello/font/arrows.svg @@ -0,0 +1,22 @@ + + + +Copyright (C) 2016 by original authors @ fontello.com + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/fontello/font/arrows.ttf b/fonts/fontello/font/arrows.ttf new file mode 100644 index 0000000..d6cdf0c Binary files /dev/null and b/fonts/fontello/font/arrows.ttf differ diff --git a/fonts/fontello/font/arrows.woff b/fonts/fontello/font/arrows.woff new file mode 100644 index 0000000..a501404 Binary files /dev/null and b/fonts/fontello/font/arrows.woff differ diff --git a/fonts/fontello/font/arrows.woff2 b/fonts/fontello/font/arrows.woff2 new file mode 100644 index 0000000..3616fe0 Binary files /dev/null and b/fonts/fontello/font/arrows.woff2 differ diff --git a/img/cadoles.png b/img/cadoles.png new file mode 100644 index 0000000..fd3a4bf Binary files /dev/null and b/img/cadoles.png differ diff --git a/img/pitaya.png b/img/pitaya.png new file mode 100644 index 0000000..3daa2e3 Binary files /dev/null and b/img/pitaya.png differ diff --git a/index.html b/index.html index a5e7757..72b359b 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,7 @@ Lanceur - Pitaya + diff --git a/src/components/launcher/launcher-view.js b/src/components/launcher/launcher-view.js index 5cd544a..5143168 100644 --- a/src/components/launcher/launcher-view.js +++ b/src/components/launcher/launcher-view.js @@ -10,7 +10,7 @@ var CrossfadeImage = require('../common/crossfade-image'); var path = require('path'); var DEFAULT_PROFILE = path.join(__dirname, '..', '..', '..', 'default-profile.json'); -var DEFAULT_BACKGROUND = path.join(__dirname, '..', '..', '..', 'img', 'background.svg'); +var DEFAULT_BACKGROUND = ''; var LauncherView = React.createClass({ diff --git a/src/components/launcher/nav.js b/src/components/launcher/nav.js index d952f44..b9987e8 100644 --- a/src/components/launcher/nav.js +++ b/src/components/launcher/nav.js @@ -16,7 +16,7 @@ module.exports = React.createClass({ return (
- ◄ +
);