Skip to content
This repository was archived by the owner on Oct 22, 2021. It is now read-only.

Commit e2f3d5b

Browse files
author
Phuntsok Drak-pa
authored
Merge pull request #1 from GitSquared/master
Update from original repo
2 parents d82cf34 + 06ee133 commit e2f3d5b

File tree

8 files changed

+53
-16
lines changed

8 files changed

+53
-16
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Seenaburns' DEX-UI was created _"as an experiment or an art piece, not distribut
4444
## Featured in...
4545
- [Linux Uprising Blog](https://www.linuxuprising.com/2018/11/edex-ui-fully-functioning-sci-fi.html)
4646
- [My post on r/unixporn](https://www.reddit.com/r/unixporn/comments/9ysbx7/oc_a_little_project_that_ive_been_working_on/)
47+
- [Korben article (in french)](https://korben.info/une-interface-futuriste-pour-vos-ecrans-tactiles.html)
4748

4849

4950
## Useful commands for the nerds

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "edex-ui",
33
"productName": "eDEX-UI",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"description": "A science fiction desktop running everywhere. Awesome.",
66
"keywords": [
77
"desktop",

src/assets/css/extra_ratios.css

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/* Support for other screen ratios than 16:9 */
2+
@media (aspect-ratio: 16/10) {
3+
div.keyboard_row:last-child {
4+
left: 1.1vh;
5+
}
6+
div.keyboard_row#row_2 > div.keyboard_enter {
7+
top: -0.7vh;
8+
right: -0.9vh;
9+
}
10+
}
11+
12+
@media (aspect-ratio: 64/27) { /* Commercial name of 64/27 ratio is 21:9 */
13+
div.keyboard_row#row_1 > div.keyboard_enter {
14+
height: 2.1vw;
15+
margin-top: 0.2vh;
16+
}
17+
div.keyboard_row#row_2 > div.keyboard_enter {
18+
height: 6vh;
19+
}
20+
div.keyboard_key#keyboard_spacebar {
21+
width: 60vh;
22+
}
23+
div.keyboard_row#row_space {
24+
left: 1.6vw;
25+
}
26+
27+
div#mod_cpuinfo > div > div {
28+
width: 94%;
29+
}
30+
31+
table#mod_toplist_table {
32+
margin-top: -1vh;
33+
}
34+
35+
div#mod_netstat_inner {
36+
width: 100%;
37+
}
38+
39+
div#mod_globe canvas {
40+
width: 85%;
41+
}
42+
43+
div#mod_conninfo canvas {
44+
height: 8vh;
45+
}
46+
}

src/assets/css/keyboard.css

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,3 @@ section#keyboard[data-is-fn-on="true"] > div.keyboard_row > div.keyboard_key > h
221221
position: absolute;
222222
opacity: 0;
223223
}
224-
225-
/* Support for other screen ratios than 16:9 */
226-
@media (aspect-ratio: 16/10) {
227-
div.keyboard_row:last-child {
228-
left: 1.1vh;
229-
}
230-
231-
div.keyboard_row#row_2 > div.keyboard_enter {
232-
top: -0.7vh;
233-
right: -0.9vh;
234-
}
235-
}

src/assets/themes/tron-disrupted.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
"pin": "#aacfd1",
2727
"satellite": "#aacfd1"
2828
},
29-
"injectCSS": "section#main_shell{position:relative;left:29vh;}section#main_shell>h3.title{left:calc(29vh + 16.5vw)!important;}section#mod_column_right{left:28.5vh!important;}section#mod_column_right>h3.title{left:29.6vh!important;}div#mod_netstat_inner{height:6.85vh;padding-top:.5vh;}div#mod_globe_innercontainer{padding-bottom:.95vh;}div#mod_conninfo canvas{height:8vh!important;}"
29+
"injectCSS": "section#main_shell{position:relative;left:29vh;}section#main_shell>h3.title{left:calc(29vh + 16.5vw)!important;}section#mod_column_right{left:28.5vh!important;}section#mod_column_right>h3.title{left:29.6vh!important;}div#mod_netstat_inner{height:6.85vh;padding-top:.5vh;}div#mod_globe_innercontainer{padding-bottom:.95vh;}div#mod_conninfo canvas{height:8vh!important;} @media (aspect-ratio:64/27) {section#mod_column_left > h3.title{left:1.6vh!important}section#mod_column_left{left:1vh !important}section#mod_column_right > h3.title{left:44vh!important}section#mod_column_right{left:43vh !important}section#main_shell > h3.title{left:37vw !important;width:60% !important}section#main_shell{left:41vh;width:60%}}"
3030
}

src/classes/filesystem.class.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class FilesystemDisplay {
222222
cmd = `window.remakeKeyboard('${e.name.slice(0, -5)}')`;
223223
}
224224
if (e.type === "edex-settings" && process.env.editor) {
225-
cmd = `window.term.writelr('${process.env.editor} ${e.name.slice(0, -5)}')`;
225+
cmd = `window.term.writelr('${process.env.editor} \\'${e.name.slice(0, -5)}\\'')`;
226226
}
227227

228228
let icon = "";

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "edex-ui",
33
"productName": "eDEX-UI",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"description": "eDEX-UI sci-fi interface",
66
"keywords": [
77
"desktop",

src/ui.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
<link rel="stylesheet" href="assets/css/mod_ramwatcher.css" />
2626
<link rel="stylesheet" href="assets/css/mod_toplist.css" />
2727
<link rel="stylesheet" href="assets/css/mod_clipboardButtons.css" />
28+
<!-- Load extra CSS -->
29+
<link rel="stylesheet" href="assets/css/extra_ratios.css" />
2830

2931
<!-- Load main modules classes -->
3032
<script src="classes/modal.class.js"></script>

0 commit comments

Comments
 (0)