diff --git a/locales/en.yml b/locales/en.yml index cf75bee92b..52e8dfdb4b 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -170,6 +170,13 @@ ch: new: "Create new channel" channel-title: "Channel title" + mk-channel-form: + textarea: "Write here" + upload: "Upload" + drive: "Drive" + post: "Do" + posting: "Doing" + desktop: tags: mk-api-info: diff --git a/locales/ja.yml b/locales/ja.yml index 03975556b5..3dae21d4a2 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -170,6 +170,13 @@ ch: new: "チャンネルを作成" channel-title: "チャンネルのタイトル" + mk-channel-form: + textarea: "書いて" + upload: "アップロード" + drive: "ドライブ" + post: "やる" + posting: "やってます" + desktop: tags: mk-api-info: diff --git a/src/web/app/base.styl b/src/web/app/app.styl similarity index 94% rename from src/web/app/base.styl rename to src/web/app/app.styl index 81c039f0a3..94faba73d4 100644 --- a/src/web/app/base.styl +++ b/src/web/app/app.styl @@ -5,8 +5,6 @@ json('../../const.json') $theme-color = themeColor $theme-color-foreground = themeColorForeground -@import './reset' - /* ::selection background $theme-color @@ -14,6 +12,9 @@ $theme-color-foreground = themeColorForeground */ * + position relative + box-sizing border-box + background-clip padding-box !important tap-highlight-color rgba($theme-color, 0.7) -webkit-tap-highlight-color rgba($theme-color, 0.7) @@ -29,6 +30,9 @@ html &, * cursor progress !important +body + overflow-wrap break-word + #error padding 32px color #fff diff --git a/src/web/app/auth/style.styl b/src/web/app/auth/style.styl index 046a5ff6ee..bd25e1b572 100644 --- a/src/web/app/auth/style.styl +++ b/src/web/app/auth/style.styl @@ -1,4 +1,5 @@ -@import "../base" +@import "../app" +@import "../reset" html background #eee diff --git a/src/web/app/ch/style.styl b/src/web/app/ch/style.styl index 8ad6fbce0b..21ca648cbe 100644 --- a/src/web/app/ch/style.styl +++ b/src/web/app/ch/style.styl @@ -1,5 +1,10 @@ -@import "../base" +@import "../app" html padding 8px background #efefef + +#wait + top auto + bottom 15px + left 15px diff --git a/src/web/app/ch/tags/channel.tag b/src/web/app/ch/tags/channel.tag index 35463bc0b8..4ae62e7b39 100644 --- a/src/web/app/ch/tags/channel.tag +++ b/src/web/app/ch/tags/channel.tag @@ -49,6 +49,9 @@ > .body margin 8px 0 0 0 + > mk-channel-form + max-width 500px +