Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix css calc expression to have space around operator #14241

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Fix css calc expression to have space around operator #14241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 55 additions & 138 deletions packages/core/src/browser/style/tabs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
--theia-private-horizontal-tab-scrollbar-height: 5px;
--theia-tabbar-toolbar-z-index: 1001;
--theia-toolbar-active-transform-scale: 1.272019649;
--theia-horizontal-toolbar-height: calc(
var(--theia-private-horizontal-tab-height) +
var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2
);
--theia-horizontal-toolbar-height: calc(var(--theia-private-horizontal-tab-height) + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2);
--theia-dragover-tab-border-width: 2px;
}

Expand Down Expand Up @@ -75,9 +72,7 @@
border-left: var(--theia-border-width) solid var(--theia-editorGroup-border);
}

#theia-main-content-panel
.p-DockPanel-handle[data-orientation="vertical"]
+ .p-TabBar {
#theia-main-content-panel .p-DockPanel-handle[data-orientation="vertical"]+.p-TabBar {
border-top: var(--theia-border-width) solid var(--theia-editorGroup-border);
}

Expand Down Expand Up @@ -142,11 +137,9 @@

-webkit-appearance: none;
-moz-appearance: none;
background-image: linear-gradient(
45deg,
background-image: linear-gradient(45deg,
transparent 50%,
var(--theia-icon-foreground) 50%
),
var(--theia-icon-foreground) 50%),
linear-gradient(135deg, var(--theia-icon-foreground) 50%, transparent 50%);
background-position: calc(100% - 6px) 8px, calc(100% - 2px) 8px, 100% 0;
background-size: 4px 5px;
Expand Down Expand Up @@ -225,12 +218,8 @@
visibility: hidden;
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-closable
> .p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers
.p-TabBar-tab.theia-mod-pinned
> .p-TabBar-tabCloseIcon {
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable>.p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers .p-TabBar-tab.theia-mod-pinned>.p-TabBar-tabCloseIcon {
padding: 2px;
margin-top: 2px;
margin-left: 4px;
Expand All @@ -248,31 +237,19 @@
-ms-user-select: none;
}

.p-TabBar.theia-app-centers.dynamic-tabs
.p-TabBar-tab.p-mod-closable
> .p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers.dynamic-tabs
.p-TabBar-tab.theia-mod-pinned
> .p-TabBar-tabCloseIcon {
.p-TabBar.theia-app-centers.dynamic-tabs .p-TabBar-tab.p-mod-closable>.p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers.dynamic-tabs .p-TabBar-tab.theia-mod-pinned>.p-TabBar-tabCloseIcon {
/* hide close icon for dynamic tabs strategy*/
display: none;
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-current
> .p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers
.p-TabBar-tab:hover.p-mod-closable
> .p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers
.p-TabBar-tab:hover.theia-mod-pinned
> .p-TabBar-tabCloseIcon {
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-current>.p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers .p-TabBar-tab:hover.p-mod-closable>.p-TabBar-tabCloseIcon,
.p-TabBar.theia-app-centers .p-TabBar-tab:hover.theia-mod-pinned>.p-TabBar-tabCloseIcon {
display: inline-block;
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-closable
> .p-TabBar-tabCloseIcon:hover {
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable>.p-TabBar-tabCloseIcon:hover {
border-radius: 5px;
background-color: rgba(50%, 50%, 50%, 0.2);
}
Expand All @@ -282,33 +259,21 @@
padding-right: 4px;
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-closable:not(.theia-mod-dirty):hover
> .p-TabBar-tabCloseIcon:before,
.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-closable:not(.theia-mod-dirty).p-TabBar-tab.p-mod-current
> .p-TabBar-tabCloseIcon:before,
.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-closable.theia-mod-dirty
> .p-TabBar-tabCloseIcon:hover:before {
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable:not(.theia-mod-dirty):hover>.p-TabBar-tabCloseIcon:before,
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable:not(.theia-mod-dirty).p-TabBar-tab.p-mod-current>.p-TabBar-tabCloseIcon:before,
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable.theia-mod-dirty>.p-TabBar-tabCloseIcon:hover:before {
content: "\ea76";
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.p-mod-closable.theia-mod-dirty
> .p-TabBar-tabCloseIcon:before {
.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable.theia-mod-dirty>.p-TabBar-tabCloseIcon:before {
content: "\ea71";
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.theia-mod-pinned
> .p-TabBar-tabCloseIcon:before {
.p-TabBar.theia-app-centers .p-TabBar-tab.theia-mod-pinned>.p-TabBar-tabCloseIcon:before {
content: "\eba0";
}

.p-TabBar.theia-app-centers
.p-TabBar-tab.theia-mod-pinned.theia-mod-dirty
> .p-TabBar-tabCloseIcon:before {
.p-TabBar.theia-app-centers .p-TabBar-tab.theia-mod-pinned.theia-mod-dirty>.p-TabBar-tabCloseIcon:before {
content: "\ebb2";
}

Expand Down Expand Up @@ -351,72 +316,35 @@
| Perfect scrollbar
|----------------------------------------------------------------------------*/

.p-TabBar[data-orientation="horizontal"]
.p-TabBar-content-container
> .ps__rail-x {
.p-TabBar[data-orientation="horizontal"] .p-TabBar-content-container>.ps__rail-x {
height: var(--theia-private-horizontal-tab-scrollbar-rail-height);
z-index: 1000;
}

.p-TabBar[data-orientation="horizontal"]
.p-TabBar-content-container
> .ps__rail-x
> .ps__thumb-x {
.p-TabBar[data-orientation="horizontal"] .p-TabBar-content-container>.ps__rail-x>.ps__thumb-x {
height: var(--theia-private-horizontal-tab-scrollbar-height) !important;
bottom: calc(
(
var(--theia-private-horizontal-tab-scrollbar-rail-height) -
var(--theia-private-horizontal-tab-scrollbar-height)
) / 2
);
}

.p-TabBar[data-orientation="horizontal"]
.p-TabBar-content-container
> .ps__rail-x:hover,
.p-TabBar[data-orientation="horizontal"]
.p-TabBar-content-container
> .ps__rail-x:focus {
bottom: calc((var(--theia-private-horizontal-tab-scrollbar-rail-height) - var(--theia-private-horizontal-tab-scrollbar-height)) / 2);
}

.p-TabBar[data-orientation="horizontal"] .p-TabBar-content-container>.ps__rail-x:hover,
.p-TabBar[data-orientation="horizontal"] .p-TabBar-content-container>.ps__rail-x:focus {
height: var(--theia-private-horizontal-tab-scrollbar-rail-height) !important;
}

.p-TabBar[data-orientation="horizontal"]
.p-TabBar-content-container
> .ps__rail-x:hover
> .ps__thumb-x,
.p-TabBar[data-orientation="horizontal"]
.p-TabBar-content-container
> .ps__rail-x:focus
> .ps__thumb-x {
height: calc(
var(--theia-private-horizontal-tab-scrollbar-height) / 2
) !important;
bottom: calc(
(
var(--theia-private-horizontal-tab-scrollbar-rail-height) -
var(--theia-private-horizontal-tab-scrollbar-height)
) / 2
);
}

.p-TabBar[data-orientation="vertical"]
.p-TabBar-content-container
> .ps__rail-y {
.p-TabBar[data-orientation="horizontal"] .p-TabBar-content-container>.ps__rail-x:hover>.ps__thumb-x,
.p-TabBar[data-orientation="horizontal"] .p-TabBar-content-container>.ps__rail-x:focus>.ps__thumb-x {
height: calc(var(--theia-private-horizontal-tab-scrollbar-height) / 2) !important;
bottom: calc((var(--theia-private-horizontal-tab-scrollbar-rail-height) - var(--theia-private-horizontal-tab-scrollbar-height)) / 2);
}

.p-TabBar[data-orientation="vertical"] .p-TabBar-content-container>.ps__rail-y {
width: var(--theia-private-horizontal-tab-scrollbar-rail-height);
z-index: 1000;
}

.p-TabBar[data-orientation="vertical"]
.p-TabBar-content-container
> .ps__rail-y
> .ps__thumb-y {
.p-TabBar[data-orientation="vertical"] .p-TabBar-content-container>.ps__rail-y>.ps__thumb-y {
width: var(--theia-private-horizontal-tab-scrollbar-height) !important;
right: calc(
(
var(--theia-private-horizontal-tab-scrollbar-rail-height) -
var(--theia-private-horizontal-tab-scrollbar-height)
) / 2
);
right: calc((var(--theia-private-horizontal-tab-scrollbar-rail-height) - var(--theia-private-horizontal-tab-scrollbar-height)) / 2);
}

.p-TabBar[data-orientation="vertical"] .p-TabBar-content-container {
Expand Down Expand Up @@ -447,9 +375,8 @@
|----------------------------------------------------------------------------*/

.p-TabBar-toolbar {
z-index: var(
--theia-tabbar-toolbar-z-index
); /* Due to the scrollbar (`z-index: 1000;`) it has a greater `z-index`. */
z-index: var(--theia-tabbar-toolbar-z-index);
/* Due to the scrollbar (`z-index: 1000;`) it has a greater `z-index`. */
display: flex;
flex-direction: row-reverse;
padding: 4px;
Expand All @@ -460,7 +387,8 @@
.p-TabBar-content-container {
display: flex;
flex: 1;
position: relative; /* This is necessary for perfect-scrollbar */
position: relative;
/* This is necessary for perfect-scrollbar */
}

.p-TabBar-toolbar .item {
Expand All @@ -473,7 +401,7 @@
}

.p-TabBar-toolbar .item>div {
height: 100%;
height: 100%;
}

.p-TabBar-toolbar .item.enabled {
Expand All @@ -491,14 +419,14 @@
background-color: var(--theia-inputOption-activeBackground);
}

.p-TabBar-toolbar .item > div {
line-height: calc(var(--theia-icon-size)+2px);
height: calc(var(--theia-icon-size)+2px);
.p-TabBar-toolbar .item>div {
line-height: calc(var(--theia-icon-size) + 2px);
height: calc(var(--theia-icon-size) + 2px);
background-repeat: no-repeat;
line-height: 18px;
}

.p-TabBar-toolbar .item > div.no-icon {
.p-TabBar-toolbar .item>div.no-icon {
/* Make room for a text label instead of an icon. */
width: 100%;
}
Expand Down Expand Up @@ -532,9 +460,7 @@
vertical-align: bottom;
}

#theia-main-content-panel
.p-TabBar:not(.theia-tabBar-active)
.p-TabBar-toolbar {
#theia-main-content-panel .p-TabBar:not(.theia-tabBar-active) .p-TabBar-toolbar {
display: none;
}

Expand All @@ -543,9 +469,7 @@
}

.p-TabBar.theia-tabBar-multirow[data-orientation="horizontal"] {
min-height: calc(
var(--theia-breadcrumbs-height) + var(--theia-horizontal-toolbar-height)
);
min-height: calc(var(--theia-breadcrumbs-height) + var(--theia-horizontal-toolbar-height));
flex-direction: column;
}

Expand All @@ -569,19 +493,14 @@
flex-direction: column;
}

.p-TabBar.theia-app-centers[data-orientation="horizontal"].dynamic-tabs
.p-TabBar-tabLabel {
.p-TabBar.theia-app-centers[data-orientation="horizontal"].dynamic-tabs .p-TabBar-tabLabel {
/* fade out text with dynamic tabs strategy */
mask-image: linear-gradient(
to left,
rgba(0, 0, 0, 0.3),
rgba(0, 0, 0, 1) 15px
);
-webkit-mask-image: linear-gradient(
to left,
rgba(0, 0, 0, 0.3),
rgba(0, 0, 0, 1) 15px
);
mask-image: linear-gradient(to left,
rgba(0, 0, 0, 0.3),
rgba(0, 0, 0, 1) 15px);
-webkit-mask-image: linear-gradient(to left,
rgba(0, 0, 0, 0.3),
rgba(0, 0, 0, 1) 15px);
flex: 1;
}

Expand Down Expand Up @@ -625,13 +544,11 @@
/*-----------------------------------------------------------------------------
| Open tabs dropdown
|----------------------------------------------------------------------------*/
.theia-tabBar-open-tabs
> .theia-select-component
.theia-select-component-label {
.theia-tabBar-open-tabs>.theia-select-component .theia-select-component-label {
display: none;
}

.theia-tabBar-open-tabs > .theia-select-component {
.theia-tabBar-open-tabs>.theia-select-component {
min-width: auto;
height: 100%;
}
Expand All @@ -644,4 +561,4 @@

.theia-tabBar-open-tabs.p-mod-hidden {
display: none;
}
}
Loading