From 4d0fd20a492fa5657ca5f445857418f7f7c64369 Mon Sep 17 00:00:00 2001 From: Olga Kot Date: Fri, 1 Jul 2022 13:54:32 +0300 Subject: [PATCH] Header menu reworked (EN+DE). --- .../Common/BaseHeader/BaseHeader.ascx | 18 +++++++++- .../Common/BaseHeader/BaseHeader.de.ascx | 18 +++++++++- .../Help/Contribution/Contribution.de.ascx | 36 +++++++++++++++++++ Web/Controls/Help/HelpCenter.de.ascx | 7 ++-- Web/css/common.less | 10 ++++-- Web/css/navigation.less | 6 ++-- 6 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 Web/Controls/Help/Contribution/Contribution.de.ascx diff --git a/Web/Controls/Common/BaseHeader/BaseHeader.ascx b/Web/Controls/Common/BaseHeader/BaseHeader.ascx index d91f9ca76..9705912f5 100644 --- a/Web/Controls/Common/BaseHeader/BaseHeader.ascx +++ b/Web/Controls/Common/BaseHeader/BaseHeader.ascx @@ -187,7 +187,23 @@
  • ">Contribution
  • Contribution + +
  • Development
  • diff --git a/Web/Controls/Common/BaseHeader/BaseHeader.de.ascx b/Web/Controls/Common/BaseHeader/BaseHeader.de.ascx index 6b5443e2c..c7591c688 100644 --- a/Web/Controls/Common/BaseHeader/BaseHeader.de.ascx +++ b/Web/Controls/Common/BaseHeader/BaseHeader.de.ascx @@ -185,7 +185,23 @@
  • ">Beitrag
  • Beitrag + +
  • Entwicklung
  • diff --git a/Web/Controls/Help/Contribution/Contribution.de.ascx b/Web/Controls/Help/Contribution/Contribution.de.ascx new file mode 100644 index 000000000..2b9b3b3fc --- /dev/null +++ b/Web/Controls/Help/Contribution/Contribution.de.ascx @@ -0,0 +1,36 @@ +<%@ Control Language="C#" Inherits="BaseContentUserControls" %> +<%@ Register Namespace="TeamLab.Controls" Assembly="__Code" TagPrefix="cc" %> + + + +
    +

    Anleitungen für Beiträge

    + <%--
    +

    +
    + +
    +
    --%> + + +
    \ No newline at end of file diff --git a/Web/Controls/Help/HelpCenter.de.ascx b/Web/Controls/Help/HelpCenter.de.ascx index 7b078b7e3..305a7c187 100644 --- a/Web/Controls/Help/HelpCenter.de.ascx +++ b/Web/Controls/Help/HelpCenter.de.ascx @@ -49,7 +49,7 @@

    Benutzeranleitungen

    -

    Beitrag

    +

    Beitrag

    Entwicklung

    @@ -219,7 +219,7 @@
    - Anleitungen für Beiträge + Anleitungen für Beiträge
    Anleitungen für den Beitrag zum ONLYOFFICE-Projekt.
    @@ -227,6 +227,9 @@
    diff --git a/Web/css/common.less b/Web/css/common.less index bd326dae7..ccb7a62f1 100644 --- a/Web/css/common.less +++ b/Web/css/common.less @@ -490,7 +490,8 @@ #navitem_desktop_menu, #navitem_mobile_menu, #navitem_integration_menu, - #navitem_administration_menu { + #navitem_administration_menu, + #navitem_saas_menu { display: none; position: absolute; z-index: 1999; @@ -586,6 +587,10 @@ width: auto; } + #navitem_saas_menu { + width: auto; + } + #navitem_mobile_menu { width: 600px; left: calc(~"50% - 600px"); @@ -610,7 +615,8 @@ #navitem_desktop_menu, #navitem_server_menu, #navitem_integration_menu, - #navitem_administration_menu { + #navitem_administration_menu, + #navitem_saas_menu { padding: 0; text-transform: uppercase; } diff --git a/Web/css/navigation.less b/Web/css/navigation.less index 287903fc1..271066dd0 100644 --- a/Web/css/navigation.less +++ b/Web/css/navigation.less @@ -267,7 +267,8 @@ a.btn_top_sign { #navitem_desktop_menu, #navitem_mobile_menu, #navitem_integration_menu, - #navitem_administration_menu { + #navitem_administration_menu, + #navitem_saas_menu { display: none; position: absolute; z-index: 1999; @@ -408,7 +409,8 @@ a.btn_top_sign { #navitem_desktop_menu, #navitem_mobile_menu, #navitem_integration_menu, -#navitem_administration_menu { +#navitem_administration_menu, +#navitem_saas_menu { padding: 0; } a.dropdown-item {