Skip to content

Commit

Permalink
Merge branch 'port-mannheim' of github.com:eyra/mono into port-mannheim
Browse files Browse the repository at this point in the history
  • Loading branch information
mellelieuwes committed Jun 21, 2024
2 parents 1024270 + 5e01986 commit 51881da
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion core/assets/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module.exports = {
white: "#FFFFFF",
apple: "#000000",
google: "#EA4335",
surfconext: "#4DB2CF",
surfconext: "#FEDB02",
},
extend: {
boxShadow: {
Expand Down
2 changes: 1 addition & 1 deletion core/priv/gettext/en/LC_MESSAGES/eyra-account.po
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ msgstr "Sign in with Google"

#, elixir-autogen, elixir-format
msgid "login.surf.button"
msgstr "Sign in through SURFconext"
msgstr "Sign in with SURFconext"

#, elixir-autogen, elixir-format
msgid "ehtical.code.label"
Expand Down
5 changes: 1 addition & 4 deletions core/priv/static/images/surfconext.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions core/systems/account/user_form.ex
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ defmodule Systems.Account.UserForm do
def surfconext_signin(assigns) do
~H"""
<a href="/surfconext">
<div class="pt-2px pb-2px active:pt-3px active:pb-1px active:shadow-top4px bg-grey1 rounded pl-4 pr-4">
<div class="pt-2px pb-2px active:pt-3px active:pb-1px active:shadow-top4px bg-surfconext rounded pl-4 pr-4">
<div class="flex w-full justify-center items-center">
<div>
<img class="mr-3 -mt-1" src={~p"/images/surfconext.svg"} alt="">
<img class="mr-3 h-6" src={~p"/images/surfconext.svg"} alt="">
</div>
<div class="h-11 focus:outline-none">
<div class="flex flex-col justify-center h-full items-center rounded">
<div class="text-white text-button font-button">
<div class="text-black text-button font-button">
<%= dgettext("eyra-account", "login.surf.button") %>
</div>
</div>
Expand Down

0 comments on commit 51881da

Please sign in to comment.