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.

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

Localized logo and small style improvements #993

Merged
merged 7 commits into from Mar 11, 2019

Conversation

Projects
None yet
3 participants
@Macroz
Copy link
Collaborator

Macroz commented Mar 8, 2019

  • Remove extra padding from event bubbles
  • Remove some extra divs
  • Improve localization by allowing a logo per language.
  • See also CSCfi/rems-deploy#18
  • See #872
Show resolved Hide resolved src/clj/rems/css/styles.clj Outdated
@@ -395,7 +403,7 @@
:margin-bottom (u/em 1)}]
[(s/descendant :.logo :.img) {:height "100%"
:background-color (util/get-theme-attribute :logo-bgcolor)
:background-image (resolve-image (util/get-theme-attribute :logo-name))
:background-image (get-logo-image context/*lang*)

This comment has been minimized.

@opqdonut

opqdonut Mar 11, 2019

Collaborator

should there also be a fallback when the language-specific image isn't defined? or YAGNI?

This comment has been minimized.

@Macroz

Macroz Mar 11, 2019

Author Collaborator

The fallback is there, but it's actually in the get-logo-image fn.

^{:key e} [event-view e])]))])
(defn- render-event-groups [event-groups]
(for [group event-groups]
^{:key group} [:div.group

This comment has been minimized.

@foxlynx

foxlynx Mar 11, 2019

Member

Are the two levels of div from events-groups-view dropped on purpose?

(defn- event-groups-view [event-groups]
  [:div
   (into [:div]
         (for [group event-groups]

@Macroz Macroz merged commit 7b047a8 into master Mar 11, 2019

6 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: cloverage Your tests passed on CircleCI!
Details
ci/circleci: doo Your tests passed on CircleCI!
Details
ci/circleci: ok Your tests passed on CircleCI!
Details
ci/circleci: war Your tests passed on CircleCI!
Details
ci/circleci: without-db Your tests passed on CircleCI!
Details

@Macroz Macroz deleted the small-style-improvements branch Mar 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.