diff --git a/src/intl/en-US.js b/src/intl/en-US.js index d777eb2d..a1dacf0d 100644 --- a/src/intl/en-US.js +++ b/src/intl/en-US.js @@ -4,23 +4,20 @@ export default { appDescription: 'An alternative web client for Mastodon, focused on speed and simplicity.', homeDescription: `

- Pinafore is a web client for - Mastodon, - designed for speed and simplicity. + FediLove is a web client aiming to deliver a federated + dating App on top of Mastodon.

- Read the - introductory blog post, - or get started by logging in to an instance: + Start your journey to meet your crush !!

`, - logIn: 'Log in', + logIn: 'Log in using Mastodon', + logInText: 'Log In', footer: `

- Pinafore is - open-source software - created by - Nolan Lawson + FediLove is a Pinafore fork. It is + open-source software + adapted by + bofh@nogafam.es and distributed under the AGPL License. diff --git a/src/routes/_components/NotLoggedInHome.html b/src/routes/_components/NotLoggedInHome.html index a835a314..72c0d099 100644 --- a/src/routes/_components/NotLoggedInHome.html +++ b/src/routes/_components/NotLoggedInHome.html @@ -7,7 +7,7 @@

{@html intl.homeDescription} -

+

{intl.logIn}

diff --git a/src/routes/_pages/settings/instances/add.html b/src/routes/_pages/settings/instances/add.html index aa823943..ce724475 100644 --- a/src/routes/_pages/settings/instances/add.html +++ b/src/routes/_pages/settings/instances/add.html @@ -108,7 +108,7 @@ hasLocalStorage: true }), computed: { - pageLabel: ({ $isUserLoggedIn }) => $isUserLoggedIn ? 'intl.addInstance' : 'intl.logIn' + pageLabel: ({ $isUserLoggedIn }) => $isUserLoggedIn ? 'intl.addInstance' : 'intl.logInText' }, methods: { onSubmitInstance (event) { diff --git a/src/scss/global.scss b/src/scss/global.scss index 9e14d2dd..e2b8d519 100644 --- a/src/scss/global.scss +++ b/src/scss/global.scss @@ -105,8 +105,9 @@ button, .button { font-size: 1.2em; background: var(--button-bg); border-radius: 2px; - padding: 10px 15px; + padding: .8em 1.5em; border: 1px solid var(--button-border); + border-radius: .3em; cursor: pointer; color: var(--button-text); diff --git a/src/scss/themes/ozark.scss b/src/scss/themes/ozark.scss index 94ff982c..fb4698a8 100644 --- a/src/scss/themes/ozark.scss +++ b/src/scss/themes/ozark.scss @@ -11,7 +11,11 @@ $focus-outline: darken($main-theme-color, 10%); $compose-background: darken($main-theme-color, 12%); $nav-bg: #ff0759; $nav-a-selected-bg: lighten($nav-bg, 10%); +$nav-a-selected-bg-hover: #3a3b3c; $nav-a-bg-hover: lighten($nav-bg, 25%); +$nav-a-border: #ffa700; +$nav-a-border-hover: #fff; +$nav-active-bg: lighten($nav-a-selected-bg-hover, 15%); @import "_base.scss"; @import "_dark.scss"; @@ -25,5 +29,10 @@ $nav-a-bg-hover: lighten($nav-bg, 25%); --button-primary-bg-active: #{$nav-a-selected-bg}; --nav-bg: #{$nav-bg}; --nav-a-selected-bg: #{$nav-a-selected-bg}; + --nav-a-selected-bg-hover: #{$nav-a-selected-bg-hover}; + --nav-a-selected-active-bg: #{$nav-a-selected-bg-hover}; --nav-a-bg-hover: #{$nav-a-bg-hover}; + --nav-a-border: #{$nav-a-border}; + --nav-a-border-hover: #{$nav-a-border-hover}; + --nav-active-bg: #{$nav-active-bg}; } diff --git a/src/static/sailboat.svg b/src/static/sailboat.svg index 6f60b779..425d8e18 100644 --- a/src/static/sailboat.svg +++ b/src/static/sailboat.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + +