diff --git a/pages/02.tutorials/02.Cloud/01.Introduction/docs.en.md b/pages/02.tutorials/02.Cloud/01.Introduction/docs.en.md index cd040a79..57403af4 100755 --- a/pages/02.tutorials/02.Cloud/01.Introduction/docs.en.md +++ b/pages/02.tutorials/02.Cloud/01.Introduction/docs.en.md @@ -11,7 +11,7 @@ page-toc: active: true --- -## The User Interface (UI) +# The User Interface (UI)
@@ -59,7 +59,7 @@ The levels you can choose are: !! ![](en/note.png) -!! **NOTE!** **You should pay extra attention when filling up this information *(which is optional)* and decide how much information about yourself you want to share and reveal to others.** +!! **NOTE!** You should pay extra attention when filling up this information *(which is optional)* and decide how much information about yourself you want to share and reveal to others. ## Other information and settings Below the profile picture you can see: @@ -119,7 +119,7 @@ You can add as many devices as you like. It is recommended to give each device a Here you can decide whether or not an administrator will be able to recover your files in case you loose your password. This option is disabled by default as it enables admins of Disroot to decrypt and view your files. !! ![](en/note.png) -!! **NOTE!** **Enabling this option after your password was lost will not recover your files!** You need to make this decision beforehand. **We strongly encourage you to never loose your password in the first place and keep it stored safe.**
This is the best way to keep your files and your account safe. We really don't want to have access to it. +!! **NOTE!** Enabling this option after your password was lost will not recover your files!
You must make this decision beforehand. We strongly encourage you keep your password stored in a safe place.
This is the best way to keep your files and your account safe. We really don't want to have access to it. ![](en/basic_encryption.png) diff --git a/themes/grav-theme-howto/css/defaults.css b/themes/grav-theme-howto/css/defaults.css index dc3ab135..87713c1b 100644 --- a/themes/grav-theme-howto/css/defaults.css +++ b/themes/grav-theme-howto/css/defaults.css @@ -36,10 +36,16 @@ body { margin: 0 auto; } -.narrow{ - max-width: 60%; - margin: 0 auto +.narrow { + max-width: 70%; + margin: 0 auto; } + +.centered { + float: none; + margin: 0 auto; +} + /* fixed width for IE8 */ .ie .row { width: 1000px ; } diff --git a/themes/grav-theme-howto/css/media-queries.css b/themes/grav-theme-howto/css/media-queries.css index ad1bc926..a6c7a6ef 100644 --- a/themes/grav-theme-howto/css/media-queries.css +++ b/themes/grav-theme-howto/css/media-queries.css @@ -4,32 +4,18 @@ @media (max-width: 1200px) and (min-width:901px) { - .hive { - width: 90%; - } - #hexGrid{ - -o-transform: scale(1.26,1.26); - -ms-transform: scale(1.26,1.26); - -sand-transform: rotate(1.26,1.26); - -webkit-transform: scale(1.26,1.26); - transform: scale(0.8,0.8); - padding-bottom: 5.5%; - font-size: 13px; - } -/* .hex:nth-child(3){ /* 3nd hexagon */ -/* top: 130px; - left: 110px; - }*/ -/* .hex:nth-child(6){ /* 6th hexagon */ -/* top: -115px; - left: 330px; - }*/ } @media (max-width: 1040px) { body { font-size: 85%; } + + /* sidebar */ + + #sidebar { + display: none; + } } @media only screen and (max-width: 767px) { @@ -37,7 +23,7 @@ .narrow{ max-width: 100%; margin: 0 auto -} + } /* mobile navigation ------------------------------------*/ @@ -118,43 +104,15 @@ clear: both; } - /* sidebar */ - - #sidebar { - display: none; - } } @media (max-width: 900px) and (min-width:601px) { - #hexGrid{ - padding-bottom: 7.4%; - font-size: 14px; - } - .hex:nth-child(3){ - top: 130px; - left:0px; - } - .hex:nth-child(6){ - top: -115px; - left: 330px; - } } @media (max-width: 600px) { - #hexGrid{ - padding-bottom: 11.2%; - font-size: 12px; - } - .hex { - width: 50%; - } - .hex:nth-child(3n+3){ - margin-left:25%; - } + } @media (max-width: 400px) { - #hexGrid { - font-size: 8px; - } +} diff --git a/themes/grav-theme-howto/css/style.css b/themes/grav-theme-howto/css/style.css index 5313eaf5..a64d21d7 100644 --- a/themes/grav-theme-howto/css/style.css +++ b/themes/grav-theme-howto/css/style.css @@ -98,6 +98,17 @@ a:hover { .content img { display: block; margin: 2% auto; + max-width: 80%; +} + +.notices.red { + background-color: #efeeee; + color: var(--primary-color); + border-color: var(--alternative-color); +} + +.notices { + font-size: 90%; } /* Content Styling */ @@ -232,8 +243,9 @@ a:hover { transform: skew(0deg, 1deg) translateY(-10px); } -.title h5 { +.topbar { color: var(--alternative-color); + margin: 10px 0; } .search { @@ -283,24 +295,33 @@ a:hover { filter: grayscale(30%); } +/* topbar */ + + + /* sidebar */ #sidebar { max-width: 250px; - top: 150px; + padding-top: 10px; + margin-left: 20px; + margin-bottom: 10px; } .page-toc { max-width: 250px; - padding: 4px; + padding: 10px; margin-left: 0; margin-right: 0; margin-bottom: 1rem; - margin-top: 10px; + margin-top: 5rem; font-size: 0.7rem; overflow: hidden; border: none; - border-radius: 10px; + border-radius: 0px; + background: #efeeee; +} +.page-toc:hover { box-shadow: 10px 10px 38px 0px rgba(0, 0, 0, 0.25); } .toc-toggle { diff --git a/themes/grav-theme-howto/templates/docs.html.twig b/themes/grav-theme-howto/templates/docs.html.twig index dcf3c841..e6520f75 100644 --- a/themes/grav-theme-howto/templates/docs.html.twig +++ b/themes/grav-theme-howto/templates/docs.html.twig @@ -7,18 +7,6 @@ {% set progress = page.collection({'items':{'@taxonomy':{'category': 'docs'}},'order': {'by': 'default', 'dir': 'asc'}}) %} {% endif %} -{% block navigation %} - -{% endblock %} - {% set showsidebar = false %} {% if (grav.theme.config.params.sidebar.show.categories) or (grav.theme.config.params.sidebar.show.popular) or (grav.theme.config.params.sidebar.show.latest) %} @@ -26,12 +14,15 @@ {% endif %} {% block content %} +
{% block sidebar %} -
+ {% endblock %} diff --git a/themes/grav-theme-howto/templates/partials/base.html.twig b/themes/grav-theme-howto/templates/partials/base.html.twig index 57853300..4e3e0c0d 100644 --- a/themes/grav-theme-howto/templates/partials/base.html.twig +++ b/themes/grav-theme-howto/templates/partials/base.html.twig @@ -57,11 +57,7 @@ {% endblock %} {% block footer %} -
-
-

Grav was with by RocketTheme.

-
-
+ {% include 'partials/footer.html.twig' %} {% endblock %} {% block bottom %} diff --git a/themes/grav-theme-howto/templates/partials/footer.html.twig b/themes/grav-theme-howto/templates/partials/footer.html.twig new file mode 100644 index 00000000..49557695 --- /dev/null +++ b/themes/grav-theme-howto/templates/partials/footer.html.twig @@ -0,0 +1,21 @@ +
+
+ +
+

Grav was with by RocketTheme.

+
+
diff --git a/themes/grav-theme-howto/templates/partials/page.html.twig b/themes/grav-theme-howto/templates/partials/page.html.twig index e4654963..3c51ff25 100644 --- a/themes/grav-theme-howto/templates/partials/page.html.twig +++ b/themes/grav-theme-howto/templates/partials/page.html.twig @@ -1,15 +1,15 @@ {% block body %}
-
-
- {{ page.title|e }} -
+
+ {% block topbar %} + {% include 'partials/topbar.html.twig' %} + {% endblock %}
{% include 'partials/docmeta.html.twig' %} -
+
{{ page.content|raw }}

diff --git a/themes/grav-theme-howto/templates/partials/sidebar.html.twig b/themes/grav-theme-howto/templates/partials/sidebar.html.twig index a0ea8db6..ca45099d 100644 --- a/themes/grav-theme-howto/templates/partials/sidebar.html.twig +++ b/themes/grav-theme-howto/templates/partials/sidebar.html.twig @@ -1,3 +1,10 @@ + +{% if not progress.isLast(page.path) %} + {{ progress.prevSibling(page.path).title }} +{% else %} + +{% endif %} + {% if config.get('plugins.page-toc.active') or attribute(page.header, 'page-toc').active %}
{% set table_of_contents = toc(page.content) %} @@ -8,108 +15,3 @@ {% endif %}
{% endif %} - - -{% if config.plugins.relatedpages.enabled and related_pages|length > 0 %} -

Related Posts

- {% include 'partials/relatedpages.html.twig' %} -{% endif %} - - -{% set homeroute = '/home' %} -{% if grav.theme.config.params.articleroot is defined %} - {% set homeroute = grav.theme.config.params.articleroot %} -{% endif %} -{% if grav.theme.config.params.articles.root is defined %} - {% set homeroute = grav.theme.config.params.articles.root %} -{% endif %} - -{% set options = { items: {'@page.descendants': homeroute}, 'order': {'by': 'date', 'dir': 'desc'}} %} -{% set my_collection = page.collection(options) %} - -{% set catlist = taxonomy.taxonomy["category"]|keys %} -{% set blist = [] %} -{% if grav.theme.config.params.articles.blacklist is defined %} - {% set blist = grav.theme.config.params.articles.blacklist %} - {% set tmplst = [] %} - {% for cat in catlist %} - {% if cat not in blist %} - {% set tmplst = tmplst|merge([cat]) %} - {% endif %} - {% endfor %} - {% set catlist = tmplst %} -{% endif %} - -{% if grav.theme.config.params.sidebar.show.categories %} -
-

{{ 'CATEGORIES'|t }}

-
    - {% for cat in catlist|sort %} - {# Check to see if a dedicated category page exists #} - {% set slug = cat|hyphenize|url_encode %} - {% set p = page.find('/categories/'~slug) %} - {% if p == null %} -
  • {{ cat }}
    • - {% else %} -
  • {{ cat }}
    • - {% endif %} - {% endfor %} -
-
-{% endif %} - -{% set maxcount = 5 %} -{% if grav.theme.config.params.sidebar.maxentries is defined %} - {% set maxcount = grav.theme.config.params.sidebar.maxentries %} -{% endif %} - -{% if grav.theme.config.params.sidebar.show.popular %} -
- {% set counts = viewcounts|sort|reverse %} - {% set popular = [] %} - {% for route,views in counts %} - {% if route starts with homeroute %} - {% set thispage = page.find(route) %} - {% if thispage is not null %} - {% set popular = popular|merge([thispage]) %} - {% endif %} - {% endif %} - {% endfor %} - {% set tmplst = [] %} - {% for page in popular %} - {% set blisted = false %} - {% for bcat in blist %} - {% if bcat in page.taxonomy["category"] %} - {% set blisted = true %} - {% endif %} - {% endfor %} - {% if not blisted %} - {% set tmplst = tmplst|merge([page]) %} - {% endif %} - {% endfor %} - {% set popular = tmplst %} -

{{ 'POPULAR_ARTICLES'|t }}

- {% include 'partials/topiclist.html.twig' with {'articles': popular, 'maxcount': maxcount} %} -
-{% endif %} - -{% if grav.theme.config.params.sidebar.show.latest %} -
-

{{ 'LATEST_ARTICLES'|t }}

- {% set tmplst = [] %} - {% for page in my_collection %} - {% set blisted = false %} - {% for bcat in blist %} - {% if bcat in page.taxonomy["category"] or (page.header.published is defined and not page.header.published) %} - {# Setting this to blacklisted when the category is in the blacklist OR if the page isn't yet published #} - {% set blisted = true %} - {% endif %} - {% endfor %} - {% if not blisted %} - {% set tmplst = tmplst|merge([page]) %} - {% endif %} - {% endfor %} - {% set articles = tmplst|slice(0,maxcount) %} - {% include 'partials/topiclist.html.twig' with {'articles': articles, 'maxcount': maxcount} %} -
-{% endif %} diff --git a/themes/grav-theme-howto/templates/partials/sidebar.html.twig.bak b/themes/grav-theme-howto/templates/partials/sidebar.html.twig.bak new file mode 100644 index 00000000..26139785 --- /dev/null +++ b/themes/grav-theme-howto/templates/partials/sidebar.html.twig.bak @@ -0,0 +1,131 @@ + + +
+ +{% if config.get('plugins.page-toc.active') or attribute(page.header, 'page-toc').active %} +
+ {% set table_of_contents = toc(page.content) %} + {% if table_of_contents is not empty %} + +
Table of Content
+ {{ table_of_contents|raw }} + {% endif %} +
+{% endif %} + +{% if config.plugins.relatedpages.enabled and related_pages|length > 0 %} +

Related Posts

+ {% include 'partials/relatedpages.html.twig' %} +{% endif %} + +{% set homeroute = '/home' %} +{% if grav.theme.config.params.articleroot is defined %} + {% set homeroute = grav.theme.config.params.articleroot %} +{% endif %} +{% if grav.theme.config.params.articles.root is defined %} + {% set homeroute = grav.theme.config.params.articles.root %} +{% endif %} + +{% set options = { items: {'@page.descendants': homeroute}, 'order': {'by': 'date', 'dir': 'desc'}} %} +{% set my_collection = page.collection(options) %} + +{% set catlist = taxonomy.taxonomy["category"]|keys %} +{% set blist = [] %} +{% if grav.theme.config.params.articles.blacklist is defined %} + {% set blist = grav.theme.config.params.articles.blacklist %} + {% set tmplst = [] %} + {% for cat in catlist %} + {% if cat not in blist %} + {% set tmplst = tmplst|merge([cat]) %} + {% endif %} + {% endfor %} + {% set catlist = tmplst %} +{% endif %} + +{% if grav.theme.config.params.sidebar.show.categories %} +
+

{{ 'CATEGORIES'|t }}

+
    + {% for cat in catlist|sort %} + {# Check to see if a dedicated category page exists #} + {% set slug = cat|hyphenize|url_encode %} + {% set p = page.find('/categories/'~slug) %} + {% if p == null %} +
  • {{ cat }}
    • + {% else %} +
  • {{ cat }}
    • + {% endif %} + {% endfor %} +
+
+{% endif %} + +{% set maxcount = 5 %} +{% if grav.theme.config.params.sidebar.maxentries is defined %} + {% set maxcount = grav.theme.config.params.sidebar.maxentries %} +{% endif %} + +{% if grav.theme.config.params.sidebar.show.popular %} +
+ {% set counts = viewcounts|sort|reverse %} + {% set popular = [] %} + {% for route,views in counts %} + {% if route starts with homeroute %} + {% set thispage = page.find(route) %} + {% if thispage is not null %} + {% set popular = popular|merge([thispage]) %} + {% endif %} + {% endif %} + {% endfor %} + {% set tmplst = [] %} + {% for page in popular %} + {% set blisted = false %} + {% for bcat in blist %} + {% if bcat in page.taxonomy["category"] %} + {% set blisted = true %} + {% endif %} + {% endfor %} + {% if not blisted %} + {% set tmplst = tmplst|merge([page]) %} + {% endif %} + {% endfor %} + {% set popular = tmplst %} +

{{ 'POPULAR_ARTICLES'|t }}

+ {% include 'partials/topiclist.html.twig' with {'articles': popular, 'maxcount': maxcount} %} +
+{% endif %} + +{% if grav.theme.config.params.sidebar.show.latest %} +
+

{{ 'LATEST_ARTICLES'|t }}

+ {% set tmplst = [] %} + {% for page in my_collection %} + {% set blisted = false %} + {% for bcat in blist %} + {% if bcat in page.taxonomy["category"] or (page.header.published is defined and not page.header.published) %} + {# Setting this to blacklisted when the category is in the blacklist OR if the page isn't yet published #} + {% set blisted = true %} + {% endif %} + {% endfor %} + {% if not blisted %} + {% set tmplst = tmplst|merge([page]) %} + {% endif %} + {% endfor %} + {% set articles = tmplst|slice(0,maxcount) %} + {% include 'partials/topiclist.html.twig' with {'articles': articles, 'maxcount': maxcount} %} +
+{% endif %} diff --git a/themes/grav-theme-howto/templates/partials/topbar.html.twig b/themes/grav-theme-howto/templates/partials/topbar.html.twig new file mode 100644 index 00000000..c9f07b7a --- /dev/null +++ b/themes/grav-theme-howto/templates/partials/topbar.html.twig @@ -0,0 +1,12 @@ +
+ {% if github_link_position == 'top' %} + + {% endif %} + + {% if config.plugins.breadcrumbs.enabled %} + {% include 'partials/breadcrumbs.html.twig' %} + {% endif %} + +