Skip to content

Commit

Permalink
Theme update (#553)
Browse files Browse the repository at this point in the history
* Start to update the theme

- Ligther colors
- No more border radius
- Buttons are now always colored
- Start to redesign the post page (according to the Figma mockups)

* Fix build script: it now recompiles everytime a scss file changed

* Make sure the article illustrations are not too big

* Make articles wider (70 characters)

* Better contrast between gray shades

* Various improvements

* Better mobile style

* New style for the footer

* Improve comment style

* Better responsiveness again

* Limit the size of the article cover

* Last details?

- Improve buttons on the media page
- Improve lists

* Pin the stdweb version that we use

It changed because I removed Cargo.lock to handle a merge conflict

I could have updated cargo web too, but it mean I should have re-built
the CI docker image and it was taking forever.

* Better contrast for links in the header of the article

* Add a basic privacy policy

* Remove "also"

* Fix a few issues

- Don't watch static/css in build.rs
- Another shade of white
- Remove useless margin rule for error messages
  • Loading branch information
elegaanz authored May 18, 2019
1 parent c67f65e commit ad3a8b9
Show file tree
Hide file tree
Showing 49 changed files with 1,986 additions and 1,171 deletions.
870 changes: 419 additions & 451 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion build.rs
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");
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
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"
73 changes: 49 additions & 24 deletions po/plume/ar.po
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 @@ -607,8 +630,7 @@ msgstr "اسم نطاق مثيل الخادم"
msgid "Posted by one of these authors"
msgstr ""

#, fuzzy
msgid "Author(s)"
msgid "Authors"
msgstr "المؤلفون"

# src/template_utils.rs:305
Expand All @@ -632,17 +654,14 @@ msgstr ""
msgid "Article license"
msgstr "رخصة المقال"

#, fuzzy
msgid "Search result(s) for \"{0}\""
msgstr "نتائج البحث"
msgid "Search result for \"{0}\""
msgstr ""

#, fuzzy
msgid "Search result(s)"
msgid "Search result"
msgstr "نتائج البحث"

#, fuzzy
msgid "No results for your query"
msgstr "الانتقال إلى معرضك"
msgid "No result for your query"
msgstr ""

msgid "No more results for your query"
msgstr ""
Expand Down Expand Up @@ -744,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 @@ -807,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 @@ -928,9 +953,6 @@ msgstr "ليس لديك أية وسائط بعد."
msgid "Content warning: {0}"
msgstr "تحذير عن المحتوى: {0}"

msgid "Delete"
msgstr "حذف"

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

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

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

#~ msgid "Delete this article"
#~ msgstr "احذف هذا المقال"
62 changes: 44 additions & 18 deletions po/plume/bg.po
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 @@ -605,7 +628,7 @@ msgstr ""
msgid "Posted by one of these authors"
msgstr ""

msgid "Author(s)"
msgid "Authors"
msgstr ""

# src/template_utils.rs:305
Expand All @@ -629,13 +652,13 @@ msgstr ""
msgid "Article license"
msgstr ""

msgid "Search result(s) for \"{0}\""
msgid "Search result for \"{0}\""
msgstr ""

msgid "Search result(s)"
msgid "Search result"
msgstr ""

msgid "No results for your query"
msgid "No result for your query"
msgstr ""

msgid "No more results for your query"
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
Loading

0 comments on commit ad3a8b9

Please sign in to comment.