Skip to content

Commit

Permalink
Merge pull request #2876 from ONLYOFFICE/feature/common-controls-repl…
Browse files Browse the repository at this point in the history
…acement

Feature/common controls replacement
  • Loading branch information
maxkadushkin authored Mar 6, 2024
2 parents d7a1c32 + 5c71aac commit 90c8107
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 83 deletions.
Binary file modified apps/common/main/resources/img/controls/common-controls.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/common/main/resources/img/controls/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/common/main/resources/img/controls/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/common/main/resources/img/controls/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/common/main/resources/img/controls/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions apps/common/main/resources/less/buttons.less
Original file line number Diff line number Diff line change
Expand Up @@ -779,10 +779,6 @@
background-color: @highlight-button-pressed;
}
}

.caret {
background-position: @arrow-small-offset-x - 7px @arrow-small-offset-y;
}
}

button.active:not(.disabled) {
Expand Down Expand Up @@ -1359,7 +1355,6 @@
&:active:not(.disabled),
&.active:not(.disabled) {
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
border-color: @icon-normal-ie;
border-color: @icon-normal;
}
Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/resources/less/calendar.less
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
display: block;
position: relative;
&.arrow-prev {
background-position: -38px -96px;
background-position: -40px 4px;
}
&.arrow-next {
background-position: -36px -112px;
background-position: -40px -12px;
}
}
&:hover {
Expand Down
12 changes: 6 additions & 6 deletions apps/common/main/resources/less/comments.less
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
}
}

.dataview-ct {
.dataview-ct {
width: 100%;
height: 100%;
.font-size-medium();
Expand Down Expand Up @@ -356,11 +356,11 @@
}

.btn-edit {
background-position: -2px -232px;
background-position: 0px -4px;
}

.btn-delete {
background-position: -22px -232px;
background-position: -20px -4px;
}


Expand Down Expand Up @@ -451,7 +451,7 @@
}

.btn-goto {
background-position: -22px -272px;
background-position: -20px -44px;
}

.inner-edit-ct {
Expand All @@ -475,7 +475,7 @@

.reply-arrow {
background-color: transparent;
background-position: -60px -232px;
background-position: -4px -28px;
width: 16px;
height: 16px;
margin-top: 10px;
Expand Down Expand Up @@ -535,7 +535,7 @@
width: 7px;
height: 7px;
border: 0;
background-position: @arrow-small-offset-x @arrow-small-offset-y;
//background-position: @arrow-small-offset-x @arrow-small-offset-y;
margin: 10px 8px 0 -2px;
display: inline-block;
vertical-align: middle;
Expand Down
2 changes: 1 addition & 1 deletion apps/common/main/resources/less/searchdialog.less
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
.search-options-caret {
width: 24px;
height: 24px;
background-position: 3px -270px;
background-position: 4px -40px;
display: inline-block;
position: absolute;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion apps/common/main/resources/less/treeview.less
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
.tree-caret {
width: 24px;
height: 24px;
background-position: 3px -270px;
background-position: 4px -40px;
display: inline-block;
position: absolute;
left: 0;
Expand Down
68 changes: 8 additions & 60 deletions apps/common/main/resources/less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -735,73 +735,21 @@
@common-controls: "controls/common-controls.png";
@common-controls2x: "controls/[email protected]";

// Dialog alerts
@alerts-offset-x: 0;
@alerts-offset-y: 0;

// Dialog close
@but-close-offset-x: -26px;
@but-close-offset-y: -151px;

// Dropdown arrow
@arrow-small-offset-x: -85px;
@arrow-small-offset-y: -96px;

// Dropdown arrow up
@arrow-up-small-offset-x: -85px;
@arrow-up-small-offset-y: -104px;

// Dropdown arrow big
@arrow-big-offset-x: -41px;
@arrow-big-offset-y: -144px;

// Checkbox
@checkbox-offset-x: -35px;
@checkbox-offset-y: 0px;

// Radio button
@radio-offset-x: -35px;
@radio-offset-y: -65px;

// Menu check
@menu-check-offset-x: -41px;
@menu-check-offset-y: -172px;

// Multislider thumb
@slide-thumb-offset-x: -13px;
@slide-thumb-offset-y: -150px;

// Slider thumb
@multislide-thumb-offset-x: 0px;
@multislide-thumb-offset-y: -150px;

// Slider track
@slide-track-offset-x: 0px;
@slide-track-offset-y: -195px;
@menu-check-offset-x: -40px;
@menu-check-offset-y: -28px;

// Input error
@input-error-offset-x: -73px;
@input-error-offset-y: -169px;
@input-error-offset-x: -72px;
@input-error-offset-y: -28px;

// Input warning
@input-warning-offset-x: -57px;
@input-warning-offset-y: -169px;

// Spinner
@spinner-offset-x: -41px;
@spinner-offset-y: -187px;
@input-warning-offset-x: -56px;
@input-warning-offset-y: -28px;

// Search dialog
@search-dlg-offset-x: -36px;
@search-dlg-offset-y: -96px;

// No color
@nocolor-offset-x: 0;
@nocolor-offset-y: -137px;

// Plus
@plus-offset-x: -80px;
@plus-offset-y: -184px;
@search-dlg-offset-x: -40px;
@search-dlg-offset-y: 4px;

@dl-horizontal-offset: @component-offset-horizontal;
// Point at which .dl-horizontal becomes horizontal
Expand Down
4 changes: 2 additions & 2 deletions apps/documenteditor/main/resources/less/filemenu.less
Original file line number Diff line number Diff line change
Expand Up @@ -671,13 +671,13 @@
}

.userLink {
background-position: -81px -234px;
background-position: -24px -28px;
padding: 0 0 0 17px;
width: 16px;
height: 16px;

&.sharedLink {
background-position: -24px -273px;
background-position: -22px -44px;
}

.rtl & {
Expand Down
4 changes: 2 additions & 2 deletions apps/presentationeditor/main/resources/less/leftmenu.less
Original file line number Diff line number Diff line change
Expand Up @@ -629,14 +629,14 @@
}

.userLink {
background-position: -81px -234px;
background-position: -24px -28px;
background-repeat: no-repeat;
padding: 0 0 0 17px;
width: 16px;
height: 16px;

&.sharedLink {
background-position: -24px -273px;
background-position: -22px -44px;
}
.rtl & {
padding: 0 17px 0 0;
Expand Down
4 changes: 2 additions & 2 deletions apps/spreadsheeteditor/main/resources/less/leftmenu.less
Original file line number Diff line number Diff line change
Expand Up @@ -707,14 +707,14 @@
}

.userLink {
background-position: -81px -234px;
background-position: -24px -28px;
background-repeat: no-repeat;
padding: 0 0 0 17px;
width: 16px;
height: 16px;

&.sharedLink {
background-position: -24px -273px;
background-position: -22px -44px;
}
.rtl & {
padding: 0 17px 0 0;
Expand Down
4 changes: 2 additions & 2 deletions apps/spreadsheeteditor/main/resources/less/rightmenu.less
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
vertical-align: middle;
width: 16px;
height: 16px;
background-position: -1px -274px;
background-position: -1px -46px;
display: inline-block;
}
}
Expand Down Expand Up @@ -262,7 +262,7 @@
vertical-align: middle;
width: 22px;
height: 16px;
background-position: 1px -274px;
background-position: 1px -46px;
display: inline-block;
}
}
Expand Down

0 comments on commit 90c8107

Please sign in to comment.