diff --git a/Gruntfile.js b/Gruntfile.js index 708119c..fccf38b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,7 +4,7 @@ var path = require('path'); module.exports = function(grunt) { - var NW_VERSION = '0.12.2'; + var NW_VERSION = '0.12.3'; var BUILD_DIR = 'build'; var BUILD_TARGETS = { linux_ia32: true, diff --git a/README.md b/README.md index 57238a9..7b28bee 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ git clone https://forge.cadoles.com/wpetit/pitaya.git cd pitaya git checkout develop npm install -npm start +DEBUG=pitaya* npm start ``` ## Options diff --git a/css/style.css b/css/style.css index 6739667..63e9fea 100644 --- a/css/style.css +++ b/css/style.css @@ -6,7 +6,6 @@ html, body { padding: 0; margin: 0; font-family: 'Droid Sans', 'Ubuntu Sans', sans-serif; - background: url('../img/background.png') no-repeat; background-size: contain; background-position: center; background-color: rgb(34, 107, 160); @@ -16,6 +15,11 @@ html, body { overflow-x: hidden; } +.alert.alert-default { + border-radius: 4px; + border: 1px solid #ddd; +} + /* Launcher View */ .launcher { @@ -23,6 +27,7 @@ html, body { width: 100%; height: 100%; flex-direction: column; + background: url('../img/background.png') no-repeat; } .launcher .category-header { @@ -48,7 +53,6 @@ html, body { } .launcher ul.apps-list { - display: block; margin: 0; padding: 0; display: flex; @@ -73,7 +77,8 @@ html, body { transition: 150ms linear; position: relative; overflow: hidden; - min-width: 150px; + width: 125px; + height: 125px; } .launcher li.app-item::after { @@ -101,6 +106,105 @@ html, body { display: block; text-align: center; color: white; + white-space: nowrap; + text-overflow: ellipsis; + max-width: 90%; + overflow: hidden; + margin: auto; +} + +/* Edit View */ + +.edit { + display: flex; + width: 100%; + height: 100%; + flex-direction: column; +} + +.edit .menu-bar { + padding: 5px 10px; +} + +.edit .menu-bar button { + margin-right: 3px; +} + +.edit .workspace { + display: flex; + flex-direction: row; + padding: 10px; + flex: 3; +} + +.edit .left-menu { + display: flex; + flex-direction: column; + flex: 1; + overflow-y: auto; +} + +.edit .item-form { + display: flex; + flex-direction: row; + flex: 2; +} + +.edit .item-form > form { + width: 100%; +} + +.edit .apps-list .icon-theme-selector > select { + width: 100%; +} + +.edit .apps-list ul.desktop-apps { + list-style: none; + padding: 0; + height: 100%; + margin: 10px 0 0 0; + padding: 0 10px 0 0; +} + +.edit .apps-list li.desktop-app { + +} + +.edit .desktop-app > .app-icon { + height: 35px; + width: 35px; + display: inline-block; + vertical-align: middle; + margin-right: 10px; +} + +.edit .profile-tree { + flex: 3; + padding: 0 5px; +} + +.edit .profile-tree ul { + list-style: none; + margin: 0; +} + +.edit .profile-tree > .tree-item > ul { + padding: 0; +} + +.edit .profile-tree .tree-item .alert { + padding: 5px; + margin-bottom: 2px; +} + +.edit .profile-tree .tree-item .app-icon { + height: 25px; + margin-right: 5px; +} + +.edit .app-item-edit { + flex: 1; + padding: 0 5px; } /* Animations */ diff --git a/default-profile.json b/default-profile.json index aa9154f..76d3279 100644 --- a/default-profile.json +++ b/default-profile.json @@ -2,30 +2,30 @@ "items": [ { "label": "Level 1", - "icon": "/usr/share/icons/Mint-X/apps/48/chromium-browser.png", + "icon": "chromium-browser", "items": [ { "label": "Level 2-1", - "icon": "/usr/share/icons/Mint-X/apps/48/chromium-browser.png", + "icon": "chromium-browser", "items": [ { - "label": "Chromium Browser", - "icon": "/usr/share/icons/Mint-X/apps/48/chromium-browser.png", + "label": "Chromium Browser 1", + "icon": "chromium-browser", "exec": "/usr/bin/chromium-browser" } ] }, { "label": "Level 2-2", - "icon": "/usr/share/icons/Mint-X/apps/48/chromium-browser.png", + "icon": "chromium-browser", "items": [ { "label": "Level 3-1", - "icon": "/usr/share/icons/Mint-X/apps/48/chromium-browser.png", + "icon": "chromium-browser", "items": [ { - "label": "Chromium Browser", - "icon": "/usr/share/icons/Mint-X/apps/48/chromium-browser.png", + "label": "Chromium Browser 2", + "icon": "chromium-browser", "exec": "/usr/bin/chromium-browser" } ] diff --git a/img/default-icon.svg b/img/default-icon.svg new file mode 100644 index 0000000..a1f872c --- /dev/null +++ b/img/default-icon.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/img/hourglass.svg b/img/hourglass.svg new file mode 100644 index 0000000..f73d114 --- /dev/null +++ b/img/hourglass.svg @@ -0,0 +1,154 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/index.html b/index.html index aad2c75..af268f4 100644 --- a/index.html +++ b/index.html @@ -2,12 +2,13 @@ Lanceur - Pitaya +
- +