diff --git a/app/css/master.css b/app/css/master.css
index 7d380b13..e9d9eadc 100644
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -10,9 +10,6 @@ body {
background-color: var(--bg);
color: var(--color);
}
-body {
- border: thin solid gray;
-}
.btn {
margin: 5px;
text-transform: none;
@@ -307,6 +304,9 @@ blockquote:before,
.tabs {
background-color: var(--subcolor);
}
+.collapsible-header:focus {
+ background-color: var(--subcolor);
+}
.modal-footer {
background-color: var(--modalfooter) !important;
}
diff --git a/app/css/tl.css b/app/css/tl.css
index 417be456..00f4a0db 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -158,6 +158,7 @@ iframe {
height: 100%;
border: thin solid gray;
overflow: hidden;
+ border-top: none;
}
.box .pin,
#his-data .pin {
diff --git a/app/main.js b/app/main.js
index 159dd57a..b53267c1 100644
--- a/app/main.js
+++ b/app/main.js
@@ -18,6 +18,27 @@ const app = electron.app;
const BrowserWindow = electron.BrowserWindow;
// メインウィンドウはGCされないようにグローバル宣言
let mainWindow;
+if (process.argv.indexOf("--dev") === -1) {
+ var packaged = true;
+} else {
+ var packaged = false;
+ console.log(
+ "||\\\\\\ \n"+
+ "|||| \\\\\\\\ \n"+
+ "|||| \\\\\\\\ \n"+
+ "|||| Am I a \\\\\\\\ \n"+
+ "|||| cat? ^ ^ \\\\\\\\\\ _____ _ ____ _ \n"+
+ "|||| (.-.) \\\\\\\\\\ |_ _| |__ ___| _ \\ ___ ___| | __\n"+
+ "|||| ___> ) ||||| | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n"+
+ "|||| < _ _) ////// | | | | | | __/ |_| | __/\__ \\ < \n"+
+ "|||| |_||_| ///// |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n"+
+ "|||| ///// \n"+
+ "|||| /////\n"+
+ "|||| /////\n"+
+ "||||//////"
+ )
+ console.log("Welcome!")
+}
var info_path = join(app.getPath("userData"), "window-size.json");
var max_info_path = join(app.getPath("userData"), "max-window-size.json");
var lang_path = join(app.getPath("userData"), "language");
@@ -25,9 +46,9 @@ var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
try {
fs.readFileSync(ha_path, 'utf8');
app.disableHardwareAcceleration()
- console.log("disabled: HA");
+ if(!packaged) console.log("disabled: Hardware Acceleration");
} catch{
- console.log("enabled: HA");
+ if(!packaged) console.log("enabled: Hardware Acceleration");
}
var window_size;
try {
@@ -74,7 +95,6 @@ app.on('activate', function () {
function createWindow() {
if (isFile(lang_path)) {
- console.log("exist");
var lang = fs.readFileSync(lang_path, 'utf8');
} else {
var langs = app.getLocale();
@@ -88,8 +108,8 @@ function createWindow() {
fs.writeFileSync(lang_path, lang);
});
}
- console.log(app.getLocale());
- console.log("launch:" + lang);
+ if(!packaged) console.log("your lang:" + app.getLocale());
+ if(!packaged) console.log("launch:" + lang);
// メイン画面の表示。ウィンドウの幅、高さを指定できる
var platform = process.platform;
var bit = process.arch;
@@ -173,11 +193,6 @@ function createWindow() {
var platform = process.platform;
var bit = process.arch;
- if (process.argv.indexOf("--dev") === -1) {
- packaged = true;
- } else {
- packaged = false;
- }
Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
//CSS
css.css(mainWindow);
diff --git a/app/package.json b/app/package.json
index dd6a91fb..701fcb89 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "thedesk",
- "version": "18.7.0",
+ "version": "18.7.1",
"description": "TheDesk is a Mastodon client for PC.",
"repository": "https://github.com/cutls/TheDesk",
"main": "main.js",
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 66702f7e..dd0e8511 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -38,7 +38,7 @@