diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-10-03 09:05:54 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-10-03 09:05:54 +0200 |
| commit | b27fbf209e57e95c94de7667500ef8e7c63e638b (patch) | |
| tree | 2da1e751b4349d1547d8f72dd0517058d92f5535 | |
| parent | 4afd1ac705b7e0b8db7bbfacc5f46e0e42c9d4f1 (diff) | |
| parent | d556ef59e6ffce4849e50a741847d13fd8b07e94 (diff) | |
| download | volse-hubzilla-b27fbf209e57e95c94de7667500ef8e7c63e638b.tar.gz volse-hubzilla-b27fbf209e57e95c94de7667500ef8e7c63e638b.tar.bz2 volse-hubzilla-b27fbf209e57e95c94de7667500ef8e7c63e638b.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | view/tpl/navbar_default.tpl | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9578ec6b1..96a76e666 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,16 +115,16 @@ php7.3_mariadb10.3: # PHP7.3 with PostgreSQL latest (11) -php7.3_postgres11: - <<: *job_definition_postgres - artifacts: *artifacts_template +#php7.3_postgres11: +# <<: *job_definition_postgres +# artifacts: *artifacts_template # PHP7.3 with PostgreSQL latest (11) -php7.3_postgres11: - <<: *job_definition_postgres - image: registry.gitlab.com/dawnbreak/hubzilla/core:php7.3 - artifacts: *artifacts_template +#php7.3_postgres11: +# <<: *job_definition_postgres +# image: registry.gitlab.com/dawnbreak/hubzilla/core:php7.3 +# artifacts: *artifacts_template # Generate Doxygen API Documentation and deploy it as GitLab pages diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index e2cda2db7..c8b5ce26c 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -201,10 +201,10 @@ {{/foreach}} {{/if}} {{if $navbar_apps.0}} + <div class="d-lg-none dropdown-header text-uppercase"> + {{$pinned_apps}} + </div> <div id="nav-app-bin-container" class="d-lg-none"> - <div class="dropdown-header text-uppercase"> - {{$pinned_apps}} - </div> {{foreach $navbar_apps as $navbar_app}} {{$navbar_app|replace:'navbar-app nav-link':'dropdown-item nav-app-sortable'|replace:'fa':'generic-icons-nav fa'}} {{/foreach}} |