diff --git a/app/css/master.css b/app/css/master.css index 2faea524..3c4d21be 100644 --- a/app/css/master.css +++ b/app/css/master.css @@ -7,7 +7,6 @@ body { cursor: default; font-size: 13px; height: 100vh; - background-color: var(--bg); color: var(--color); } .btn { @@ -235,9 +234,6 @@ blockquote:before, #drag-content { font-size: 2rem; } -.radio { - font-family: "Baloo Bhai"; -} #pip { z-index: 504; width: 418px; @@ -474,3 +470,32 @@ input, textarea { background: #607d8b; -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5); } +/* Web Fonts */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url(https://fonts.gstatic.com/s/opensans/v17/mem5YaGs126MiZpBA-UN_r8OUuhp.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +@font-face { + font-family: 'Material Icons'; + font-style: normal; + font-weight: 400; + src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); +} +.material-icons { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} \ No newline at end of file diff --git a/app/js/login/login.js b/app/js/login/login.js index 740d3095..de9f4da7 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -290,7 +290,7 @@ function refresh(target, loadskip) { localStorage.setItem("user-id_" + target, json["id"]); localStorage.setItem("prof_" + target, avatar); localStorage.setItem("follow_" + target, json["following_count"]); - obj[target] = ref; + console.log(obj) var json = JSON.stringify(obj); localStorage.setItem("multi", json); if (!loadskip) { @@ -451,7 +451,7 @@ function multiSelector(parseC) { $("#local-button").removeClass("hide") } var profimg = acct.prof; - localStorage.setItem("prof_" + key, profimg); + //localStorage.setItem("prof_" + key, profimg); if (!profimg) { profimg = "../../img/missing.svg"; } diff --git a/app/js/platform/first.js b/app/js/platform/first.js index 53c4e5f1..403c3a0e 100644 --- a/app/js/platform/first.js +++ b/app/js/platform/first.js @@ -1,3 +1,4 @@ +document.title="TheDesk" $.strip_tags = function (str, allowed) { if (!str) { return ""; diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js index c5296c69..9dc541d0 100644 --- a/app/js/ui/layout.js +++ b/app/js/ui/layout.js @@ -257,6 +257,7 @@ function parseColumn(dontclose) { $("#bottom").removeClass("reverse"); $(".leftside").removeClass("reverse"); } + $("#bottom").removeClass("hide"); if (localStorage.getItem("sec") && localStorage.getItem("sec") != "nothing") { secvis(localStorage.getItem("sec")); } diff --git a/app/js/ui/theme.js b/app/js/ui/theme.js index 18d39c67..bafebc4c 100644 --- a/app/js/ui/theme.js +++ b/app/js/ui/theme.js @@ -7,23 +7,26 @@ function themes(theme) { localStorage.setItem("theme", "black"); } } - $("html").removeClass("indigotheme"); - $("html").removeClass("greentheme"); - $("html").removeClass("browntheme"); - $("html").removeClass("blacktheme"); - $("html").removeClass("bluetheme"); - $("html").removeClass("customtheme"); - $("html").addClass(theme + "theme"); + var el = document.getElementsByTagName("html")[0] + + el.classList.remove('indigotheme'); + el.classList.remove('greentheme'); + el.classList.remove('browntheme'); + el.classList.remove('blacktheme'); + el.classList.remove('bluetheme'); + el.classList.remove('customtheme'); + el.classList.add(theme + "theme"); var font = localStorage.getItem("font"); if (font) { - $("html").css("font-family", font); + el.style.fontFamily = font; } else { - $("html").css("font-family", ""); + el.style.fontFamily = ""; } if (theme == "custom") { if (localStorage.getItem("customtheme-id")) { postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*") } } + el.style.backgroundColor = "var(--bg)"; } -themes(); \ No newline at end of file +themes(); diff --git a/app/main.js b/app/main.js index 8f7c097a..4ee004bf 100644 --- a/app/main.js +++ b/app/main.js @@ -127,7 +127,7 @@ function createWindow() { contextIsolation: true, preload: join(__dirname, "js", "platform", "preload.js") }, - width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png' + width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png', show: false } } else if (platform == "win32") { var arg = { @@ -137,7 +137,7 @@ function createWindow() { contextIsolation: true, preload: join(__dirname, "js", "platform", "preload.js") }, - width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true + width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false } } else if (platform == "darwin") { var arg = { @@ -147,10 +147,16 @@ function createWindow() { contextIsolation: true, preload: join(__dirname, "js", "platform", "preload.js") }, - width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true + width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true, show: false } } mainWindow = new BrowserWindow(arg); + mainWindow.once('page-title-updated', () => { + mainWindow.show() + if (window_size.max) { + mainWindow.maximize(); + } + }) electron.session.defaultSession.clearCache(() => { }) if (process.argv) { if (process.argv[1]) { @@ -172,9 +178,6 @@ function createWindow() { if (!window_size.x && !window_size.y) { mainWindow.center(); } - if (window_size.max) { - mainWindow.maximize(); - } // ウィンドウが閉じられたらアプリも終了 mainWindow.on('closed', function () { electron.ipcMain.removeAllListeners(); diff --git a/app/package.json b/app/package.json index eee03263..b6c4ff55 100644 --- a/app/package.json +++ b/app/package.json @@ -65,6 +65,7 @@ "font-manager": "^0.3.0" }, "devDependencies": { + "@fortawesome/fontawesome-free": "^5.10.1", "electron": "^6.0.0", "electron-builder": "^21.1.5", "readline-sync": "1.4.10" diff --git a/app/view/bg/index.html b/app/view/bg/index.html index 86d00ab6..c28a7919 100644 --- a/app/view/bg/index.html +++ b/app/view/bg/index.html @@ -2,18 +2,16 @@ - TheDesk + + - - - + -
+