diff --git a/.drone.yml b/.drone.yml index 41bce2d7e..a8dcca2e3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,5 @@ pipeline: documentation: - image: nextcloudci/documentation:1.0.11 + image: nextcloudci/documentation:documentation-4 commands: - make all diff --git a/.gitignore b/.gitignore index 2803b4982..18eba7e60 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Generated Files */_build/* +conf.pyc # Meta Data .DS_Store @@ -15,4 +16,4 @@ # Exclude NetBeans project /nbproject/* *.db -*.snag \ No newline at end of file +*.snag diff --git a/_shared_assets/themes/nextcloud_com/layout.html b/_shared_assets/themes/nextcloud_com/layout.html index c999603f1..e57f01e50 100644 --- a/_shared_assets/themes/nextcloud_com/layout.html +++ b/_shared_assets/themes/nextcloud_com/layout.html @@ -144,10 +144,16 @@
-
+

{{ project|e }}

+
+ Versions: + {%- for v in doc_versions %} + {{v}} + {%- endfor %} +
-
+
{% if theme_show_search %}
diff --git a/_shared_assets/themes/nextcloud_com/relations.html b/_shared_assets/themes/nextcloud_com/relations.html index f7cbd2af9..b4c4fe091 100644 --- a/_shared_assets/themes/nextcloud_com/relations.html +++ b/_shared_assets/themes/nextcloud_com/relations.html @@ -6,7 +6,7 @@ {%- endif %} @@ -14,7 +14,7 @@ {%- endif %} diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css index fc5434a98..81e9e72d9 100644 --- a/_shared_assets/themes/nextcloud_com/static/styles.css +++ b/_shared_assets/themes/nextcloud_com/static/styles.css @@ -3,8 +3,8 @@ /* enable to reveal boxes everywhere */ /** { - border-style: solid; - border-color: red; + border-style: solid; + border-color: red; }*/ @font-face { @@ -55,6 +55,7 @@ body { h1, h2, h3 { font-weight: 300; + margin-top: 40px !important; } h1 { font-size: 45px; @@ -77,13 +78,13 @@ img { } .btn-default { - /* background: rgba(240,240,240,.9); */ - /* border: 1px solid rgba(210,210,210,.9); */ + /* background: rgba(240,240,240,.9); */ + /* border: 1px solid rgba(210,210,210,.9); */ } .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open > .dropdown-toggle.btn-default { - /* background: white; */ - /* border: 1px solid rgba(240,240,240,.9); */ + /* background: white; */ + /* border: 1px solid rgba(240,240,240,.9); */ } .btn-primary { @@ -93,9 +94,9 @@ img { } .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { - /* background: #428BCA; */ - /* border: 1px solid #1D2D44; */ - /* color: white; */ + /* background: #428BCA; */ + /* border: 1px solid #1D2D44; */ + /* color: white; */ } /* button a {color: #1d2d44} */ @@ -974,7 +975,7 @@ img.desaturate { background-size: cover; -o-background-size: cover; /* border: 0px; */ - /* min-height: 450px; background-position: 35% 40%; */ + /* min-height: 450px; background-position: 35% 40%; */ position: relative; margin-left: 0px !important; margin-right: 0px !important; @@ -982,7 +983,7 @@ img.desaturate { } /*.ft-img-center { - margin: 0 auto; + margin: 0 auto; }*/ .ft-sharing { @@ -1019,7 +1020,7 @@ img.desaturate { @media (max-width: 767px) { .ft-everywhere-img { - /* height: auto; */ + /* height: auto; */ width: 20%; right: 5%; } @@ -1045,12 +1046,12 @@ img.desaturate { } /*.ft-img-overlay a { - display: table; + display: table; }*/ /*.ft-img-overlay img { - width: 100%; - height: 100%; + width: 100%; + height: 100%; }*/ .ft-play-overlay { @@ -1059,9 +1060,9 @@ img.desaturate { top: 30%; left: 45%; margin-top: 10px; - /* width: 0px; */ - /* height: 0px; */ - /* padding: 50%; */ + /* width: 0px; */ + /* height: 0px; */ + /* padding: 50%; */ } .youtube i { @@ -1128,11 +1129,6 @@ a.headerlink { #menu-support.menu ul ul ul { list-style-type: square; } -/* having a separator between each elements of the top list and - between above the top of the third level list */ -#menu-support.menu ul ul ul { - border-top: 1px solid #EFEFEF; -} .terminal-image { box-shadow: 1px 1px 15px rgba(0, 0, 0, 0.3); @@ -1142,3 +1138,75 @@ a.headerlink { li.next { float: right; } + +/* Floating image on code */ +.figure.figure-with-code img { + margin: 0; +} +.figure.figure-with-code { + float: right; + max-width: 40%; + min-width: 200px; +} +.figure.figure-with-code + .code.html, +.figure.figure-with-code + .highlight-html { + max-width: 59%; +} +.figure.figure-with-code + .code.html::after, +.figure.figure-with-code + .highlight-html::after { + content: ' '; + clear: both; + display: block; +} + +/* Fix nested lists bold */ +li > dl > dt { + font-weight: inherit; +} + +/* Icons grid */ +#icons > blockquote > div { + display: inline-flex; + flex-wrap: wrap; + justify-content: space-between; +} +#icons > blockquote > div > div { + margin: 20px; + text-align: center; + flex: 10%; +} +#icons > blockquote > div img { + margin: 5px; +} +#icons > blockquote > div p { + font-size: inherit; +} +#icons > blockquote > div a { + display: flex; + width: 42px; + height: 42px; + margin: auto; +} +#icons > blockquote > div > div a[href*='white'], +#icons > blockquote > div > div a[href*='/calendar.'], +#icons > blockquote > div > div a[href*='/caret.'], +#icons > blockquote > div > div a[href*='/contacts.'], +#icons > blockquote > div > div a[href*='/files1.'], +#icons > blockquote > div > div a[href*='/music.'], +#icons > blockquote > div > div a[href*='/picture.'], +#icons > blockquote > div > div a[href*='white'] { + background: #ddd; + border-radius: 50%; +} + +/* Version switcher */ + +.doc-version-switch a { + padding: 3px; + margin-left:10px; + display: inline-block; +} +.doc-version-switch .current-doc { + font-weight: 900; +} + diff --git a/_shared_assets/themes/nextcloud_release/layout.html b/_shared_assets/themes/nextcloud_release/layout.html index acbec5584..19087209b 100644 --- a/_shared_assets/themes/nextcloud_release/layout.html +++ b/_shared_assets/themes/nextcloud_release/layout.html @@ -100,25 +100,23 @@
-
-
- {% if theme_show_search %} - - - - - {% endif %} -
-
{% block sidebartoc %}