Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme update #553

Merged
merged 21 commits into from
May 18, 2019
+1,986 −1,171
Merged

Theme update #553

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3b7670c
Start to update the theme
elegaanz Apr 27, 2019
6cb6e6a
Fix build script: it now recompiles everytime a scss file changed
elegaanz Apr 28, 2019
9bf0f2d
Make sure the article illustrations are not too big
elegaanz Apr 28, 2019
328a854
Make articles wider (70 characters)
elegaanz Apr 28, 2019
5515750
Better contrast between gray shades
elegaanz Apr 28, 2019
cb2e0fd
Various improvements
elegaanz Apr 28, 2019
a6944af
Better mobile style
elegaanz Apr 28, 2019
1cc449f
New style for the footer
elegaanz Apr 28, 2019
5d60051
Improve comment style
elegaanz Apr 28, 2019
e0d89d9
Better responsiveness again
elegaanz Apr 28, 2019
217ffd9
Limit the size of the article cover
elegaanz Apr 29, 2019
d0ec5c6
Merge branch 'master' into theme-update
elegaanz Apr 29, 2019
796417e
Last details?
elegaanz Apr 29, 2019
ac4adb2
Pin the stdweb version that we use
elegaanz Apr 30, 2019
6073a54
Better contrast for links in the header of the article
elegaanz May 1, 2019
c80578b
Merge branch 'master' into theme-update
elegaanz May 4, 2019
8f8b5c6
Add a basic privacy policy
elegaanz May 5, 2019
9133fd2
Remove "also"
elegaanz May 5, 2019
64238e3
Merge branch 'master' into theme-update
elegaanz May 11, 2019
42243e4
Fix a few issues
elegaanz May 11, 2019
b97896d
Merge branch 'master' into theme-update
trinity-1686a May 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
868 changes: 484 additions & 384 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ fn main() {
let in_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("templates");
compile_templates(&in_dir, &out_dir).expect("compile templates");

println!("cargo:rerun-if-changed=static/css");
println!("cargo:rerun-if-changed=static/css/_article.scss");
println!("cargo:rerun-if-changed=static/css/_forms.scss");
println!("cargo:rerun-if-changed=static/css/_global.scss");
println!("cargo:rerun-if-changed=static/css/_header.scss");
println!("cargo:rerun-if-changed=static/css/_variables.scss");
println!("cargo:rerun-if-changed=static/css/main.scss");
elegaanz marked this conversation as resolved.
Show resolved Hide resolved
let mut out = File::create("static/css/main.css").expect("Couldn't create main.css");
out.write_all(
&rsass::compile_scss_file(
Expand Down
5 changes: 3 additions & 2 deletions plume-front/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ version = "0.3.0"
authors = ["Plume contributors"]

[dependencies]
stdweb = "0.4"
stdweb = "=0.4.14"
stdweb-internal-runtime = "=0.1.3"
gettext = { git = "https://github.com/Plume-org/gettext/", rev = "294c54d74c699fbc66502b480a37cc66c1daa7f3" }
gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
lazy_static = "1.3"
lazy_static = "1.3"
57 changes: 43 additions & 14 deletions po/plume/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,21 @@ msgstr "إنشاء حساب"
msgid "About this instance"
msgstr "عن مثيل الخادوم هذا"

msgid "Privacy policy"
msgstr ""

msgid "Administration"
msgstr "الإدارة"

msgid "Documentation"
msgstr ""

msgid "Source code"
msgstr "الشيفرة المصدرية"

msgid "Matrix room"
msgstr "غرفة المحادثة على ماتريكس"

msgid "Administration"
msgstr "الإدارة"

msgid "Welcome to {}"
msgstr "مرحبا بكم في {0}"

Expand Down Expand Up @@ -365,6 +371,9 @@ msgstr "احفظ هذه الإعدادات"
msgid "About {0}"
msgstr "عن {0}"

msgid "Runs Plume {0}"
msgstr "مدعوم بـ Plume {0}"

msgid "Home to <em>{0}</em> people"
msgstr "يستضيف <em>{0}</em> أشخاص"

Expand All @@ -377,8 +386,22 @@ msgstr ""
msgid "Administred by"
msgstr "يديره"

msgid "Runs Plume {0}"
msgstr "مدعوم بـ Plume {0}"
msgid ""
"If you are browsing this site as a visitor, no data about you is collected."
msgstr ""

msgid ""
"As a registered user, you also have to provide your username (which does not "
"have to be your real name), your functional email address and a password, in "
"order to be able to log in, write articles and comment. The content you "
"submit is stored until you delete it."
msgstr ""

msgid ""
"When you log in, we store two cookies, one to keep your session open, the "
"second to prevent other people to act on your behalf. We don't store any "
"other cookies."
msgstr ""

#, fuzzy
msgid "Follow {}"
Expand Down Expand Up @@ -740,12 +763,6 @@ msgstr "انشر منشورك"
msgid "Written by {0}"
msgstr "كتبه {0}"

msgid "Edit"
msgstr "تعديل"

msgid "Delete this article"
msgstr "احذف هذا المقال"

msgid "All rights reserved."
msgstr "جميع الحقوق محفوظة."

Expand Down Expand Up @@ -803,6 +820,18 @@ msgstr "ارسال التعليق"
msgid "No comments yet. Be the first to react!"
msgstr "لا توجد هناك تعليقات بعد. كن أول مَن يتفاعل معه!"

msgid "Delete"
msgstr "حذف"

msgid "This article is still a draft. Only you and other authors can see it."
msgstr ""

msgid "Only you and other authors can edit this article."
msgstr ""

msgid "Edit"
msgstr "تعديل"

msgid "Invalid CSRF token"
msgstr ""

Expand Down Expand Up @@ -924,9 +953,6 @@ msgstr "ليس لديك أية وسائط بعد."
msgid "Content warning: {0}"
msgstr "تحذير عن المحتوى: {0}"

msgid "Delete"
msgstr "حذف"

msgid "Details"
msgstr "التفاصيل"

Expand Down Expand Up @@ -959,3 +985,6 @@ msgstr ""

msgid "Use as an avatar"
msgstr "استخدمها كصورة رمزية"

#~ msgid "Delete this article"
#~ msgstr "احذف هذا المقال"
54 changes: 40 additions & 14 deletions po/plume/bg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,21 @@ msgstr "Регистрация"
msgid "About this instance"
msgstr "За тази инстанция"

msgid "Privacy policy"
msgstr ""

msgid "Administration"
msgstr "Aдминистрация"

msgid "Documentation"
msgstr ""

msgid "Source code"
msgstr "Изходен код"

msgid "Matrix room"
msgstr ""

msgid "Administration"
msgstr "Aдминистрация"

msgid "Welcome to {}"
msgstr ""

Expand Down Expand Up @@ -363,6 +369,9 @@ msgstr "Запаметете тези настройките"
msgid "About {0}"
msgstr ""

msgid "Runs Plume {0}"
msgstr "Писти Pluma {0}"

msgid "Home to <em>{0}</em> people"
msgstr ""

Expand All @@ -375,8 +384,22 @@ msgstr ""
msgid "Administred by"
msgstr ""

msgid "Runs Plume {0}"
msgstr "Писти Pluma {0}"
msgid ""
"If you are browsing this site as a visitor, no data about you is collected."
msgstr ""

msgid ""
"As a registered user, you also have to provide your username (which does not "
"have to be your real name), your functional email address and a password, in "
"order to be able to log in, write articles and comment. The content you "
"submit is stored until you delete it."
msgstr ""

msgid ""
"When you log in, we store two cookies, one to keep your session open, the "
"second to prevent other people to act on your behalf. We don't store any "
"other cookies."
msgstr ""

msgid "Follow {}"
msgstr ""
Expand Down Expand Up @@ -737,12 +760,6 @@ msgstr ""
msgid "Written by {0}"
msgstr "Написано от {0}"

msgid "Edit"
msgstr ""

msgid "Delete this article"
msgstr ""

msgid "All rights reserved."
msgstr ""

Expand Down Expand Up @@ -794,6 +811,18 @@ msgstr "Публикувайте коментар"
msgid "No comments yet. Be the first to react!"
msgstr "Все още няма коментари. Бъдете първите!"

msgid "Delete"
msgstr ""

msgid "This article is still a draft. Only you and other authors can see it."
msgstr ""

msgid "Only you and other authors can edit this article."
msgstr ""

msgid "Edit"
msgstr ""

msgid "Invalid CSRF token"
msgstr ""

Expand Down Expand Up @@ -910,9 +939,6 @@ msgstr ""
msgid "Content warning: {0}"
msgstr ""

msgid "Delete"
msgstr ""

msgid "Details"
msgstr ""

Expand Down
55 changes: 42 additions & 13 deletions po/plume/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,21 @@ msgstr "Registre"
msgid "About this instance"
msgstr "Quant a aquesta instància"

msgid "Privacy policy"
msgstr ""

msgid "Administration"
msgstr "Administració"

msgid "Documentation"
msgstr ""

msgid "Source code"
msgstr "Codi font"

msgid "Matrix room"
msgstr ""

msgid "Administration"
msgstr "Administració"

msgid "Welcome to {}"
msgstr "Us donem la benvinguda a {}"

Expand Down Expand Up @@ -359,6 +365,9 @@ msgstr ""
msgid "About {0}"
msgstr "Quant a {0}"

msgid "Runs Plume {0}"
msgstr ""

msgid "Home to <em>{0}</em> people"
msgstr ""

Expand All @@ -371,7 +380,21 @@ msgstr ""
msgid "Administred by"
msgstr ""

msgid "Runs Plume {0}"
msgid ""
"If you are browsing this site as a visitor, no data about you is collected."
msgstr ""

msgid ""
"As a registered user, you also have to provide your username (which does not "
"have to be your real name), your functional email address and a password, in "
"order to be able to log in, write articles and comment. The content you "
"submit is stored until you delete it."
msgstr ""

msgid ""
"When you log in, we store two cookies, one to keep your session open, the "
"second to prevent other people to act on your behalf. We don't store any "
"other cookies."
msgstr ""

msgid "Follow {}"
Expand Down Expand Up @@ -731,12 +754,6 @@ msgstr ""
msgid "Written by {0}"
msgstr "Escrit per {0}"

msgid "Edit"
msgstr "Edita"

msgid "Delete this article"
msgstr "Suprimeix aquest article"

msgid "All rights reserved."
msgstr "Tots els drets reservats."

Expand Down Expand Up @@ -786,6 +803,18 @@ msgstr "Envia el comentari"
msgid "No comments yet. Be the first to react!"
msgstr ""

msgid "Delete"
msgstr "Suprimeix"

msgid "This article is still a draft. Only you and other authors can see it."
msgstr ""

msgid "Only you and other authors can edit this article."
msgstr ""

msgid "Edit"
msgstr "Edita"

msgid "Invalid CSRF token"
msgstr ""

Expand Down Expand Up @@ -902,9 +931,6 @@ msgstr ""
msgid "Content warning: {0}"
msgstr ""

msgid "Delete"
msgstr "Suprimeix"

msgid "Details"
msgstr "Detalls"

Expand Down Expand Up @@ -937,3 +963,6 @@ msgstr ""

msgid "Use as an avatar"
msgstr ""

#~ msgid "Delete this article"
#~ msgstr "Suprimeix aquest article"
Loading