IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0

Browse Source
This commit is contained in:
Timofey Boyko 2022-12-12 14:14:33 +03:00
commit 5991cf3127
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/install/OneClickInstall/install-Docker.sh
View File

@ -83,7 +83,7 @@ HELP_TARGET="install-Docker.sh";
SKIP_HARDWARE_CHECK="false"; SKIP_HARDWARE_CHECK="false";
EXTERNAL_PORT="8092" EXTERNAL_PORT="80"
SERVICE_PORT="5050" SERVICE_PORT="5050"
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
@ -863,11 +863,11 @@ install_product () {
reconfigure DOCKER_TAG ${DOCKER_TAG} reconfigure DOCKER_TAG ${DOCKER_TAG}
if [[ -n $EXTERNAL_PORT ]]; then if [[ -n $EXTERNAL_PORT ]]; then
sed -i "s/8092:8092/${EXTERNAL_PORT}:8092/g" $BASE_DIR/appserver.yml sed -i "s/8092:8092/${EXTERNAL_PORT}:8092/g" $BASE_DIR/${PRODUCT}.yml
fi fi
docker-compose -f $BASE_DIR/migration-runner.yml up -d docker-compose -f $BASE_DIR/migration-runner.yml up -d
docker-compose -f $BASE_DIR/appserver.yml up -d docker-compose -f $BASE_DIR/${PRODUCT}.yml up -d
docker-compose -f $BASE_DIR/notify.yml up -d docker-compose -f $BASE_DIR/notify.yml up -d
} }
@ -900,7 +900,7 @@ check_image_RepoDigest() {
} }
docker_image_update() { docker_image_update() {
docker-compose -f $BASE_DIR/notify.yml -f $BASE_DIR/appserver.yml down --volumes docker-compose -f $BASE_DIR/notify.yml -f $BASE_DIR/${PRODUCT}.yml down --volumes
docker-compose -f $BASE_DIR/build.yml pull docker-compose -f $BASE_DIR/build.yml pull
} }
@ -947,7 +947,7 @@ save_parameters_from_configs() {
APP_CORE_MACHINEKEY=$(save_parameter APP_CORE_MACHINEKEY $APP_CORE_MACHINEKEY) APP_CORE_MACHINEKEY=$(save_parameter APP_CORE_MACHINEKEY $APP_CORE_MACHINEKEY)
APP_CORE_BASE_DOMAIN=$(save_parameter APP_CORE_BASE_DOMAIN $APP_CORE_BASE_DOMAIN) APP_CORE_BASE_DOMAIN=$(save_parameter APP_CORE_BASE_DOMAIN $APP_CORE_BASE_DOMAIN)
if [ ${EXTERNAL_PORT} = "8092" ]; then if [ ${EXTERNAL_PORT} = "8092" ]; then
EXTERNAL_PORT=$(grep -oP '(?<=- ).*?(?=:8092)' /app/onlyoffice/appserver.yml) EXTERNAL_PORT=$(grep -oP '(?<=- ).*?(?=:8092)' /app/onlyoffice/${PRODUCT}.yml)
fi fi
} }

3
packages/common/components/ColorTheme/styled/comboButton.js
View File

@ -2,8 +2,9 @@ import styled, { css } from "styled-components";
import { StyledComboButton } from "@docspace/components/combobox/sub-components/styled-combobutton"; import { StyledComboButton } from "@docspace/components/combobox/sub-components/styled-combobutton";
import Base from "@docspace/components/themes/base"; import Base from "@docspace/components/themes/base";
const getDefaultStyles = ({ $currentColorScheme, isOpen }) => const getDefaultStyles = ({ $currentColorScheme, isOpen, theme }) =>
$currentColorScheme && $currentColorScheme &&
theme.isBase &&
css` css`
border-color: ${isOpen && $currentColorScheme.main.accent}; border-color: ${isOpen && $currentColorScheme.main.accent};

16
packages/components/combobox/sub-components/styled-combobutton.js
View File

@ -100,6 +100,17 @@ const StyledComboButton = styled.div`
${(props) => props.modernView && modernViewButton} ${(props) => props.modernView && modernViewButton}
.optionalBlock {
svg {
path {
fill: ${(props) =>
props.isOpen
? props.theme.iconButton.hoverColor
: props.theme.iconButton.color};
}
}
}
:hover { :hover {
border-color: ${(props) => border-color: ${(props) =>
props.isOpen props.isOpen
@ -157,7 +168,10 @@ const StyledComboButton = styled.div`
.optionalBlock { .optionalBlock {
svg { svg {
path { path {
fill: ${(props) => props.theme.iconButton.hoverColor}; fill: ${(props) =>
props.isOpen
? props.theme.iconButton.hoverColor
: props.theme.iconButton.color};
} }
} }
} }