nogafam
/
instante-social
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring + Home page improving UX + Base color changes

This commit is contained in:
nogafam.es Admin 2021-10-19 23:22:41 +02:00
parent d0b5e3ed69
commit ca832a88dc
11 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -51,7 +51,7 @@ module ApplicationHelper
def available_sign_up_path
if closed_registrations?
'https://joinmastodon.org/#getting-started'
'https://servers.instante.social/'
else
new_user_registration_path
end

36
app/javascript/images/logo_transparent.svg
View File

@ -1 +1,35 @@
<svg xmlns="http://www.w3.org/2000/svg"><symbol id="mastodon-svg-logo" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" /></symbol></svg>
<svg id="mastodon-svg-logo" version="1.0" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512.000000 512.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" stroke="none">
<path d="M2447 4770 c-62 -16 -131 -56 -204 -118 -37 -33 -221 -171 -408 -307
-954 -697 -1295 -944 -1350 -977 -232 -141 -300 -391 -172 -629 14 -25 64
-167 112 -315 47 -148 187 -579 310 -959 123 -379 231 -721 239 -759 55 -236
235 -378 463 -363 155 9 290 98 361 237 61 122 59 260 -7 408 -22 48 -89 240
-150 427 -60 187 -187 576 -280 864 -94 288 -171 527 -171 531 0 4 147 115
328 247 180 132 484 356 675 497 192 142 354 259 360 262 7 2 109 -67 227
-153 118 -86 424 -307 680 -491 256 -185 467 -337 469 -339 3 -2 -21 -83 -53
-181 -31 -97 -163 -505 -293 -907 -129 -401 -241 -741 -248 -755 -19 -37 -45
-162 -45 -214 0 -142 90 -297 214 -370 162 -95 383 -71 517 55 82 78 122 159
139 280 5 37 98 339 206 671 108 332 248 762 311 956 63 194 127 381 143 416
35 76 49 134 50 205 0 67 -24 164 -55 216 -36 62 -115 137 -182 173 -84 44
-1705 1212 -1775 1279 -32 30 -86 67 -124 85 -56 26 -80 31 -158 34 -50 2
-108 -1 -129 -6z"/>
<path d="M2154 3133 l-140 -4 -16 -47 c-128 -391 -206 -647 -200 -657 4 -7 55
-47 114 -89 97 -69 128 -86 128 -71 0 4 232 732 270 848 6 19 6 26 -3 25 -7
-1 -75 -4 -153 -5z"/>
<path d="M2371 3112 c-11 -22 -81 -247 -81 -261 0 -8 134 -11 460 -11 253 0
460 3 460 7 0 5 -21 70 -46 146 l-46 138 -369 -1 c-334 -1 -370 -3 -378 -18z"/>
<path d="M2947 2782 c-9 -2 -17 -10 -17 -17 0 -8 28 -99 61 -202 119 -363 186
-568 199 -611 7 -24 17 -45 21 -48 9 -5 239 164 239 176 0 5 -38 125 -85 267
-122 373 -137 417 -146 427 -8 9 -235 15 -272 8z"/>
<path d="M1757 2363 c-8 -14 -88 -275 -85 -277 2 -1 55 -40 119 -87 104 -75
159 -115 403 -290 38 -27 74 -49 80 -48 15 1 219 152 223 166 6 16 16 7 -348
270 -63 45 -167 120 -232 167 -132 96 -154 109 -160 99z"/>
<path d="M2985 2102 c-27 -21 -70 -52 -95 -70 -25 -18 -71 -51 -102 -75 -32
-23 -110 -80 -175 -126 -65 -47 -132 -96 -149 -110 -17 -14 -59 -46 -92 -70
l-61 -44 122 -87 122 -87 55 38 c30 21 82 59 115 83 33 25 89 66 125 91 36 25
94 68 130 95 36 27 89 65 118 85 28 20 52 44 52 53 0 20 -30 120 -61 205 -14
37 -27 57 -38 57 -9 0 -38 -17 -66 -38z"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

4
app/javascript/mastodon/features/ui/components/link_footer.js
View File

@ -52,10 +52,10 @@ class LinkFooter extends React.PureComponent {
{withHotkeys && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
<li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
{!limitedFederationMode && <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>}
<li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
<li><a href='https://instante.social/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
<li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
<li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
<li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
<li><a href='https://docs.instante.social' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
<li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
</ul>

2
app/javascript/styles/mastodon-light/variables.scss
View File

@ -4,7 +4,7 @@ $white: #ffffff;
$classic-base-color: #282c37;
$classic-primary-color: #9baec8;
$classic-secondary-color: #d9e1e8;
$classic-secondary-color: #ffcee7;
$classic-highlight-color: #f73699;
// Differences

1
app/javascript/styles/mastodon/about.scss
View File

@ -845,6 +845,7 @@ $small-breakpoint: 960px;
.directory {
margin-top: 2em !important;
margin-bottom: 4em !important;
&__tag {
margin-bottom: 0;

2
app/javascript/styles/mastodon/footer.scss
View File

@ -119,7 +119,7 @@
.brand {
svg {
display: block;
height: 36px;
height: 50px;
width: auto;
margin: 0 auto;
fill: lighten($ui-base-color, 34%);

18
app/lib/activitypub/adapter.rb
View File

@ -12,18 +12,18 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
hashtag: { 'Hashtag' => 'as:Hashtag' },
moved_to: { 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' } },
also_known_as: { 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' } },
emoji: { 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' },
featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' }, 'featuredTags' => { '@id' => 'toot:featuredTags', '@type' => '@id' } },
emoji: { 'toot' => 'http://instante.social/ns#', 'Emoji' => 'toot:Emoji' },
featured: { 'toot' => 'http://instante.social/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' }, 'featuredTags' => { '@id' => 'toot:featuredTags', '@type' => '@id' } },
property_value: { 'schema' => 'http://schema.org#', 'PropertyValue' => 'schema:PropertyValue', 'value' => 'schema:value' },
atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' },
conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' },
focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } },
identity_proof: { 'toot' => 'http://joinmastodon.org/ns#', 'IdentityProof' => 'toot:IdentityProof' },
blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' },
discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' },
voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' },
olm: { 'toot' => 'http://joinmastodon.org/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
focal_point: { 'toot' => 'http://instante.social/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } },
identity_proof: { 'toot' => 'http://instante.social/ns#', 'IdentityProof' => 'toot:IdentityProof' },
blurhash: { 'toot' => 'http://instante.social/ns#', 'blurhash' => 'toot:blurhash' },
discoverable: { 'toot' => 'http://instante.social/ns#', 'discoverable' => 'toot:discoverable' },
voters_count: { 'toot' => 'http://instante.social/ns#', 'votersCount' => 'toot:votersCount' },
olm: { 'toot' => 'http://instante.social/ns#', 'Device' => 'toot:Device', 'Ed25519Signature' => 'toot:Ed25519Signature', 'Ed25519Key' => 'toot:Ed25519Key', 'Curve25519Key' => 'toot:Curve25519Key', 'EncryptedMessage' => 'toot:EncryptedMessage', 'publicKeyBase64' => 'toot:publicKeyBase64', 'deviceId' => 'toot:deviceId', 'claim' => { '@type' => '@id', '@id' => 'toot:claim' }, 'fingerprintKey' => { '@type' => '@id', '@id' => 'toot:fingerprintKey' }, 'identityKey' => { '@type' => '@id', '@id' => 'toot:identityKey' }, 'devices' => { '@type' => '@id', '@id' => 'toot:devices' }, 'messageFranking' => 'toot:messageFranking', 'messageType' => 'toot:messageType', 'cipherText' => 'toot:cipherText' },
suspended: { 'toot' => 'http://instante.social/ns#', 'suspended' => 'toot:suspended' },
}.freeze
def self.default_key_transform

2
app/views/about/show.html.haml
View File

@ -76,7 +76,7 @@
%span=t 'about.see_whats_happening'
.directory__tag
= link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener noreferrer' do
= link_to 'https://instante.social/apps', target: '_blank', rel: 'noopener noreferrer' do
%h4
= fa_icon 'tablet fw'
%span=t 'about.get_apps'

2
app/views/home/index.html.haml
View File

@ -13,4 +13,4 @@
= image_pack_tag 'logo.svg', alt: 'Mastodon'
%div
= t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
= t('errors.noscript_html', apps_path: 'https://instante.social/apps')

10
app/views/layouts/public.html.haml
View File

@ -14,7 +14,7 @@
- unless whitelist_mode?
= link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
= link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
= link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional'
= link_to t('about.apps'), 'https://instante.social/apps', class: 'nav-link optional'
.nav-center
@ -38,10 +38,10 @@
.column-1
%h4= t 'footer.developers'
%ul
%li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
%li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
%li= link_to t('about.documentation'), 'https://docs.instante.social/'
%li= link_to t('about.api'), 'https://docs.instante.social/client/intro/'
.column-2
%h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
%h4= link_to '¡instante!', 'https://instante.social'
= link_to svg_logo, root_url, class: 'brand'
.column-3
%h4= site_hostname
@ -53,6 +53,6 @@
%h4= t 'footer.more'
%ul
%li= link_to t('about.source_code'), Mastodon::Version.source_url
%li= link_to t('about.apps'), 'https://joinmastodon.org/apps'
%li= link_to t('about.apps'), 'https://instante.social/apps'
= render template: 'layouts/application'

2
config/locales/es.yml
View File

@ -16,7 +16,7 @@ es:
contact: Contacto
contact_missing: No especificado
contact_unavailable: No disponible
discover_users: Conoce a personas registradas
discover_users: Conoce más personas
documentation: Documentación
federation_hint_html: Con una cuenta en %{instance} usted podrá seguir a las personas en cualquier servidor de Instante y más allá.
get_apps: Descarga la App al "Instante"