Skip to content

Commit

Permalink
Merge pull request #2954 from ONLYOFFICE/feature/fix-bugs
Browse files Browse the repository at this point in the history
Feature/fix bugs
  • Loading branch information
maxkadushkin authored Apr 25, 2024
2 parents 6698eee + e6f8656 commit ea9bb7b
Show file tree
Hide file tree
Showing 16 changed files with 125 additions and 51 deletions.
28 changes: 14 additions & 14 deletions apps/common/mobile/resources/img/header/logo-android.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 14 additions & 5 deletions apps/common/mobile/resources/img/header/logo-ios.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions apps/common/mobile/resources/less/common-material.less
Original file line number Diff line number Diff line change
Expand Up @@ -749,4 +749,14 @@
background-color: @brand-secondary;
margin-left: 8px;
}

.dropdown-list {
.icon-radio {
display: none;
}

input[type="radio"]:checked + .icon-radio {
display: inline-block;
}
}
}
3 changes: 2 additions & 1 deletion apps/common/mobile/resources/less/common-rtl.less
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,9 @@
margin-right: 20px;
}

.list li.no-indicator .item-link .item-inner {
.view .list li.no-indicator .item-link .item-inner {
padding-right: 0;
padding-left: 15px;
}

// Dialog with password
Expand Down
14 changes: 12 additions & 2 deletions apps/common/mobile/resources/less/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@

.navbar.main-navbar {
height: 0;

&.navbar-with-logo {
height: 26px;
}

.navbar-inner {
display: flex;
justify-content: center;
padding-top: 7px;
padding: 0;
}

.navbar-bg {
&:before, &:after {
content: none;
Expand All @@ -55,9 +58,10 @@
display: flex;
justify-content: center;
align-items: center;
height: 100%;

.custom-logo-image {
max-height: 14px;
max-height: 20px;
height: auto;
width: auto;
}
Expand Down Expand Up @@ -1068,6 +1072,12 @@ input[type="number"]::-webkit-inner-spin-button {
height: 100%;
}

.dropdown-list-popup {
height: 260px;
bottom: 0;
top: auto;
}

.dropdown-list {
&__placeholder {
opacity: 0.6;
Expand Down
4 changes: 3 additions & 1 deletion apps/common/mobile/resources/less/ios/icons.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
i.icon {
&.icon-logo {
background: ~"url(@{common-image-path}/header/logo-android.svg)" no-repeat center;
background-size: contain;
}
}
}
Expand All @@ -14,8 +15,9 @@
}
&.icon-logo {
width: 100px;
height: 14px;
height: 20px;
background: ~"url(@{common-image-path}/header/logo-ios.svg)" no-repeat center;
background-size: contain;
}
&.icon-prev {
width: 22px;
Expand Down
Loading

0 comments on commit ea9bb7b

Please sign in to comment.