diff options
| author | Matt Rude <[email protected]> | 2018-02-05 02:25:45 -0600 |
|---|---|---|
| committer | Matt Rude <[email protected]> | 2018-02-05 02:25:45 -0600 |
| commit | 97d7f0413ea1b068af20a21a6fa1002b286c8ba5 (patch) | |
| tree | a7948b62d793185839a314d0f90094ee2a84f323 | |
| parent | 2c117a6994b3cf814638e2b98cb78203539ec11a (diff) | |
| download | xmpp-site-lite-97d7f0413ea1b068af20a21a6fa1002b286c8ba5.tar.gz xmpp-site-lite-97d7f0413ea1b068af20a21a6fa1002b286c8ba5.tar.bz2 xmpp-site-lite-97d7f0413ea1b068af20a21a6fa1002b286c8ba5.zip | |
Updates
| -rw-r--r-- | _config.yml | 2 | ||||
| -rw-r--r-- | _includes/footer.html | 2 | ||||
| -rw-r--r-- | _includes/header.html | 3 | ||||
| -rw-r--r-- | _includes/menu.html | 9 | ||||
| -rw-r--r-- | _includes/new_user_guide.html | 41 | ||||
| -rw-r--r-- | _includes/nug-connect.html | 0 | ||||
| -rw-r--r-- | _includes/nug-download.html (renamed from _includes/guide-download.html) | 0 | ||||
| -rw-r--r-- | _includes/nug-register.html (renamed from _includes/guide-register.html) | 0 | ||||
| -rw-r--r-- | _sass/site.scss | 15 | ||||
| -rw-r--r-- | creating-account.html | 4 | ||||
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | nug.html | 7 |
12 files changed, 54 insertions, 33 deletions
diff --git a/_config.yml b/_config.yml index 693c924..64ecf46 100644 --- a/_config.yml +++ b/_config.yml @@ -8,6 +8,8 @@ baseurl: "soderparr.com" destination: "/var/www/im.soderparr.com" prosody-version: "0.10" register-web: 2 +password-reset: 1 +user-guide: 0 color: "#9FCF6C" #color: "#c3950d" recaptcha_public_key: "6LdJkzUUAAAAAFj3M0bgNhwzoPuPoiYdlbVaWBf-" diff --git a/_includes/footer.html b/_includes/footer.html index dc6195a..def36ab 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -12,7 +12,9 @@ </footer> </body> <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> +<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> +--> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>{% if page.url == "/files/register_web/register.html" %} <script src="{{ site.url }}/assets/js/validator.js"></script>{% endif %}{% if page.url == "/" and site.register-web >= 1 %} <script src="{{ site.url }}/assets/js/validator.js"></script>{% endif %} diff --git a/_includes/header.html b/_includes/header.html index 7967d26..4510a46 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,7 +9,8 @@ <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}"> <link rel="shortcut icon" href="{{ "/assets/img/favicon.ico" | prepend: site.url }}"/> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> - <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 }}"> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"> + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Encode+Sans+Expanded|Ubuntu"> </head> <body id="main" data-spy="scroll" data-target="#navbar-main"> diff --git a/_includes/menu.html b/_includes/menu.html index 091b95f..a266aaa 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -13,19 +13,16 @@ {% for section in site.data.sections %} <a class="nav-link ml-3 my-1" href="#{{ section.slug }}">{{ section.name }}</a> {% endfor %} - </nav> + </nav>{% if site.user-guide == 1 %} <li class="nav-item"><a class="nav-link" href="#nug-opening">User Guide</a></li> <nav class="nav nav-pills flex-column" style="display:none;"> {% for sectionnug in site.data.nug-sections %} <a class="nav-link ml-3 my-1" href="#{{ sectionnug.slug }}">{{ sectionnug.name }}</a> {% endfor %} - </nav> + </nav>{% endif %} <li class="nav-item"><a class="nav-link" href="#about">About</a></li> </ul>{% endif %} - {% if site.register-web == 2 and page.url != "/" %} - <a href="/register" class="btn btn-success">Register</a> - {% endif %} - {% if site.register-web == 1 %} + {% if site.register-web >= 2 %} <a href="/register" class="btn btn-success">Register</a> {% endif %} </div> diff --git a/_includes/new_user_guide.html b/_includes/new_user_guide.html index 4c3a88e..4b24a33 100644 --- a/_includes/new_user_guide.html +++ b/_includes/new_user_guide.html @@ -1,21 +1,21 @@ <div id="nug" class="container-fluid"> <div class="row justify-content"> - <div id="nug-opening" class="feature-section"> - <div class="container offsetanchor"> - <div class="section-header" id="features-section"> - <center> - <span class="fa fa-user"aria-hidden="true"></span> - <h2>New User Guide</h2> - </center> - </div> - <div id="feature-heading-content"> - <hr class="my-4"> - <blockquote class="blockquote"> - <p class="mb-0"></p> - </blockquote> - </div> + <div id="nug-opening" class="feature-section"> + <div class="container offsetanchor"> + <div class="section-header" id="features-section"> + <center> + <span class="fa fa-user"aria-hidden="true"></span> + <h2>New User Guide</h2> + </center> + </div> + <div id="feature-heading-content"> + <hr class="my-4"> + <blockquote class="blockquote"> + <p class="mb-0"></p> + </blockquote> </div> </div> + </div> <!-- Starting the content section of the page --> <div id="nug-content" class="col-sm-10"> @@ -32,14 +32,7 @@ <div class="feature-{{ section.slug }}"> <div class="row"> <p>{{ section.text }}</p> - {% for feature in site.data.features %} - {% if feature.section == section.slug %} - <div class="{% if section.col == 3 %}col-md-4{% else %}col-sm-6{% endif %}" style="min-height:280px;"> - <h3>{{ feature.name }}</h3> - <p>{{ feature.text }}</p> - </div> - {% endif %} - {% endfor %} + {% include {{ section.file }} %} </div> </div> </div> @@ -53,11 +46,11 @@ <nav id="navbar-main" class="sticky-top navbar navbar-light" style="padding-top:50px;margin-top:-50px;"> <nav id="nug-nav-body" class="nav nav-pills flex-column"> <a id="features-index" href="#nug-opening" style="color:#000;line-height:50px;text-align:center;font-size:1.3rem;"><b>User Guide</b></a> - {% for section in site.data.nug-sections %} <nav class="nav nav-pills flex-column nav-item align-middle"> + {% for section in site.data.nug-sections %} <a class="nav-link ml-3 my-1" href="#{{ section.slug }}"><span id="nug-index-span">{{ section.name }}</span></a> - </nav> {% endfor %} + </nav> </nav> </nav> </div> diff --git a/_includes/nug-connect.html b/_includes/nug-connect.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/_includes/nug-connect.html diff --git a/_includes/guide-download.html b/_includes/nug-download.html index 89e7eee..89e7eee 100644 --- a/_includes/guide-download.html +++ b/_includes/nug-download.html diff --git a/_includes/guide-register.html b/_includes/nug-register.html index 9a53aa2..9a53aa2 100644 --- a/_includes/guide-register.html +++ b/_includes/nug-register.html diff --git a/_sass/site.scss b/_sass/site.scss index 95b18c5..07100a9 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -26,9 +26,14 @@ html { body { position: relative; + font-family: 'Encode Sans Expanded', sans-serif; } +h1, h2, h3, h4, h5, h6 { + font-family: 'Ubuntu', sans-serif; +} + // Links a { @@ -216,6 +221,7 @@ pre { #nug-opening { min-height:400px; width: 100%; + padding-top: 80px; span { font-size: 100px; } @@ -229,6 +235,15 @@ pre { margin-right: -20%; padding-right: 20%; } + .card { + background-color: rgba(0,0,0,0.2); + a { + color: #fff; + } + } + .list-group-item { + background-color: unset; + } } #nug-index { diff --git a/creating-account.html b/creating-account.html index c63dc26..6863b90 100644 --- a/creating-account.html +++ b/creating-account.html @@ -65,14 +65,14 @@ permalink: /new-user-guide/ <center><h1>Step 1: Download a Client</h1></center> </div> - {% include guide-download.html %} + {% include nug-download.html %} <!-- This is the Register an Account Section --> <div id="register" class="section-header-nug"> <center><h1>Step 2: Choose a Server and Register an Account</h1></center> </div> - {% include guide-register.html %} + {% include nug-register.html %} <!-- This is the Connect your Client Section --> <div id="connect" class="section-header-nug"> @@ -155,12 +155,16 @@ permalink: / </div> <!-- Closing the row justify-content clases --> </div> <!-- Closing the ID creating-account and the main container class --> +{% if site.user-guide == 1 %} + <!-- New User Guide Section --> {% include new_user_guide.html %} <!-- End of New User Guide Section --> +{% endif %} + <!-- About Section --> <div id="about" class="index-section" style="background-color:#eee;padding-bottom:80px;"> diff --git a/nug.html b/nug.html new file mode 100644 index 0000000..e886c0c --- /dev/null +++ b/nug.html @@ -0,0 +1,7 @@ +--- +layout: welcome +title: New User Guide +permalink: /nug/ +--- + +{% include new_user_guide.html %} |