Skip to content

Commit 047c642

Browse files
rhamiltof0x11
rhamilto
authored and
f0x11
committed
Removing orphaned tech-preview less and markup
Fixes openshift#2186 openshift@128b78d360f3d8999 2ed6ff7813edaa99f315ef1#diff-685dfa901a119f6590e773891ffd6052L506 removed the relevant javascript bits.
1 parent 6737bb3 commit 047c642

12 files changed

+47
-95
lines changed

‎app/index.html

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
</head>
4040
<body class="console-os" ng-class="{ 'has-project-bar': view.hasProject }">
4141
<!-- Add your site or application content here -->
42-
<p ng-if="globalTechPreviewIndicator" ng-cloak class="tech-preview-banner" translate>Technology preview is enabled</p>
4342
<osc-header></osc-header>
4443
<toast-notifications></toast-notifications>
4544
<notification-drawer-wrapper></notification-drawer-wrapper>

‎app/styles/_catalog.less

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@
2121
.catalog-search,
2222
.landing-side-bar {
2323
top: @navbar-os-header-height-desktop;
24-
.tech-preview & {
25-
top: @navbar-os-header-height-desktop + @tech-preview-banner-height;
26-
}
2724
}
2825
}

‎app/styles/_layouts.less

-12
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,13 @@
1111
body {
1212
height: 1px;
1313
padding-top: @navbar-os-header-height-mobile;
14-
&.tech-preview {
15-
padding-top: (@navbar-os-header-height-mobile + @tech-preview-banner-height);
16-
}
1714
@media(min-width: @screen-sm-min) {
1815
padding-top: @navbar-os-header-height-desktop;
19-
&.tech-preview {
20-
padding-top: (@navbar-os-header-height-desktop + @tech-preview-banner-height);
21-
}
2216
}
2317
&.has-project-bar {
2418
padding-top: (@navbar-os-header-height-mobile + @project-bar-height-mobile);
25-
&.tech-preview {
26-
padding-top: (@navbar-os-header-height-mobile + @project-bar-height-mobile + @tech-preview-banner-height);
27-
}
2819
@media(min-width: @screen-sm-min) {
2920
padding-top: (@navbar-os-header-height-desktop + @project-bar-height-desktop);
30-
&.tech-preview {
31-
padding-top: (@navbar-os-header-height-desktop + @project-bar-height-desktop + @tech-preview-banner-height);
32-
}
3321
.container-pf-nav-pf-vertical {
3422
margin-left: @nav-pf-vertical-width;
3523
&.collapsed-nav {

‎app/styles/_log.less

-12
Original file line numberDiff line numberDiff line change
@@ -135,18 +135,6 @@
135135
top: (@log-scroll-offset-top + @navbar-os-header-height-desktop);
136136
}
137137
}
138-
.tech-preview & {
139-
top: (@log-scroll-offset-top + @navbar-os-header-height-mobile + @project-bar-height-mobile + @tech-preview-banner-height);
140-
@media (min-width: @screen-sm-min) {
141-
top: (@log-scroll-offset-top + @navbar-os-header-height-desktop + @project-bar-height-desktop + @tech-preview-banner-height);
142-
}
143-
}
144-
.tech-preview .chromeless & {
145-
top: (@log-scroll-offset-top + @navbar-os-header-height-mobile + @tech-preview-banner-height);
146-
@media (min-width: @screen-sm-min) {
147-
top: (@log-scroll-offset-top + @navbar-os-header-height-desktop + @tech-preview-banner-height);
148-
}
149-
}
150138
}
151139
}
152140
.log-view-output {

‎app/styles/_navbar-vertical.less

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@
3636
vertical-align: middle;
3737
width: 0;
3838
}
39-
.layout-pf-fixed .tech-preview & {
40-
top: @tech-preview-banner-height;
41-
}
4239
.navbar-brand {
4340
padding: 0;
4441
@media(min-width: @screen-sm-min) {

‎app/styles/_notifications.less

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ notification-drawer-wrapper {
2222
left: 270px;
2323
}
2424
}
25-
.tech-preview & {
26-
height: calc(100vh ~"-" (@navbar-os-header-height-mobile + @project-bar-height-mobile + @tech-preview-banner-height));
27-
top: (@navbar-os-header-height-mobile + @project-bar-height-mobile + @tech-preview-banner-height);
28-
@media(min-width: @screen-sm-min) {
29-
height: calc(100vh ~"-" (@navbar-os-header-height-desktop + @project-bar-height-desktop + @tech-preview-banner-height) ~"-" 20px); // 20px bottom gutter
30-
top: (@navbar-os-header-height-desktop + @project-bar-height-desktop + @tech-preview-banner-height);
31-
}
25+
&.hide {
26+
opacity: 0;
27+
top: 38px;
28+
}
29+
&.hide-add,
30+
&.hide-remove {
31+
display: block !important;
3232
}
3333
}
3434
// the whole block is clickable, need to set pointer on all of these

‎app/styles/_project-bar.less

-6
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,4 @@
239239
background-color: @navbar-pf-vertical-color;
240240
}
241241
}
242-
.tech-preview & {
243-
top: @navbar-os-header-height-mobile + @tech-preview-banner-height;
244-
@media (min-width: @screen-sm-min) {
245-
top: @navbar-os-header-height-desktop + @tech-preview-banner-height;
246-
}
247-
}
248242
}

‎app/styles/_tech-preview.less

-15
This file was deleted.

‎app/styles/_vertical-nav.less

-18
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,6 @@
132132
}
133133
}
134134
}
135-
.tech-preview & {
136-
top: (@navbar-os-header-height-mobile + @project-bar-height-mobile + @tech-preview-banner-height);
137-
@media(min-width: @screen-sm-min) {
138-
top: (@navbar-os-header-height-desktop + @project-bar-height-desktop + @tech-preview-banner-height);
139-
}
140-
}
141135
}
142136
.nav-item-pf-header {
143137
font-size: (@font-size-base + 1);
@@ -146,16 +140,4 @@
146140
padding: 4px 0 2px 0;
147141
margin-left: 20px;
148142
}
149-
.tech-preview & {
150-
top: (@navbar-os-header-height-mobile + @tech-preview-banner-height);
151-
@media(min-width: @screen-sm-min) {
152-
top: (@navbar-os-header-height-desktop + @tech-preview-banner-height);
153-
}
154-
}
155-
.tech-preview.has-project-bar & {
156-
top: (@navbar-os-header-height-mobile + @project-bar-height-mobile + @tech-preview-banner-height);
157-
@media(min-width: @screen-sm-min) {
158-
top: (@navbar-os-header-height-desktop + @project-bar-height-desktop + @tech-preview-banner-height);
159-
}
160-
}
161143
}

‎app/styles/main.less

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
@import "_system-status.less";
4747
@import "_tables.less";
4848
@import "_tile.less";
49-
@import "_tech-preview.less";
5049
@import "_tooltip.less";
5150
@import "_typography.less";
5251
@import "_spacers.less";

‎dist/index.html

+3
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,16 @@
2424
<style type="text/css"></style>
2525
</head>
2626
<body class="console-os" ng-class="{ 'has-project-bar': view.hasProject }">
27+
<<<<<<< a5da1b179d68d0e1ea25e921f5b5fe11378cdd27
2728
<<<<<<< 33eb37eab8df0c17bc226501a924a2dc2b9b2f41
2829
<osc-header></osc-header>
2930
<toast-notifications></toast-notifications>
3031
<notification-drawer-wrapper></notification-drawer-wrapper>
3132
<<<<<<< b9f74dc9163281caa65a7366573d340fa288654d
3233
=======
3334
<p ng-if="globalTechPreviewIndicator" ng-cloak class="tech-preview-banner">Technology preview is enabled</p>
35+
=======
36+
>>>>>>> Removing orphaned tech-preview less and markup
3437
<osc-header></osc-header>
3538
<toast-notifications></toast-notifications>
3639
<notification-drawer-wrapper></notification-drawer-wrapper>

0 commit comments

Comments
 (0)