Skip to content

Commit be96ed8

Browse files
author
OpenShift Bot
authored
Merge pull request #1493 from rhamilto/catalog-scrollbar
Merged by openshift-bot
2 parents 03c7a39 + 620cf4b commit be96ed8

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

app/styles/_scrollbars.less

+11-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@
3131
// box-shadow: inset 1px 0 0 rgba(0,0,0,.1);
3232
}
3333

34-
.log-view.log-fixed-height, .navbar-project-menu {
34+
landing-page,
35+
.log-view.log-fixed-height,
36+
.navbar-project-menu {
3537
::-webkit-scrollbar-thumb {
3638
background-color: @scrollbar-thumb-inverse;
3739
-webkit-box-shadow: inset 1px 1px 0 rgba(255,255,255,.1),inset 0 -1px 0 rgba(255,255,255,.07);
@@ -46,6 +48,14 @@
4648
}
4749
}
4850

51+
.landing::-webkit-scrollbar-track {
52+
background-color: @scrollbar-track-landing;
53+
}
54+
55+
.landing-side-bar::-webkit-scrollbar-track {
56+
background-color: @scrollbar-track-landing-side-bar;
57+
}
58+
4959
.log-view.log-fixed-height {
5060
::-webkit-scrollbar {
5161
width: @scrollbar-width-log-viewer;

app/styles/_variables.less

+2
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@
113113
@scrollbar-track: rgba(0,0,0,.03);
114114
@scrollbar-track-inverse: @sidebar-os-border-color;
115115
@scrollbar-track-inverse-alt: rgba(255,255,255,.1);
116+
@scrollbar-track-landing: #042e43;
117+
@scrollbar-track-landing-side-bar: darken(#2C343D, 5%); // #2C343D is @landing-side-bar-bg in catalog
116118
@scrollbar-width: 15px;
117119
@scrollbar-width-log-viewer: 17px;
118120
@status-bg-color: #E6ECF1;

dist/styles/main.css

+5-3
Original file line numberDiff line numberDiff line change
@@ -5045,9 +5045,11 @@ td.visible-print,th.visible-print{display:table-cell!important}
50455045
::-webkit-scrollbar-thumb{background-color:rgba(0,0,0,.08);background-clip:padding-box;border:solid transparent;border-width:1px;min-height:28px;max-height:60px;padding:100px 0 0;-webkit-box-shadow:inset 1px 1px 0 rgba(0,0,0,.1),inset 0 -1px 0 rgba(0,0,0,.07);box-shadow:inset 1px 1px 0 rgba(0,0,0,.1),inset 0 -1px 0 rgba(0,0,0,.07)}
50465046
::-webkit-scrollbar-thumb:active,::-webkit-scrollbar-thumb:hover{background-color:rgba(0,0,0,.18)}
50475047
::-webkit-scrollbar-track{background-clip:padding-box;background-color:rgba(0,0,0,.03)}
5048-
.log-view.log-fixed-height ::-webkit-scrollbar-thumb,.navbar-project-menu ::-webkit-scrollbar-thumb{background-color:rgba(255,255,255,.25);-webkit-box-shadow:inset 1px 1px 0 rgba(255,255,255,.1),inset 0 -1px 0 rgba(255,255,255,.07);box-shadow:inset 1px 1px 0 rgba(255,255,255,.1),inset 0 -1px 0 rgba(255,255,255,.07)}
5049-
.log-view.log-fixed-height ::-webkit-scrollbar-thumb:active,.log-view.log-fixed-height ::-webkit-scrollbar-thumb:hover,.navbar-project-menu ::-webkit-scrollbar-thumb:active,.navbar-project-menu ::-webkit-scrollbar-thumb:hover{background-color:rgba(255,255,255,.35)}
5050-
.log-view.log-fixed-height ::-webkit-scrollbar-track,.navbar-project-menu ::-webkit-scrollbar-track{background-color:#050505}
5048+
.log-view.log-fixed-height ::-webkit-scrollbar-thumb,.navbar-project-menu ::-webkit-scrollbar-thumb,landing-page ::-webkit-scrollbar-thumb{background-color:rgba(255,255,255,.25);-webkit-box-shadow:inset 1px 1px 0 rgba(255,255,255,.1),inset 0 -1px 0 rgba(255,255,255,.07);box-shadow:inset 1px 1px 0 rgba(255,255,255,.1),inset 0 -1px 0 rgba(255,255,255,.07)}
5049+
.log-view.log-fixed-height ::-webkit-scrollbar-thumb:active,.log-view.log-fixed-height ::-webkit-scrollbar-thumb:hover,.navbar-project-menu ::-webkit-scrollbar-thumb:active,.navbar-project-menu ::-webkit-scrollbar-thumb:hover,landing-page ::-webkit-scrollbar-thumb:active,landing-page ::-webkit-scrollbar-thumb:hover{background-color:rgba(255,255,255,.35)}
5050+
.log-view.log-fixed-height ::-webkit-scrollbar-track,.navbar-project-menu ::-webkit-scrollbar-track,landing-page ::-webkit-scrollbar-track{background-color:#050505}
5051+
.landing::-webkit-scrollbar-track{background-color:#042e43}
5052+
.landing-side-bar::-webkit-scrollbar-track{background-color:#21272e}
50515053
.log-view.log-fixed-height ::-webkit-scrollbar{width:17px}
50525054
.log-view.log-fixed-height ::-webkit-scrollbar-track{background-color:rgba(255,255,255,.1)}
50535055
.osc-secrets-form .advanced-secrets .help-blocks,.osc-secrets-form .advanced-secrets .input-labels,.osc-secrets-form .basic-secrets .help-blocks,.osc-secrets-form .basic-secrets .input-labels{display:table;padding-right:30px;position:relative;width:100%}

0 commit comments

Comments
 (0)