From c6259b7027dcff5e24820b3937e78c61c6fde271 Mon Sep 17 00:00:00 2001 From: darta Date: Sat, 10 Apr 2021 07:23:23 +0000 Subject: [PATCH] Nextcloud top bar styles --- docker/_tests/onlyoffice_build/README.md | 5 -- .../onlyoffice_build/build_onlyoffice.yml | 10 --- .../document-server/Dockerfile | 84 ------------------- .../themes/digitaldemocratic/core/css/dd.css | 4 + .../core/templates/layout.user.php | 54 +++++++----- 5 files changed, 38 insertions(+), 119 deletions(-) delete mode 100644 docker/_tests/onlyoffice_build/README.md delete mode 100644 docker/_tests/onlyoffice_build/build_onlyoffice.yml delete mode 100644 docker/_tests/reference-nextcloud-with-office/document-server/Dockerfile diff --git a/docker/_tests/onlyoffice_build/README.md b/docker/_tests/onlyoffice_build/README.md deleted file mode 100644 index d552b88..0000000 --- a/docker/_tests/onlyoffice_build/README.md +++ /dev/null @@ -1,5 +0,0 @@ -It should be copied inside build_tools.sh and build it. -The submodule needs recursive git submodule but don't know if it is correct. - -We should modify image scripts to get rid of users limits (https://autoize.com/building-onlyoffice-document-server-from-source/) -We should create an onlyoffice docker-compose that starts with those compiled files. diff --git a/docker/_tests/onlyoffice_build/build_onlyoffice.yml b/docker/_tests/onlyoffice_build/build_onlyoffice.yml deleted file mode 100644 index 81f152c..0000000 --- a/docker/_tests/onlyoffice_build/build_onlyoffice.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '3.7' -services: - onlyoffice-build: - build: - context: . - dockerfile: Dockerfile - container_name: onlyoffice-build - restart: "no" - volumes: - - ./out:/build_tools/out \ No newline at end of file diff --git a/docker/_tests/reference-nextcloud-with-office/document-server/Dockerfile b/docker/_tests/reference-nextcloud-with-office/document-server/Dockerfile deleted file mode 100644 index 936c858..0000000 --- a/docker/_tests/reference-nextcloud-with-office/document-server/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt update -RUN apt-get install -yq curl apt-transport-https ca-certificates -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - - -RUN apt-get install -y nodejs -RUN npm install -g npm -RUN npm install -g grunt-cli - -RUN apt-get install --force-yes -yq \ -wget \ -build-essential \ -libcurl4-gnutls-dev \ -libglib2.0-dev \ -libgdk-pixbuf2.0-dev \ -libgtkglext1-dev \ -libatk1.0-dev \ -libcairo2-dev \ -libxml2-dev \ -libxss-dev \ -libgconf2-dev \ -default-jre \ -qt5-qmake \ -qt5-default \ -p7zip-full \ -git \ -subversion -#libicu-dev - -RUN mkdir /build && cd /build -WORKDIR /build -RUN wget https://github.com/unicode-org/icu/archive/release-58-3.tar.gz -RUN tar xvzf release-58-3.tar.gz -RUN cd icu-release-58-3/icu4c/source -WORKDIR /build/icu-release-58-3/icu4c/source -RUN ./configure -RUN make -RUN make install -WORKDIR / -RUN rm -rf build - -RUN git clone --recursive https://github.com/ONLYOFFICE/DocumentServer.git -WORKDIR DocumentServer - -## server/Common/sources/constants.js -# exports.LICENSE_CONNECTIONS = 20; -# exports.LICENSE_CONNECTIONS = 99999; -RUN cd core/Common/3dParty && ./make.sh -#RUN cd DocumentServer/core/Common/3dParty -#./make.sh -RUN echo "XXXXXXXXXXXXXXXXXXXXXXXX" -WORKDIR /DocumentServer/core -RUN make -RUN cd ../sdkjs && make -RUN cd ../server && make - -RUN apt-get install adduser redis-server rabbitmq-server nodejs libstdc++6 libcurl3 libxml2 libboost-regex-dev zlib1g fonts-dejavu fonts-liberation ttf-mscorefonts-installer fonts-crosextra-carlito fonts-takao-gothic fonts-opensymbol libxss1 libcairo2 xvfb libxtst6 libgconf2-4 libasound2 - -RUN for font in \ -lohit-assamese \ -lohit-bengali \ -lohit-devanagari \ -lohit-gujarati \ -lohit-kannada \ -lohit-malayalam \ -lohit-oriya \ -lohit-punjabi \ -lohit-tamil \ -lohit-tamil-classical \ -lohit-telugu \ -nanum \ -noto \ -opensans \ -padauk \ -samyak \ -samyak-fonts \ -tibetan-machine \ -ttf-khmeros-core \ -ubuntu-font-family \ -wqy-zenhei; \ -do rm -rf build/core-fonts/${font}; done - -RUN cd ../server && sudo make install diff --git a/docker/nextcloud/themes/digitaldemocratic/core/css/dd.css b/docker/nextcloud/themes/digitaldemocratic/core/css/dd.css index 2660d85..03e2689 100644 --- a/docker/nextcloud/themes/digitaldemocratic/core/css/dd.css +++ b/docker/nextcloud/themes/digitaldemocratic/core/css/dd.css @@ -190,3 +190,7 @@ font-size: 19px; } +div#content-vue { + padding-top: 75px; +} + diff --git a/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php b/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php index 2f5e4a0..ad253d1 100644 --- a/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php +++ b/docker/nextcloud/themes/digitaldemocratic/core/templates/layout.user.php @@ -96,6 +96,7 @@
Aules
+
  • -
    Crear arxius
    +
    Arxius
  • @@ -152,6 +146,7 @@
    Xat
    • +
  • - +
    @@ -200,6 +196,7 @@
    Tasques
    • +
  • @@ -216,16 +214,6 @@
    Fotos
    • - - +