Multiple updates:

- Add new Mastodon logo - Redesign login buttons - Add ability to disconnect accounts - Logout button - Optimize friend checking page - Update dependencies

Multiple updates:
- Add new Mastodon logo - Redesign login buttons - Add ability to disconnect accounts - Logout button - Optimize friend checking page - Update dependencies
c5ba6ddd · Eugen Rochko · 150a39b3 · c5ba6ddd · c5ba6ddd · c5ba6ddd
Commit c5ba6ddd authored Aug 03, 2017 by Eugen Rochko
38 changed files
--- a/.rubocop.yml
+++ b/.rubocop.yml
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+  - 'spec/**/*'
+  - 'db/**/*'
+  - 'app/views/**/*'
+  - 'config/**/*'
+  - 'bin/*'
+  - 'Rakefile'
+  - 'node_modules/**/*'
+  - 'Vagrantfile'
+  - 'vendor/**/*'
+
+Bundler/OrderedGems:
+  Enabled: false
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: indent
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: space
+
+Metrics/AbcSize:
+  Max: 100
+
+Metrics/BlockLength:
+  Max: 35
+  Exclude:
+    - 'lib/tasks/**/*'
+
+Metrics/BlockNesting:
+  Max: 3
+
+Metrics/ClassLength:
+  CountComments: false
+  Max: 300
+
+Metrics/CyclomaticComplexity:
+  Max: 25
+
+Metrics/LineLength:
+  AllowURI: true
+  Enabled: false
+
+Metrics/MethodLength:
+  CountComments: false
+  Max: 55
+
+Metrics/ModuleLength:
+  CountComments: false
+  Max: 200
+
+Metrics/ParameterLists:
+  Max: 5
+  CountKeywordArgs: true
+
+Metrics/PerceivedComplexity:
+  Max: 20
+
+Rails:
+  Enabled: true
+
+Rails/HasAndBelongsToMany:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/CollectionMethods:
+  Enabled: true
+  PreferredMethods:
+    find_all: 'select'
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/GuardClause:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '()'
+    '%w': '()'
+
+Style/PerlBackrefs:
+  AutoCorrect: false
+
+Style/RegexpLiteral:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: 'comma'
--- a/.ruby-version
+++ b/.ruby-version
+2.4.1
--- a/Gemfile
+++ b/Gemfile
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
+ruby '>= 2.3.0', '< 2.5.0'

-gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
-gem 'pg', '~> 0.18'
-gem 'puma', '~> 3.0'
+gem 'rails', '~> 5.1.0'
+gem 'pg', '~> 0.20'
+gem 'puma', '~> 3.8'
 gem 'sass-rails', '~> 5.0'
 gem 'font-awesome-rails'
+gem 'jquery-rails'

+gem 'bootsnap'
 gem 'mastodon-api', require: 'mastodon'
 gem 'twitter', git: 'https://github.com/sferik/twitter'
-gem 'devise'
+gem 'devise', '~> 4.2'
 gem 'omniauth-twitter'
 gem 'omniauth-mastodon', '>= 0.9.2'
-gem 'hamlit'
+gem 'hamlit-rails', '~> 0.2'
+gem 'fast_blank', '~> 1.0'

 group :development, :test do
  gem 'pry'
-  gem 'dotenv-rails'
+  gem 'dotenv-rails', '~> 2.2'
 end

 group :development do
  gem 'listen', '~> 3.0.5'
  gem 'spring'
  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'better_errors', '~> 2.1'
 end

-gem 'rails_12factor', group: :production
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-ruby '2.2.4'
+group :production do
+  gem 'lograge', '~> 0.5'
+  gem 'rails_12factor'
+end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,94 +17,115 @@ GIT
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
+    actioncable (5.1.2)
+      actionpack (= 5.1.2)
+      nio4r (~> 2.0)
      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.1.2)
+      actionview (= 5.1.2)
+      activesupport (= 5.1.2)
      rack (~> 2.0)
      rack-test (~> 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
      builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.1.2)
+      activesupport (= 5.1.2)
      globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
+      arel (~> 8.0)
+    activesupport (5.1.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (~> 0.7)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
    addressable (2.5.1)
      public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
+    arel (8.0.0)
    bcrypt (3.1.11)
+    better_errors (2.2.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    bootsnap (1.1.1)
+      msgpack (~> 1.0)
    buftok (0.2.0)
    builder (3.2.3)
    coderay (1.1.1)
    concurrent-ruby (1.0.5)
-    devise (4.2.1)
+    devise (4.3.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
      responders
      warden (~> 1.2.3)
-    domain_name (0.5.20170223)
+    domain_name (0.5.20170404)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.0)
-    dotenv-rails (2.2.0)
-      dotenv (= 2.2.0)
-      railties (>= 3.2, < 5.1)
+    dotenv (2.2.1)
+    dotenv-rails (2.2.1)
+      dotenv (= 2.2.1)
+      railties (>= 3.2, < 5.2)
    equalizer (0.0.11)
+    erubi (1.6.1)
    erubis (2.7.0)
-    faraday (0.11.0)
+    faraday (0.12.2)
      multipart-post (>= 1.2, < 3)
+    fast_blank (1.0.0)
    ffi (1.9.18)
-    font-awesome-rails (4.6.3.1)
-      railties (>= 3.2, < 5.1)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    hamlit (2.7.2)
-      temple (~> 0.7.6)
+    font-awesome-rails (4.7.0.2)
+      railties (>= 3.2, < 5.2)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    hamlit (2.8.4)
+      temple (>= 0.8.0)
      thor
      tilt
-    hashie (3.5.5)
-    http (2.2.1)
+    hamlit-rails (0.2.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      hamlit (>= 1.2.0)
+      railties (>= 4.0.1)
+    hashie (3.5.6)
+    http (2.2.2)
      addressable (~> 2.3)
      http-cookie (~> 1.0)
      http-form_data (~> 1.0.1)
      http_parser.rb (~> 0.6.0)
    http-cookie (1.0.3)
      domain_name (~> 0.5)
-    http-form_data (1.0.1)
+    http-form_data (1.0.3)
    http_parser.rb (0.6.0)
-    i18n (0.8.1)
+    i18n (0.8.6)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
    jwt (1.5.6)
    listen (3.0.8)
      rb-fsevent (~> 0.9, >= 0.9.4)
      rb-inotify (~> 0.9, >= 0.9.7)
+    lograge (0.5.1)
+      actionpack (>= 4, < 5.2)
+      activesupport (>= 4, < 5.2)
+      railties (>= 4, < 5.2)
    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
      mime-types (>= 1.16, < 4)
    mastodon-api (1.1.0)
      addressable (~> 2.4)
@@ -115,18 +136,19 @@ GEM
    mime-types (3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    msgpack (1.1.0)
    multi_json (1.12.1)
    multi_xml (0.6.0)
    multipart-post (2.0.0)
    naught (1.1.0)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    oauth (0.5.1)
-    oauth2 (1.3.1)
-      faraday (>= 0.8, < 0.12)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    oauth (0.5.3)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
      jwt (~> 1.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
@@ -147,31 +169,31 @@ GEM
      omniauth-oauth (~> 1.1)
      rack
    orm_adapter (0.5.0)
-    pg (0.20.0)
+    pg (0.21.0)
    pry (0.10.4)
      coderay (~> 1.1.0)
      method_source (~> 0.8.1)
      slop (~> 3.4)
    public_suffix (2.0.5)
-    puma (3.8.2)
-    rack (2.0.1)
+    puma (3.9.1)
+    rack (2.0.3)
    rack-test (0.6.3)
      rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails (5.1.2)
+      actioncable (= 5.1.2)
+      actionmailer (= 5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
+      activemodel (= 5.1.2)
+      activerecord (= 5.1.2)
+      activesupport (= 5.1.2)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+      railties (= 5.1.2)
      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
    rails-html-sanitizer (1.0.3)
      loofah (~> 2.0)
    rails_12factor (0.0.3)
@@ -179,19 +201,24 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.1.2)
+      actionpack (= 5.1.2)
+      activesupport (= 5.1.2)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
-    sass (3.4.23)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
    sass-rails (5.0.6)
      railties (>= 4.0.0, < 6)
      sass (~> 3.1)
@@ -200,7 +227,7 @@ GEM
      tilt (>= 1.1, < 3)
    simple_oauth (0.3.1)
    slop (3.6.0)
-    spring (2.0.1)
+    spring (2.0.2)
      activesupport (>= 4.2)
    spring-watcher-listen (2.0.1)
      listen (>= 2.7, < 4.0)
@@ -212,15 +239,15 @@ GEM
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
-    temple (0.7.7)
+    temple (0.8.0)
    thor (0.19.4)
    thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
    tzinfo (1.2.3)
      thread_safe (~> 0.1)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
    warden (1.2.7)
      rack (>= 1.0)
    websocket-driver (0.6.5)
@@ -231,27 +258,31 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  devise
-  dotenv-rails
+  better_errors (~> 2.1)
+  bootsnap
+  devise (~> 4.2)
+  dotenv-rails (~> 2.2)
+  fast_blank (~> 1.0)
  font-awesome-rails
-  hamlit
+  hamlit-rails (~> 0.2)
+  jquery-rails
  listen (~> 3.0.5)
+  lograge (~> 0.5)
  mastodon-api
  omniauth-mastodon (>= 0.9.2)
  omniauth-twitter
-  pg (~> 0.18)
+  pg (~> 0.20)
  pry
-  puma (~> 3.0)
-  rails (~> 5.0.0, >= 5.0.0.1)
+  puma (~> 3.8)
+  rails (~> 5.1.0)
  rails_12factor
  sass-rails (~> 5.0)
  spring
  spring-watcher-listen (~> 2.0.0)
  twitter!
-  tzinfo-data

 RUBY VERSION
-   ruby 2.2.4p230
+   ruby 2.4.1p111

 BUNDLED WITH
-   1.13.0
+   1.15.3
--- a/app/assets/images/logo.svg
+++ b/app/assets/images/logo.svg
+<svg xmlns="http://www.w3.org/2000/svg" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#fff"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#3088d4"/></svg>
--- a/app/assets/images/logo_full.svg
+++ b/app/assets/images/logo_full.svg
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 713.35878 175.8678" height="49.633801mm" width="201.3257mm"><path d="M160.55476 105.43125c-2.4125 12.40625-21.5975 25.9825-43.63375 28.61375-11.49125 1.3725-22.80375 2.63125-34.8675 2.07875-19.73-.90375-35.2975-4.71-35.2975-4.71 0 1.92125.11875 3.75.355 5.46 2.565 19.47 19.3075 20.6375 35.16625 21.18125 16.00625.5475 30.2575-3.9475 30.2575-3.9475l.65875 14.4725s-11.19625 6.01125-31.14 7.11625c-10.99875.605-24.65375-.27625-40.56-4.485C6.99851 162.08 1.06601 125.31.15851 88-.11899 76.9225.05226 66.47625.05226 57.74125c0-38.1525 24.99625-49.335 24.99625-49.335C37.65226 2.6175 59.27976.18375 81.76351 0h.5525c22.48375.18375 44.125 2.6175 56.72875 8.40625 0 0 24.99625 11.1825 24.99625 49.335 0 0 .3125 28.1475-3.48625 47.69" fill="#3088d4"/><path d="M34.65751 48.494c0-5.55375 4.5025-10.055 10.055-10.055 5.55375 0 10.055 4.50125 10.055 10.055 0 5.5525-4.50125 10.055-10.055 10.055-5.5525 0-10.055-4.5025-10.055-10.055M178.86476 60.69975v46.195h-18.30125v-44.8375c0-9.4525-3.9775-14.24875-11.9325-14.24875-8.79375 0-13.2025 5.69125-13.2025 16.94375V89.2935h-18.19375V64.75225c0-11.2525-4.40875-16.94375-13.2025-16.94375-7.955 0-11.9325 4.79625-11.9325 14.24875v44.8375H73.79851v-46.195c0-9.44125 2.40375-16.94375 7.2325-22.495 4.98-5.55 11.50125-8.395 19.595-8.395 9.36625 0 16.45875 3.59875 21.14625 10.79875l4.56 7.6425 4.55875-7.6425c4.68875-7.2 11.78-10.79875 21.1475-10.79875 8.09375 0 14.61375 2.845 19.59375 8.395 4.82875 5.55125 7.2325 13.05375 7.2325 22.495M241.91276 83.663625c3.77625-3.99 5.595-9.015 5.595-15.075 0-6.06-1.81875-11.085-5.595-14.9275-3.63625-3.99125-8.25375-5.91125-13.84875-5.91125-5.59625 0-10.2125 1.92-13.84875 5.91125-3.6375 3.8425-5.45625 8.8675-5.45625 14.9275 0 6.06 1.81875 11.085 5.45625 15.075 3.63625 3.8425 8.2525 5.76375 13.84875 5.76375 5.595 0 10.2125-1.92125 13.84875-5.76375m5.595-52.025h18.04625v73.9h-18.04625v-8.72125c-5.455 7.2425-13.01 10.79-22.80125 10.79-9.3725 0-17.34625-3.695-24.06125-11.23375-6.57375-7.5375-9.93125-16.84875-9.93125-27.785 0-10.78875 3.3575-20.10125 9.93125-27.63875 6.715-7.5375 14.68875-11.38 24.06125-11.38 9.79125 0 17.34625 3.5475 22.80125 10.78875v-8.72zM326.26951 67.258625c5.315 3.99 7.97375 9.60625 7.83375 16.7 0 7.53875-2.65875 13.45-8.11375 17.58875-5.45625 3.99125-12.03 6.06-20.00375 6.06-14.40875 0-24.20125-5.9125-29.3775-17.58875l15.66875-9.31c2.0975 6.35375 6.71375 9.60625 13.70875 9.60625 6.43375 0 9.6525-2.07 9.6525-6.35625 0-3.10375-4.1975-5.91125-12.73-8.1275-3.21875-.8875-5.87625-1.77375-7.97375-2.51375-2.9375-1.18125-5.455-2.5125-7.55375-4.1375-5.17625-3.99-7.83375-9.3125-7.83375-16.11 0-7.2425 2.5175-13.00625 7.55375-17.145 5.17625-4.28625 11.47-6.355 19.025-6.355 12.03 0 20.84375 5.1725 26.5775 15.66625l-15.38625 8.8675c-2.23875-5.02375-6.015-7.53625-11.19125-7.53625-5.45625 0-8.11375 2.06875-8.11375 6.05875 0 3.10375 4.19625 5.91125 12.73 8.12875 6.575 1.4775 11.75 3.695 15.5275 6.50375M383.626635 49.966125h-15.8075v30.7425c0 3.695 1.4 5.91125 4.0575 6.945 1.95875.74 5.875.8875 11.75.59125v17.29375c-12.16875 1.4775-20.9825.295-26.15875-3.69625-5.175-3.8425-7.69375-10.93625-7.69375-21.13375v-30.7425h-12.17v-18.3275h12.17v-14.9275l18.045-5.76375v20.69125h15.8075v18.3275zM441.124885 83.2205c3.6375-3.84375 5.455-8.72125 5.455-14.6325 0-5.91125-1.8175-10.78875-5.455-14.63125-3.6375-3.84375-8.11375-5.76375-13.57-5.76375-5.455 0-9.93125 1.92-13.56875 5.76375-3.4975 3.99-5.31625 8.8675-5.31625 14.63125 0 5.765 1.81875 10.6425 5.31625 14.6325 3.6375 3.8425 8.11375 5.76375 13.56875 5.76375 5.45625 0 9.9325-1.92125 13.57-5.76375m-39.86875 13.15375c-7.13375-7.5375-10.63125-16.70125-10.63125-27.78625 0-10.9375 3.4975-20.1 10.63125-27.6375 7.13375-7.5375 15.9475-11.38 26.29875-11.38 10.3525 0 19.165 3.8425 26.3 11.38 7.135 7.5375 10.77125 16.84875 10.77125 27.6375 0 10.9375-3.63625 20.24875-10.77125 27.78625-7.135 7.53875-15.8075 11.2325-26.3 11.2325-10.49125 0-19.165-3.69375-26.29875-11.2325M524.92126 83.663625c3.6375-3.99 5.455-9.015 5.455-15.075 0-6.06-1.8175-11.085-5.455-14.9275-3.63625-3.99125-8.25375-5.91125-13.84875-5.91125-5.59625 0-10.2125 1.92-13.98875 5.91125-3.63625 3.8425-5.45625 8.8675-5.45625 14.9275 0 6.06 1.82 11.085 5.45625 15.075 3.77625 3.8425 8.5325 5.76375 13.98875 5.76375 5.595 0 10.2125-1.92125 13.84875-5.76375m5.455-81.585h18.04625v103.46h-18.04625v-8.72125c-5.315 7.2425-12.87 10.79-22.66125 10.79-9.3725 0-17.485-3.695-24.2-11.23375-6.575-7.5375-9.9325-16.84875-9.9325-27.785 0-10.78875 3.3575-20.10125 9.9325-27.63875 6.715-7.5375 14.8275-11.38 24.2-11.38 9.79125 0 17.34625 3.5475 22.66125 10.78875v-38.28zM611.79626 83.2205c3.63625-3.84375 5.455-8.72125 5.455-14.6325 0-5.91125-1.81875-10.78875-5.455-14.63125-3.6375-3.84375-8.11375-5.76375-13.57-5.76375-5.455 0-9.9325 1.92-13.56875 5.76375-3.49875 3.99-5.31625 8.8675-5.31625 14.63125 0 5.765 1.8175 10.6425 5.31625 14.6325 3.63625 3.8425 8.11375 5.76375 13.56875 5.76375 5.45625 0 9.9325-1.92125 13.57-5.76375m-39.86875 13.15375c-7.135-7.5375-10.63125-16.70125-10.63125-27.78625 0-10.9375 3.49625-20.1 10.63125-27.6375 7.135-7.5375 15.9475-11.38 26.29875-11.38 10.3525 0 19.165 3.8425 26.3 11.38 7.135 7.5375 10.77125 16.84875 10.77125 27.6375 0 10.9375-3.63625 20.24875-10.77125 27.78625-7.135 7.53875-15.8075 11.2325-26.3 11.2325-10.49125 0-19.16375-3.69375-26.29875-11.2325M713.35876 60.163875v45.37375h-18.04625v-43.00875c0-4.8775-1.25875-8.5725-3.77625-11.38-2.37875-2.5125-5.73625-3.84375-10.0725-3.84375-10.2125 0-15.3875 6.06-15.3875 18.3275v39.905h-18.04625v-73.89875h18.04625v8.27625c4.33625-6.94625 11.19-10.345 20.84375-10.345 7.69375 0 13.98875 2.66 18.885 8.12875 5.035 5.46875 7.55375 12.85875 7.55375 22.465" fill="#fff"/></svg>
--- a/app/assets/images/twitter-square.png
+++ b/app/assets/images/twitter-square.png
--- a/app/assets/javascripts/accounts.js
+++ b/app/assets/javascripts/accounts.js
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
+//= require jquery
+//= require jquery_ujs
--- a/app/assets/javascripts/authorizations.js
+++ b/app/assets/javascripts/authorizations.js
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
+// Place all the styles related to the accounts controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/assets/stylesheets/authorizations.scss
+++ b/app/assets/stylesheets/authorizations.scss
+// Place all the styles related to the authorizations controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
--- a/app/assets/stylesheets/home.scss
+++ b/app/assets/stylesheets/home.scss
-@import url(https://fonts.googleapis.com/css?family=Roboto:400,400i,500,700);
+@import url('https://fonts.googleapis.com/css?family=Quando|Judson|Montserrat:500|Roboto:400,500');
+
+$white:    #fff    !default; // color5
+$lightest: #d9e1e8 !default; // color2
+$lighter:  #9baec8 !default; // color3
+$darkest:  #1F232B !default; // color1
+$black:    #000    !default; // color8
+$darker:   lighten($darkest, 30%);
+
+$vibrant:  #2b90d9 !default; // color4
+$error:    #df405a !default; // color6
+$success:  #79bd9a !default; // color7
+
+$transition-in: 100ms linear;
+$transition-out: 250ms linear;

 /* http://meyerweb.com/eric/tools/css/reset/
   v2.0 | 20110126
@@ -83,7 +97,7 @@ hr {

 p.lead {
  font-size: 16px;
-  font-weight: 500;
+  font-weight: 400;
  color: #fff;
  margin-bottom: 20px;
 }
@@ -141,7 +155,7 @@ p.lead {
    transition: all 200ms ease-out;
  }

-  &:disabled {
+  &:disabled, &.disabled {
    background-color: #9baec8;
    cursor: default;
  }
@@ -207,3 +221,212 @@ h4 {
    text-align: right;
  }
 }
+
+.header {
+  margin-bottom: 30px;
+  display: flex;
+  justify-content: space-between;
+
+  ul {
+    list-style: none;
+
+    li {
+      display: inline-block;
+      vertical-align: bottom;
+    }
+
+    a {
+      display: flex;
+      align-content: center;
+      align-items: center;
+
+      color: $lighter;
+      text-decoration: none;
+      padding: 12px 16px;
+      line-height: 32px;
+      transition: color $transition-out;
+      font-family: 'Montserrat', sans-serif;
+      font-weight: 500;
+      font-size: 14px;
+
+      img.link-logo {
+        width: 32px;
+        height: 32px;
+        opacity: 0.5;
+        transition: opacity $transition-out;
+
+        &.before {
+          margin-right: 10px;
+        }
+
+        &.after {
+          margin-left: 10px;
+        }
+      }
+
+      &.active, &:hover {
+        color: $lightest;
+        transition: color $transition-in;
+
+        img.link-logo {
+          opacity: 0.8;
+          transition: opacity $transition-in;
+        }
+      }
+
+      &.brand {
+        color: $white;
+
+        img {
+          width: auto;
+          height: 32px;
+          opacity: 1;
+          position: relative;
+          top: 4px;
+        }
+
+        &:hover {
+          border-bottom-color: transparent;
+
+          img {
+            opacity: 1;
+          }
+        }
+      }
+    }
+
+    li:first-child a {
+      padding-left: 0;
+    }
+
+    li:last-child a {
+      padding-right: 0;
+    }
+  }
+}
+
+.page-heading {
+  background: darken($darkest, 4%);
+  padding: 20px;
+  margin-bottom: 30px;
+
+  h3 {
+    font-family: 'Montserrat', sans-serif;
+    font-size: 26px;
+
+    small {
+      font-family: 'Roboto', sans-serif;
+      margin-top: 20px;
+      display: block;
+      color: $lighter;
+      font-size: 18px;
+    }
+  }
+}
+
+.connections {
+  li {
+    padding: 0 10px;
+    display: flex;
+    margin-bottom: 15px;
+  }
+
+  .connection-brand {
+    width: 80px;
+    height: 80px;
+
+    img {
+      display: block;
+      margin: 0;
+    }
+
+    &.twitter {
+      img {
+        width: 80px;
+        height: 80px;
+      }
+    }
+
+    &.mastodon {
+      background: #3088d4;
+
+      img {
+        width: 60px;
+        height: 60px;
+        margin: 10px;
+      }
+    }
+  }
+
+  .connection-info {
+    margin-left: 15px;
+
+    strong {
+      font-weight: 500;
+    }
+
+    .connection-disconnect-link {
+      display: block;
+    }
+  }
+}
+
+.login-buttons {
+  display: flex;
+  margin-bottom: 30px;
+
+  & > a, & > div {
+    flex: 1 0 0;
+    color: #fff;
+    display: flex;
+    text-decoration: none;
+
+    &:first-child {
+      margin-right: 10px;
+    }
+  }
+
+  .login-brand {
+    width: 80px;
+    height: 80px;
+
+    img {
+      display: block;
+      width: 100%;
+      height: 100%;
+      margin: 0;
+    }
+  }
+
+  .login-content {
+    padding: 18px 10px;
+  }
+
+  .login-numbers, .login-name {
+    strong {
+      font-weight: 500;
+    }
+  }