diff options
-rw-r--r-- | _config.yml | 2 | ||||
-rw-r--r-- | _includes/about.html | 2 | ||||
-rw-r--r-- | _includes/header.html | 2 | ||||
-rw-r--r-- | assets/css/main.css | 28 | ||||
-rw-r--r-- | assets/css/main.css-old | 273 | ||||
-rw-r--r-- | index.html | 53 | ||||
-rw-r--r-- | register_web/success.html | 4 |
7 files changed, 38 insertions, 326 deletions
diff --git a/_config.yml b/_config.yml index e527e01..a3ac6b3 100644 --- a/_config.yml +++ b/_config.yml @@ -70,7 +70,7 @@ exclude: plugins: - jekyll-sitemap -- jekyll-minifier +#- jekyll-minifier jekyll-minifier: exclude: 'robots.txt, contact.txt, contact-ecc.txt' diff --git a/_includes/about.html b/_includes/about.html index 5446a71..7fa4bde 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -5,7 +5,7 @@ <h2>Contact Information</h2> <p>This site is maintained by Matt Rude (<a href="https://keyserver.mattrude.com/d/0xc4909ee495b0761f">0xc4909ee495b0761f</a>). If you would like to report any problems or bugs, please send a email or XMPP messsage to the email address listed in one of my public keys.</p> <p>You may also see my profile on <a href="https://keybase.io/mattrude">keybase.io/mattrude</a>.</p> - <ul style="font-size:2em;margin:0 auto;"> + <ul class="contact-list"> <li class="list-inline"><b><a href="mailto:[email protected]" title="Email Address"><i class="fa fa-envelope"></i></a></b></li> <li class="list-inline"><b><a href="https://www.twitter.com/mdrude" title="Twitter Profile Page"><i class="fa fa-twitter-square"></i></a></b></li> <li class="list-inline"><b><a href="https://www.facebook.com/mattrude" title="Facebook Profile Page"><i class="fa fa-facebook-official"></i></a></b></li> diff --git a/_includes/header.html b/_includes/header.html index ac792ef..7967d26 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -12,4 +12,4 @@ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.url }}"> </head> -<body id="navbar-main" data-spy="scroll" data-target="#navbar-main"> +<body id="main" data-spy="scroll" data-target="#navbar-main"> diff --git a/assets/css/main.css b/assets/css/main.css index 632e580..72435db 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -14,22 +14,36 @@ body { width: 100%; background-color: #f5f5f5; } -.section-headder { - padding: 60px 0 10px; +.index-section { + padding: 100px 0 40px; +} + +.index-section-last { + padding: 100px 0 70px; } .list-inline { display: inline; } +.site-title { + text-align: right; +} + .site-title h1 { font-size: 4em; } -#contact-list { +.feature-section { + padding-bottom: 40px; +} + +.contact-list { font-size:2em; text-align: center; + padding: unset; } + td.PASSED { background-color: green; color: white; @@ -52,8 +66,12 @@ td.FAILED { color: #fff; } -@media (max-width: 968px) { +@media (max-width: 768px) { .pull-right, .pull-left { - text-align: center; + text-align: center; } + .site-title { + display: none; + } + } diff --git a/assets/css/main.css-old b/assets/css/main.css-old deleted file mode 100644 index d7ca4ef..0000000 --- a/assets/css/main.css-old +++ /dev/null @@ -1,273 +0,0 @@ -body { - color: black; - background: #ffffff; - font-family: "lucida grande", Calibri, "segoe UI", "lucida sans unicode", "Droid Sans", "DejaVu Sans", "bitstream vera sans", verdana, arial, helvetica, sans-serif; - margin: 0; -} - -#content { - color: black; - background: #ffffff; - margin-top: 0.5em; - margin-bottom: 0.5em; - margin-right: auto; - margin-left: auto; - padding: 0 1em; - line-height: 1.3em; - text-align: left; - max-width: 800px; - min-width: 240px; - position: relative; } - -#header h4 { - -webkit-margin-before: -0.8em; - -webkit-margin-after: 1.0em; } - -#title h1 { - text-align: left; - margin-bottom: 8px; - padding: 2px; - padding-top: 10px; - border-bottom: 1px solid #CCC; - line-height: 1.1em; } -#title i { - color: #A9A9A9; - font-size: 0.8em; } - -h2 { - font-weight: normal; - margin-bottom: 8px; - padding: 2px; - padding-top: 10px; - border-bottom: 1px solid #CCC; } - h2 small { - font-size: 0.8em; - color: #777; } - -h3 small { - font-size: 0.8em; - color: #777; } - -td { - padding: 5px; } - td.PASSED { - background-color: green; - color: white; } - td.FAILED { - background-color: red; - color: white; } - -a { - text-decoration: none; - color: #0078e7; } - -a, a:visited { - color: #0078e7; - background: inherit; } - -a:hover { - text-decoration: underline; - color: #0078e7; } - -#footer { - font-size: 80%; - border-top: 1px solid #CCC; } - -.footer-left { - text-align: left; - float: left; - width: 49%; } - -.footer-right { - display: block; - text-align: right; - float: right; - width: 49%; } - -img { - border-width: 0px; } - -.center { - text-align: center; } - -.big { - font-size: larger; } - -.small { - font-size: small; } - -.quote { - max-width: 75%; - text-align: center; } - -div.code, p code { - font-family: Monaco, Consolas, 'Lucida Console', "Droid Sans Mono", "DejaVu Sans Mono", Courier, monospace; - font-size: 14px; - background-color: #eee; - border: 1px solid #999; - padding: 0 2px; - margin: 0 2px; } - -div#sksoutput pre, div#sksoutput code { - font-size: 12px; } - -pre, pre.code { - font-family: Monaco, Consolas, 'Lucida Console', "Droid Sans Mono", "DejaVu Sans Mono", Courier, monospace; - font-size: 14px; - width: auto; - overflow: auto; - background-color: #eee; - color: inherit; - border: 1px solid #999; - line-height: 1.3em; - padding: 5px; } - -pre.code { - border: 0; } - -fieldset { - border: 1px dotted #bedce7; - padding: 10px 15px; - color: inherit; } - -h1 { - line-height: 1em; } - h1 a { - text-decoration: none; } - h1 small { - color: #777; - font-size: 0.7em; } - -h4 small { - line-height: 1; - color: #777; } - -table { - background: #fff; - margin-bottom: 1.25rem; - border: solid 1px #ddd; - table-layout: auto; } - table thead { - background: #f5f5f5; } - table tr:nth-of-type(even) { - background: #F9F9F9; } - -#form { - display: table; } - #form.extract { - max-width: 430px; - margin: 0 auto; } - #form.extract .options { - border: 1px solid #CCC; - display: inline-block; - float: left; - min-height: 120px; - padding: 5px; - margin: 5px 0; } - #form.extract .key { - width: 418px; - border: 1px solid #CCC; - padding: 5px; } - #form.extract .key .extract-field { - float: right; - width: 300px; } - #form.extract .key .extract-field-label { - text-align: right; - width: 100px; } - #form.extract .checkboxs input { - margin: 0; } - #form.extract .radio { - margin-left: 5px; } - #form.extract label { - margin-bottom: 3px; - display: inline-block; } - #form.extract label.checkbox, #form.extract label.key { - width: 165px; - margin: 5px; } - #form.extract label.checkbox, #form.extract label input { - text-align: right; } - #form.extract label.extract-field-label.fingerprint, #form.extract label.extract-field-label.hash, #form.extract label.extract-field-label.exact, #form.extract label.extract-field-label.mr { - text-align: right; - width: 165px; - margin-right: 5px; } - #form.extract div.buttons { - float: right; - padding-right: 10px; } - #form.submit { - width: 550px; - margin: 0 auto; } - #form.submit textarea { - margin-bottom: 5px; - width: 100%; - padding: 0px; } - #form.submit input { - float: right; - margin-right: 5px; } - -#menu { - border-bottom: 1px solid #CCC; - border-top: 1px solid #CCC; - font-size: 0.9em; - margin: 5px 0 20px 0; - padding-left: 5px; - line-height: 1.5em; } - #menu a { - font-weight: bold; } - -#menu-sub { - font-size: 0.8em; - margin: -20px 0 20px 0; - padding: 5px 10px; - line-height: 1em; - background-color: #eee; - border: 1px solid #ccc; - border-top: 0; } - -#news ul { - -webkit-padding-start: 0px; - border-top: 1px solid #CCC; } - #news ul p { - margin-left: 2em; - font-style: italic; } -#news li { - list-style-type: none; } -#news h2 { - padding: 0px; - border-bottom: none; } - -@media (max-width: 600px) { - #form.submit { - width: 99%; } - - .footer-left .small-hide { - display: none; } } -@media (max-width: 500px) { - #content { - max-width: 100%; } - - #form { - width: 100%; } - #form.extract { - width: 100%; } - #form.extract .key { - float: none; - display: table; - width: 95%; } - #form.extract .key .extract-field { - float: none; - width: 90%; - padding: 0 5px; } - #form.extract .key .extract-field-label { - text-align: left; } - #form.extract .checkboxs input { - float: left; } - #form.extract .options { - width: 95%; } - #form.extract .radio { - margin-left: 0px; } - #form.extract label.extract-field-label.fingerprint, #form.extract label.extract-field-label.hash, #form.extract label.extract-field-label.exact, #form.extract label.extract-field-label.mr { - text-align: left; - margin-left: 5px; - margin-right: 0px; } - #form.submit { - width: 99%; } } @@ -6,12 +6,12 @@ permalink: / <div class="jumbotron" style="padding-top:90px;"> - <div class="container"> + <div class="container text-center"> <div class="row"> - <div class="col-md-4 col-sm-4"> + <div class="col-md-4"> <img src="{{ site.url }}/assets/img/xmpp_logo.png" width="233px;" height="240px;"> </div> - <div class="col-md-8 site-title" style="text-align:right;"> + <div class="col-md-8 float-md-right site-title"> <h1>XMPP Communication Service</h1> </div> </div> @@ -20,7 +20,7 @@ permalink: / <div class="container offsetanchor" id="opening"> <div class="row"> - <div class="col-md-7 col-sm-6"> + <div class="col-md-7"> <p>This is the <strong>{{ site.name }}</strong> communication service website. This site is here to provide basic information on using this service. A <a href="{{ site.url }}/help/definitions/#xmpp-server">XMPP</a> service provides messaging ability via a local client. XMPP sites like this service are @@ -37,7 +37,7 @@ permalink: / or <a href="https://chatsecure.org/">ChatSecure</a> for mobile.</p> </div> - <div class="col-md-5 col-sm-6" style="margin:auto;"> + <div class="col-md-5" style="margin:auto;"> <h1>Connecting...</h1> <ul> <li>Port: <b>5222</b></li> @@ -53,7 +53,7 @@ permalink: / </div> {% if site.register-web == 2 %} -<div id="register"> +<div id="register" class="index-section"> <div id="feature-register" style="background-color:#eee;padding:60px 0;"> <div id="feature-register" class="container offsetanchor"> {% include registration.html %} @@ -63,10 +63,9 @@ permalink: / {% endif %} {% for section in site.data.sections %} -<div id="{{ section.slug }}"> - <div id="feature-{{ section.slug }}" style="background-color:#{{ section.color }};"> + <div id="{{ section.slug }}" class="index-section feature-section" style="background-color:#{{ section.color }};"> <div class="container offsetanchor"> - <div class="section-headder" id="{{ section.slug }}"><center> + <div class="section-headder" id="feature-{{ section.slug }}"><center> <span class="{{ section.glyph }}" style="font-size:100px;" aria-hidden="true"></span> <h2>{{ section.name }}</h2> </center></div> @@ -86,42 +85,14 @@ permalink: / </div> </div> </div> -</div> {% endfor %} -<div id="about"> - <div id="feature-about" style="background-color:#eee;"> - {% include about.html %} - </div> +<div id="about" class="index-section" style="background-color:#eee;"> + {% include about.html %} </div> -<div class="container offsetanchor" id="security"> - <div class="section-headder" id="{{ section.slug }}"><center> - <i class="fa fa-lock" style="font-size:60px;" aria-hidden="true"></i> - <h2>Privacy & Security</h2> - </center></div> - <div class="row"> - <div class="col-md-6" style="min-height:280px;"> - <h2>Security</h2> - <ul> - <li>SSL/TLS encryption is <a href="https://github.com/stpeter/manifesto/blob/master/manifesto.txt">required</a> - between clients and servers (C2S) and server to server (S2S) connections</li> - <li>The backend is configured to store hashed and salted authentication data</li> - <li>Use <a href="https://conversations.im/omemo/">OMEMO</a> or - <a href="{{ site.url }}/help/definitions/#otr">Off-the-Record (OTR)</a> - in your chat client to have fully encrypted chats</li> - </ul> - </div> - <div class="col-md-6" style="min-height:280px;"> - <h2 id="policies">Policies</h2> - <p>No more information is collected and stored than what is absolutely necessary. - This includes rosters, vCards, offline messages, etc.</p> - <p>Spam and abuse including advertisements of any kind will not be tolerated on - this network. For spam or abuse please contact us with the full details.</p> - <p>Please see the <a href="{{ site.url }}/privacy-policy/">Privacy Policy</a> for - a more detailed explanation.</p> - </div> - </div> +<div id="security" class="index-section-last"> + {% include security.html %} </div> diff --git a/register_web/success.html b/register_web/success.html index ead1c69..a236988 100644 --- a/register_web/success.html +++ b/register_web/success.html @@ -40,10 +40,6 @@ permalink: /files/register_web/success.html <center><h4>Gajim</h4></center> </div> </div> - <div class="alert alert-warning" style="margin:0 auto;" role="alert"> - Please read the sites <a href="{{ site.url }}/privacy-policy/" title="Privacy Policy">privacy policy</a> - before registering a new account. - </div> <hr style="color:grey"> </div> </div> |