From d65bec368ab5d2db704cc05e47f62d356f9f0dbc Mon Sep 17 00:00:00 2001 From: Matt Rude Date: Fri, 2 Feb 2018 22:14:05 -0600 Subject: Remove unused stuff --- _data/clients-compliance.yml | 182 ----------------------------------- _data/clients.yml | 80 --------------- _data/clienttypes.yml | 11 --- _includes/guide-download.html | 29 ------ _includes/guide-register.html | 53 +--------- _includes/registration.html | 58 +---------- _sass/site.scss | 78 +++++++++++---- assets/img/clients/messages_logo.png | Bin 4228 -> 0 bytes assets/img/clients/psi_logo.png | Bin 15980 -> 0 bytes assets/img/clients/spark_logo.png | Bin 9575 -> 0 bytes assets/img/clients/xabber_logo.png | Bin 55710 -> 0 bytes assets/img/clients/yaxim_logo.png | Bin 35324 -> 0 bytes creating-account.html | 76 --------------- index.html | 3 + 14 files changed, 68 insertions(+), 502 deletions(-) delete mode 100644 _data/clients-compliance.yml delete mode 100644 _data/clients.yml delete mode 100644 _data/clienttypes.yml delete mode 100644 _includes/guide-download.html delete mode 100644 assets/img/clients/messages_logo.png delete mode 100644 assets/img/clients/psi_logo.png delete mode 100644 assets/img/clients/spark_logo.png delete mode 100644 assets/img/clients/xabber_logo.png delete mode 100644 assets/img/clients/yaxim_logo.png delete mode 100644 creating-account.html diff --git a/_data/clients-compliance.yml b/_data/clients-compliance.yml deleted file mode 100644 index 24c4ac1..0000000 --- a/_data/clients-compliance.yml +++ /dev/null @@ -1,182 +0,0 @@ -- name: 5222.de - url: https://5222.de/ - xep-375: 1 - xep-368: 1 - tor: jtovcabr2vhflcqg.onion - language: German - location: Germany - registration: Website - registration-url: https://blog.5222.de/account/ - -- name: bommboo.de - url: https://bommboo.de/ - xep-375: 1 - xep-368: 1 - tor: ujvdniabz53upqfx.onion - language: German - location: Germany - registration: Website - registration-url: https://bommboo.de:5281/register/ - -- name: chatme.im - url: https://chatme.im/ - xep-375: 1 - xep-368: 0 - language: Italian - registration: In-band registration - -- name: chinwag.im - url: https://chinwag.im/ - registration: Website - registration-url: https://chat.chinwag.im/?accountnext/chinwag.im/ - xep-375: 1 - xep-368: 0 - language: English - -- name: conversations.im - url: https://account.conversations.im/ - registration: In-band registration - xep-375: 1 - xep-368: 1 - language: English - price: €12/year - -- name: creep.im - url: https://creep.im/ - xep-375: 1 - xep-368: 0 - tor: creep7nissfumwyx.onion - language: English - location: Moscow, Russia - registration: In-band registration - -- name: elaon.de - url: https://elaon.de/ - registration: Website - registration-url: https://elaon.de/info/services/xmpp.html - xep-375: 1 - xep-368: 0 - language: German - -- name: high-way.me - url: https://high-way.me/ - xep-375: 1 - xep-368: 1 - language: German - registration: Website - registration-url: https://high-way.me/login/ - -- name: im.apinc.org - url: https://chat.jabberfr.org/ - xep-375: 1 - xep-368: 1 - language: French - location: France - registration: In-band registration - -- name: jabber.cat - url: https://jabber.cat/english.shtml - xep-375: 1 - xep-368: 1 - language: Catalan - registration: Closed - tor: sybzodlxacch7st7.onion - -- name: jabber.fr - url: https://chat.jabberfr.org/ - xep-375: 1 - xep-368: 1 - language: French - location: France - registration: In-band registration - -- name: jabber-germany.de - url: https://jabber-germany.de/ - xep-375: 1 - xep-368: 1 - language: English - registration: In-band registration - tor: dbbrphko5tqcpar3.onion - -- name: jabber.hot-chilli.net - url: https://jabber.hot-chilli.net/ - xep-375: 1 - xep-368: 1 - language: English - location: Germany - registration: Website - registration-url: https://jabber.hot-chilli.net/account/create/ - -- name: rwth-aachen.de - url: https://jabber.rwth-aachen.de/ - xep-375: 1 - xep-368: 1 - language: English - location: Germany - registration: Website - registration-url: https://jabber.rwth-aachen.de/account/register/ - -- name: jabjab.de - url: https://jabjab.de/index.php?lang=gb - xep-375: 1 - xep-368: 1 - language: German - location: Germany - registration: Website - registration-url: https://jabjab.de/registrieren.php?lang=gb - -- name: mailbox.org - url: https://mailbox.org/en/ - xep-375: 1 - xep-368: 0 - language: German - location: Germany - price: €12/year - registration: Website - registration-url: https://mailbox.org/en/signup/ - -- name: mail.de - url: https://mail.de/ - xep-375: 1 - xep-368: 1 - language: German - location: Germany - price: €24/year - registration: Website - registration-url: https://registrierung.mail.de/ - -- name: pimux.de - url: https://pimux.de/ - xep-375: 1 - xep-368: 1 - language: German - location: Germany - registration: Website - registration-url: https://www.pimux.de/page/registrierung - tor: maspm2xs6xavmpo6.onion - -- name: riotcat.org - url: https://riotcat.org/ - registration: In-band registration - xep-375: 1 - xep-368: 1 - language: English - -- name: trashserver.net - url: https://trashserver.net/ - xep-375: 1 - xep-368: 1 - language: German - location: Kumhausen, Germany - registration: Website - registration-url: https://trashserver.net/registrieren/ - tor: m4c722bvc2r7brnn.onion - -- name: wiuwiu.de - url: https://wiuwiu.de/ - xep-375: 1 - xep-368: 1 - language: German - registration: Website - registration-url: https://wiuwiu.de/xmpp/ - tor: jrbiogs6dv5txt5s.onion diff --git a/_data/clients.yml b/_data/clients.yml deleted file mode 100644 index 25b392b..0000000 --- a/_data/clients.yml +++ /dev/null @@ -1,80 +0,0 @@ -- name: Conversations - type: mobile - platform: Mobile (Android) - encryption: TLS, OMEMO, OTR - domain: conversations.im - url: https://conversations.im/ - img: conversations_logo.png - text: Conversations is a Jabber/XMPP client for Android 4.0+ smartphones that has been optimized to provide a unique mobile experience. - -- name: ChatSecure - type: mobile - platform: Mobile (iOS) - encryption: TLS, OMEMO, OTR - domain: chatsecure.org - url: https://chatsecure.org/ - img: chatsecure_logo.png - text: ChatSecure is a free and open source messaging app that features OTR encryption over XMPP. - -- name: Xabber - type: mobile - platform: Mobile (Android) - encryption: TLS, OTR - domain: xabber.com - url: https://www.xabber.com/ - img: xabber_logo.png - text: Xabber is the most popular open-source XMPP client for Android. It supports multiple XEPs, Off-The-Record (OTR) chat encryption and is available in multiple languages. - -- name: Gajim - type: desktop - platform: Linux / Windows - encryption: TLS, OMEMO, OTR - domain: gajim.org - url: https://gajim.org/ - img: gajim_logo.png - text: Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. - -- name: Swift - type: desktop - platform: Linux / OSX / Windows - encryption: TLS - domain: swift.im - url: http://swift.im/ - img: swift_logo.svg - guide: spark - text: An elegant, secure, adaptable and intuitive XMPP Client. Available for free on Windows, Mac OSX and Linux. - -- name: Psi - type: desktop - platform: Linux / OSX / Windows - encryption: TLS - domain: psi-im.org - url: http://psi-im.org/ - img: psi_logo.png - text: Psi is a free instant messaging application designed for the XMPP network. Fast and lightweight, Psi is fully open-source and compatible with Windows, Linux, and Mac OS X. - -- name: Messages - type: desktop - platform: OSX - encryption: TLS - domain: apple.com - url: http://www.apple.com/osx/whats-new/features.html#messages - img: messages_logo.png - text: Messages is an instant messaging software application developed by Apple Inc. for its macOS. - -- name: Spark - type: desktop - platform: Linux / OSX / Windows - encryption: TLS, OTR - domain: igniterealtime.org - url: http://igniterealtime.org/projects/spark/index.jsp - img: spark_logo.png - text: Spark is an Open Source, cross-platform IM client optimized for businesses and organizations. It features built-in support for group chat, telephony integration, and strong security. It also offers a great end-user experience with features like in-line spell checking, group chat room bookmarks, and tabbed conversations. - -#- name: Profanity -# type: server -# platform: Console / Text-Mode -# encryption: TLS, OTR -# domain: profanity.im -# url: http://profanity.im/ -# text: Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi diff --git a/_data/clienttypes.yml b/_data/clienttypes.yml deleted file mode 100644 index e657ed5..0000000 --- a/_data/clienttypes.yml +++ /dev/null @@ -1,11 +0,0 @@ -- name: Mobile - slug: mobile - index: download-1 - -- name: Destop/Laptop - slug: desktop - index: download-2 - -#- name: Server -# slug: server -# index: download-3 diff --git a/_includes/guide-download.html b/_includes/guide-download.html deleted file mode 100644 index 89e7eee..0000000 --- a/_includes/guide-download.html +++ /dev/null @@ -1,29 +0,0 @@ - {% for type in site.data.clienttypes %} -
-

{{ type.name }}

-
-
- {% for client in site.data.clients %} - {% if client.type == type.slug %} -
-
- {% if client.img %} - - {% endif %} -
-

{{ client.name }}

-
    -
  • Platform: {{ client.platform }}
    • -
  • Encryption: {{ client.encryption }}
    • -
  • Website: {{ client.domain }}
    • - {% if client.text %}
  • {{ client.text }}
    • {% endif %} -
-
-
-
- {% endif %} - {% endfor %} -
-
-
- {% endfor %} diff --git a/_includes/guide-register.html b/_includes/guide-register.html index 411d303..1a0a3f4 100644 --- a/_includes/guide-register.html +++ b/_includes/guide-register.html @@ -10,58 +10,11 @@
-
-
-
-

Registration Form

-
-
-
-
- -
- -
- @{hostname} -
-
Your username is required.
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
Your email address is required.
-
-
-
- {captcha} -
-
-
- - -
-
-
-
-
-
-
+ {% include registration-form.html %} +
+ diff --git a/_includes/registration.html b/_includes/registration.html index 5219815..de1b191 100644 --- a/_includes/registration.html +++ b/_includes/registration.html @@ -41,58 +41,6 @@ -
-
-
-
-

Registration Form

-
-
- -
-
- -
- -
- @{{ site.xmpp-url }} -
-
Your username is required.
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
Your email address is required.
-
-
-
- {captcha} -
-
-
- - -
-
-
-
-
-
-
- + + {% include registration-form.html %} + diff --git a/_sass/site.scss b/_sass/site.scss index cdf494d..e97b527 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -1,5 +1,5 @@ $site-color: #9FCF6C; -$site-color: #c3950d; +//$site-color: #c3950d; html { position: relative; @@ -19,6 +19,49 @@ a:hover { text-decoration: underline; } +.btn-primary { + color: #fff; + background-color: darken($site-color, 10%); + border-color: darken($site-color, 15%); +} + +.btn-primary:hover { + color: darken($site-color, 5%); + background-color: darken($site-color, 25%); + border-color: transparent; +} + +.btn-primary:not(:disabled):not(.disabled).active, .btn-primary:not(:disabled):not(.disabled):active, .show>.btn-primary.dropdown-toggle { + color: adjust-color($site-color, $blue: 20); + background-color: adjust-color($site-color, $blue: 10); + border-color: transparent; +} + +.btn-success { + color: #fff; + background-color: darken($site-color, 20%); + border-color: darken($site-color, 25%); +} + +.btn-success:hover { + color: #fff; + background-color: darken($site-color, 10%); + border-color: darken($site-color, 15%);; +} + +.btn-link { + font-weight: 400; + color: darken($site-color, 10%); + background-color: transparent; +} + +.btn-link:hover { + color: darken($site-color, 30%); + text-decoration: underline; + background-color: transparent; + border-color: transparent; +} + .wrapper { margin-bottom: 120px; } @@ -29,7 +72,6 @@ a:hover { #register-window { .card { - border-color: $site-color; margin-left: 25px; min-height: unset; margin-bottom: unset; @@ -55,18 +97,12 @@ a:hover { } } -.btn-success { - color: #fff; - background-color: darken($site-color, 20%); - border-color: darken($site-color, 25%); -} - .alert-warning { color: darken($site-color, 30%); background-color: lighten($site-color, 20%); border-color: lighten($site-color, 15%); a { - color: darken($site-color, 40%); + color: darken($site-color, 45%); } } @@ -94,9 +130,13 @@ a:hover { padding-bottom: 40px; } -#accordion .card { - min-height: unset; - margin-bottom: unset; +#accordion { + .card { + min-height: unset; + margin-bottom: unset; + border-radius: unset; + border: lighten($site-color, 25%); + } } #creating-account { @@ -106,12 +146,12 @@ a:hover { #nav-body { background-color: lighten($site-color, 20%)!important; a { - color: darken($site-color, 20%); + color: darken($site-color, 15%); } } .nav-pills .nav-link.active, .nav-pills .show>.nav-link { - background-color: darken($site-color, 30%); - color: #fff; + color: lighten($site-color, 5%)!important; + background-color: darken($site-color, 10%)!important; } } @@ -124,6 +164,10 @@ a:hover { margin: 30px auto 0; } +.card-header { + background-color: lighten($site-color, 20%); +} + .contact-list { font-size:2em; text-align: center; @@ -139,10 +183,6 @@ td.FAILED { color: white; } -.h1, .h2, .h3, h1, h2, h3 { -/* padding-top: 60px; */ -} - #definitions h2 { padding-top: 60px; } diff --git a/assets/img/clients/messages_logo.png b/assets/img/clients/messages_logo.png deleted file mode 100644 index 7005089..0000000 Binary files a/assets/img/clients/messages_logo.png and /dev/null differ diff --git a/assets/img/clients/psi_logo.png b/assets/img/clients/psi_logo.png deleted file mode 100644 index ce28218..0000000 Binary files a/assets/img/clients/psi_logo.png and /dev/null differ diff --git a/assets/img/clients/spark_logo.png b/assets/img/clients/spark_logo.png deleted file mode 100644 index a5f5e01..0000000 Binary files a/assets/img/clients/spark_logo.png and /dev/null differ diff --git a/assets/img/clients/xabber_logo.png b/assets/img/clients/xabber_logo.png deleted file mode 100644 index e61cfc4..0000000 Binary files a/assets/img/clients/xabber_logo.png and /dev/null differ diff --git a/assets/img/clients/yaxim_logo.png b/assets/img/clients/yaxim_logo.png deleted file mode 100644 index 1c3a58d..0000000 Binary files a/assets/img/clients/yaxim_logo.png and /dev/null differ diff --git a/creating-account.html b/creating-account.html deleted file mode 100644 index ba1e2c8..0000000 --- a/creating-account.html +++ /dev/null @@ -1,76 +0,0 @@ ---- -layout: default -title: Creating a New Account -permalink: /new-user-guide/ ---- - -
-
- - -
-

New User Guide

-

This page is here to help a new user, register an account, download the needed software, and log into the server.

-
-

It uses utility classes for typography and spacing to space content out within the larger container.

-

- Get Started -

-
- - - -
- -
- - - -
- -
-

Overview

-
- -

It may look like there are a bunch of steps to get all setup, but it is really pretty easy and quick to do.

- -

- - -
-

Step 1: Download a Client

-
- - {% include guide-download.html %} - - -
-

Step 2: Choose a XMPP Server and Register an Account

-
- - {% include guide-register.html %} - - -
-

Step 3: Connect your Client to you New Account

-
-
- -
-