From 33619abdfbe1845f56d283265bae2e3e68ad0485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20=C4=BDach?= Date: Mon, 6 May 2019 20:18:53 +0200 Subject: [PATCH 1/2] Fix certain improper rendering of forms (#560) --- static/css/_article.scss | 2 ++ static/css/_forms.scss | 22 ++++++++++++++++------ static/css/_global.scss | 5 +++-- static/css/_header.scss | 1 + static/css/main.scss | 1 + templates/search/index.rs.html | 4 ++-- templates/search/result.rs.html | 6 +++--- 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/static/css/_article.scss b/static/css/_article.scss index ab4ea12c..a8d33e42 100644 --- a/static/css/_article.scss +++ b/static/css/_article.scss @@ -312,6 +312,7 @@ main .article-meta { .popup:not(.show), .popup-bg:not(.show) { display: none; + appearance: none; } .popup-bg { @@ -332,6 +333,7 @@ main .article-meta { .cw-text { display: none; + appearance: none; } input[type="checkbox"].cw-checkbox { diff --git a/static/css/_forms.scss b/static/css/_forms.scss index a87ccf08..b785db41 100644 --- a/static/css/_forms.scss +++ b/static/css/_forms.scss @@ -10,6 +10,7 @@ input, textarea, select { margin: auto; padding: 1em; box-sizing: border-box; + -webkit-appearance: textarea; background: $form-input-background; color: $black; @@ -23,7 +24,10 @@ input, textarea, select { border-color: $purple; } } -form input[type="submit"] { margin: 2em auto; } +form input[type="submit"] { + margin: 2em auto; + -webkit-appearance: none; +} textarea { resize: vertical; @@ -38,6 +42,7 @@ input[type="checkbox"] { margin: initial; min-width: initial; width: initial; + -webkit-appearance: checkbox; } /** Inline forms (containing only CSRF token and a , for protected links) **/ @@ -54,7 +59,7 @@ form.inline { cursor: pointer; font-size: 1em; width: auto; - -webkit-appearance: none; + -webkit-appearance: none; &:not(.button) { margin: 0; @@ -96,7 +101,10 @@ form.inline { } } } -input[type="submit"] { display: block; } +input[type="submit"] { + display: block; + -webkit-appearance: none; +} // Writing page form.new-post { @@ -116,6 +124,7 @@ form.new-post { min-height: 20em; overflow-y: hidden; resize: none; + -webkit-appearance: textarea; } input[type="submit"] { background: $lightgray; @@ -126,8 +135,9 @@ form.new-post { font-family: $playfair; font-size: 1.5em; } - input[type="submit"]:hover { background: $lightgray; } - -webkit-appearance: none; + input[type="submit"]:hover { + background: $lightgray;} + -webkit-appearance: none; } .button + .button { @@ -157,4 +167,4 @@ header.center { margin-left: 0; margin-right: 0; } -} \ No newline at end of file +} diff --git a/static/css/_global.scss b/static/css/_global.scss index 18284b19..e684ddd4 100644 --- a/static/css/_global.scss +++ b/static/css/_global.scss @@ -54,6 +54,7 @@ small { .hidden { display: none; + appearance: none; } /// Main @@ -109,7 +110,7 @@ main { margin-bottom: 0.5em; } } - + .cover { padding: 0px; margin: 0px; @@ -400,5 +401,5 @@ figure { color: $purple; border-bottom: 1px solid $purple; } - } + } } diff --git a/static/css/_header.scss b/static/css/_header.scss index 5a5335d8..76560474 100644 --- a/static/css/_header.scss +++ b/static/css/_header.scss @@ -10,6 +10,7 @@ header { nav#menu { position: relative; display: none; + appearance: none; transform: skewX(-15deg); left: -1em; padding: 1em 1em 1em 2em; diff --git a/static/css/main.scss b/static/css/main.scss index a9028797..280aa38c 100644 --- a/static/css/main.scss +++ b/static/css/main.scss @@ -41,6 +41,7 @@ html { #content { display: none; + appearance: none; text-align: center; } } diff --git a/templates/search/index.rs.html b/templates/search/index.rs.html index 54614547..a10a72ae 100644 --- a/templates/search/index.rs.html +++ b/templates/search/index.rs.html @@ -6,7 +6,7 @@ @:base(ctx, i18n!(ctx.1, "Search"), {}, {}, {

@i18n!(ctx.1, "Search")

- +
@i18n!(ctx.1, "Advanced search") @input!(ctx.1, title (text), "Article title matching these words", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Title"))) @@ -17,7 +17,7 @@ @input!(ctx.1, tag (text), "Containing these tags", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Tags"))) @input!(ctx.1, instance (text), "Posted on one of these instances", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Instance domain"))) - @input!(ctx.1, author (text), "Posted by one of these authors", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Authors"))) + @input!(ctx.1, author (text), "Posted by one of these authors", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Author(s)"))) @input!(ctx.1, blog (text), "Posted on one of these blogs", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Blog title"))) @input!(ctx.1, lang (text), "Written in this language", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Language"))) @input!(ctx.1, license (text), "Published under this license", &format!("placeholder=\"{}\"", i18n!(ctx.1, "Article license"))) diff --git a/templates/search/result.rs.html b/templates/search/result.rs.html index 759ac203..7490bd6a 100644 --- a/templates/search/result.rs.html +++ b/templates/search/result.rs.html @@ -4,14 +4,14 @@ @(ctx: BaseContext, query_str: &str, articles: Vec, page: i32, n_pages: i32) -@:base(ctx, i18n!(ctx.1, "Search result for \"{0}\""; query_str), {}, {}, { -

@i18n!(ctx.1, "Search result")

+@:base(ctx, i18n!(ctx.1, "Search result(s) for \"{0}\""; query_str), {}, {}, { +

@i18n!(ctx.1, "Search result(s)")

@query_str

@if articles.is_empty() {
@if page == 1 { -

@i18n!(ctx.1, "No result for your query")

+

@i18n!(ctx.1, "No results for your query")

} else {

@i18n!(ctx.1, "No more results for your query")

} -- 2.38.5 From 625aac938c01ea8b27101e2fd53ef22e36f64aff Mon Sep 17 00:00:00 2001 From: Trinity Pointard Date: Fri, 10 May 2019 13:15:24 +0200 Subject: [PATCH 2/2] upload artifact of wasm binary fix #570 --- .circleci/config.yml | 3 +++ script/generate_artifact.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00b77c19..3dab247b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -216,6 +216,9 @@ jobs: - store_artifacts: path: plume.tar.gz destination: plume.tar.gz + - store_artifacts: + path: wasm.tar.gz + destination: wasm.tar.gz push translations: executor: diff --git a/script/generate_artifact.sh b/script/generate_artifact.sh index fabbd19d..c61087c7 100755 --- a/script/generate_artifact.sh +++ b/script/generate_artifact.sh @@ -2,4 +2,5 @@ mkdir bin cp target/release/{plume,plm} bin strip -s bin/* -tar -cvzf plume.tar.gz bin/ static/ migrations/$FEATURES +tar -cvzf plume.tar.gz bin/ static/ +tar -cvzf wasm.tar.gz static/plume-front.{js,wasm} -- 2.38.5