diff --git a/app/css/master.css b/app/css/master.css
index 1122d77a..01745958 100644
--- a/app/css/master.css
+++ b/app/css/master.css
@@ -9,7 +9,9 @@ body {
height: 100vh;
color: var(--color);
}
-.titlebar, .menubar-menu-container, .action-menu-item {
+.titlebar,
+.menubar-menu-container,
+.action-menu-item {
background-color: var(--notfbox) !important;
filter: brightness(110%) !important;
color: var(--color) !important;
@@ -25,10 +27,10 @@ body {
display: none;
}
.accessMark {
- font-size: 12px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ font-size: 12px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
background-color: var(--emphasized);
padding-left: 5px;
padding-right: 5px;
@@ -519,18 +521,18 @@ textarea {
width: 300px;
max-width: 100%;
background-color: var(--box);
- z-index: 501;
- padding: 5px;
+ z-index: 501;
+ padding: 5px;
}
#pageSrcInput {
- width: 160px;
+ width: 160px;
}
.voice {
clip: rect(1px, 1px, 1px, 1px);
- position: absolute !important;
- height: 1px;
- width: 1px;
- overflow: hidden;
+ position: absolute !important;
+ height: 1px;
+ width: 1px;
+ overflow: hidden;
}
@media (max-width: 500px) {
@@ -561,17 +563,14 @@ textarea {
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;
+ 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');
+ src: url(https://fonts.gstatic.com/s/materialicons/v48/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2');
}
.material-icons {
font-family: 'Material Icons';
@@ -588,3 +587,16 @@ textarea {
-webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased;
}
+.pwaView .pwa,
+.pwaView .mac,
+.pwaView .win {
+ display: none;
+}
+.win32 .mac,
+.linux .mac {
+ display: none;
+}
+.linux .win,
+.darwin .win {
+ display: none;
+}
diff --git a/app/js/common/version.js b/app/js/common/version.js
index 2ac8f6a3..f566575e 100644
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -1,6 +1,7 @@
//バージョンチェッカー
function verck(ver, jp) {
console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
+ $('body').addClass(localStorage.getItem('platform'))
var date = new Date()
var showVer = false
if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js
index c8c981a1..ff554d10 100644
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -766,6 +766,7 @@ window.onload = function () {
voiceSettingLoad()
oksload()
ctLoad()
+ $('body').addClass(localStorage.getItem('platform'))
}
//設定画面で未読マーカーは要らない
function asReadEnd() {
diff --git a/app/view/make/acct.sample.html b/app/view/make/acct.sample.html
index a7a2d640..97285a3a 100644
--- a/app/view/make/acct.sample.html
+++ b/app/view/make/acct.sample.html
@@ -29,7 +29,7 @@
@@pwa@@
-
+
- @@codesetupwarn@@
-
-
+
+ @@codesetupwarn@@
+
+
+
+
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 63876407..07a1cc3f 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -34,7 +34,7 @@
@@comment-end@@ @@pwa@@
-
+
`)
source = source.replace(/@@node_base@@/g, 'dependencies')
+ source = source.replace(/@@pwaClass@@/g, 'pwaView')
} else {
source = source.replace(/@@pwa@@/g, '')
source = source.replace(/@@node_base@@/g, 'node_modules')
+ source = source.replace(/@@pwaClass@@/g, '')
}
fs.writeFileSync(basefile + 'view/' + lang + '/' + pages[i], source)
}
diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html
index 4e3cfd7d..327e7b4a 100644
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@@ -32,7 +32,7 @@
@@pwa@@
-
+
@@ -399,7 +399,7 @@
style="width:100%; max-width:200px; background-color:#1ed760;" id="spotify-disable">@@disconnect@@
@@link@@(Last.fm)
- @@lastFmWarn@@
+ @@lastFmWarn@@
@@templateedit@@
@@ -407,8 +407,7 @@
@@template1@@
- @@template2@@
- @@template3@@
+ >@@template2@@
@@postartwork@@
- @@searchArtwork@@
- @@searchArtworkWarn@@
-
-
-
+
+
@@searchArtwork@@
+ @@searchArtworkWarn@@
+
+
+
+