Skip to content

Commit 5142212

Browse files
alexefemirot
authored andcommitted
fix: misc css fixes for mobile (argoproj#5705) (argoproj#11508)
* Misc css fixes for mobile Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> * More fixes for mobile Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> * fix ui tests. bring back application status labels Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> Signed-off-by: emirot <emirot.nolan@gmail.com>
1 parent 87e18ec commit 5142212

File tree

8 files changed

+96
-10
lines changed

8 files changed

+96
-10
lines changed

ui/src/app/applications/components/application-deployment-history/application-deployment-history.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ export const ApplicationDeploymentHistory = ({
3232
<div className='row application-deployment-history__item' key={info.deployedAt} onClick={() => selectDeployment(index)}>
3333
<div className='columns small-3'>
3434
<div>
35-
<i className='fa fa-clock' /> Deployed At:
35+
<i className='fa fa-clock' /> <span class='show-for-large'>Deployed At:</span>
3636
<br />
3737
<Timestamp date={info.deployedAt} />
3838
</div>
3939
<div>
4040
<br />
41-
<i className='fa fa-hourglass-half' /> Time to deploy:
41+
<i className='fa fa-hourglass-half' /> <span class='show-for-large'>Time to deploy:</span>
4242
<br />
4343
{(info.deployStartedAt && <Duration durationMs={moment(info.deployedAt).diff(moment(info.deployStartedAt)) / 1000} />) || 'Unknown'}
4444
</div>

ui/src/app/applications/components/application-details/application-details.scss

+71
Original file line numberDiff line numberDiff line change
@@ -274,3 +274,74 @@ $header: 120px;
274274
}
275275
}
276276
}
277+
278+
279+
@media screen and (max-width: map-get($breakpoints, large)) {
280+
.sliding-panel__body {
281+
padding: 4px !important;
282+
}
283+
.sliding-panel--is-middle .sliding-panel__wrapper {
284+
width: 90% !important;
285+
}
286+
.sliding-panel--is-middle .sliding-panel__body {
287+
padding: 18px !important;
288+
}
289+
.sliding-panel__close {
290+
z-index: 2 !important;
291+
}
292+
.top-bar__title {
293+
display: none;
294+
}
295+
296+
.top-bar__left-side {
297+
white-space: normal !important;
298+
}
299+
.top-bar__left-side > div {
300+
display: block !important;
301+
}
302+
.top-bar__right-side {
303+
justify-content: right !important;
304+
}
305+
.application-status-panel.row {
306+
flex-flow: unset;
307+
}
308+
.application-status-panel__item label {
309+
margin-right: 0;
310+
}
311+
.application-status-panel__item {
312+
padding: 5px 10px;
313+
}
314+
315+
.white-box, .tabs__content {
316+
padding: 4px !important;
317+
}
318+
.white-box__details-row .columns.small-3 {
319+
overflow-wrap: unset !important;
320+
overflow: scroll;
321+
}
322+
.white-box__details-row .columns.small-9{
323+
padding-left: 4px;
324+
}
325+
326+
.resource-details__header h1 {
327+
font-size: 16px;
328+
}
329+
.resource-details__header {
330+
margin-top: 30px;
331+
padding-right: 4px;
332+
}
333+
334+
.tabs__nav a:first-child, .tabs__nav a {
335+
margin-left: 0 !important;
336+
}
337+
338+
.editable-panel__buttons {
339+
top: unset;
340+
}
341+
}
342+
343+
@media screen and (max-width: map-get($breakpoints, medium)) {
344+
.sb-page-wrapper .top-bar.row {
345+
display: none !important;
346+
}
347+
}

ui/src/app/applications/components/application-status-panel/application-status-panel.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export const ApplicationStatusPanel = ({application, showOperation, showConditio
8888
<div>
8989
<ComparisonStatusIcon status={application.status.sync.status} label={true} />
9090
</div>
91-
<div className='application-status-panel__item-value__revision'>{syncStatusMessage(application)}</div>
91+
<div className='application-status-panel__item-value__revision show-for-large'>{syncStatusMessage(application)}</div>
9292
</div>
9393
{application.status && application.status.sync && application.status.sync.revision && !application.spec.source.chart && (
9494
<div className='application-status-panel__item-name'>
@@ -121,7 +121,7 @@ export const ApplicationStatusPanel = ({application, showOperation, showConditio
121121
<OperationState app={application} />{' '}
122122
</a>
123123
{appOperationState.syncResult && appOperationState.syncResult.revision && (
124-
<div className='application-status-panel__item-value__revision'>
124+
<div className='application-status-panel__item-value__revision show-for-large'>
125125
To <Revision repoUrl={application.spec.source.repoURL} revision={appOperationState.syncResult.revision} />
126126
</div>
127127
)}

ui/src/app/applications/components/application-summary/application-summary.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ export const ApplicationSummary = (props: ApplicationSummaryProps) => {
174174
load={src => services.repos.charts(src.repoURL).catch(() => new Array<models.HelmChart>())}>
175175
{(charts: models.HelmChart[]) => (
176176
<div className='row'>
177-
<div className='columns small-10'>
177+
<div className='columns small-8'>
178178
<FormField
179179
formApi={formApi}
180180
field='spec.source.chart'
@@ -192,7 +192,7 @@ export const ApplicationSummary = (props: ApplicationSummaryProps) => {
192192
return (chartInfo && chartInfo.versions) || new Array<string>();
193193
}}>
194194
{(versions: string[]) => (
195-
<div className='columns small-2'>
195+
<div className='columns small-4'>
196196
<FormField
197197
formApi={formApi}
198198
field='spec.source.targetRevision'

ui/src/app/applications/components/applications-list/applications-list.scss

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
.applications-list {
66
padding: 1em;
7+
@media screen and (max-width: 1024px) {
8+
padding: 0;
9+
}
710
min-height: 88vh;
811
&__title {
912
font-weight: bolder;
@@ -208,3 +211,11 @@
208211
i.menu_icon {
209212
vertical-align: middle;
210213
}
214+
215+
.argo-button {
216+
i {
217+
@media screen and (max-width: map-get($breakpoints, large)) {
218+
margin: 0 auto !important;
219+
}
220+
}
221+
}

ui/src/app/applications/components/applications-list/applications-list.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ const FlexTopBar = (props: {toolbar: Toolbar | Observable<Toolbar>}) => {
291291
style={{marginRight: 2}}
292292
key={i}>
293293
{item.iconClassName && <i className={item.iconClassName} style={{marginLeft: '-5px', marginRight: '5px'}} />}
294-
{item.title}
294+
<span className='show-for-large'>{item.title}</span>
295295
</button>
296296
))}
297297
</React.Fragment>

ui/src/app/applications/components/resource-details/resource-details.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ export const ResourceDetails = (props: ResourceDetailsProps) => {
307307
onClick={() => appContext.navigation.goto('.', {deploy: AppUtils.nodeKey(selectedNode)}, {replace: true})}
308308
style={{marginLeft: 'auto', marginRight: '5px'}}
309309
className='argo-button argo-button--base'>
310-
<i className='fa fa-sync-alt' /> SYNC
310+
<i className='fa fa-sync-alt' /> <span className='show-for-large'>SYNC</span>
311311
</button>
312312
<button
313313
onClick={() => AppUtils.deletePopup(appContext, selectedNode, application)}
314314
style={{marginRight: '5px'}}
315315
className='argo-button argo-button--base'>
316-
<i className='fa fa-trash' /> DELETE
316+
<i className='fa fa-trash' /> <span className='show-for-large'>DELETE</span>
317317
</button>
318318
<DropDown
319319
isMenu={true}

ui/src/app/shared/components/timestamp.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import Moment from 'react-moment';
44
export const Timestamp = ({date}: {date: string | number}) => {
55
return (
66
<span>
7-
<Moment fromNow={true}>{date}</Moment> (<Moment local={true}>{date}</Moment>)
7+
<Moment fromNow={true}>{date}</Moment>
8+
<span className='show-for-large'>
9+
{' '}
10+
(<Moment local={true}>{date}</Moment>)
11+
</span>
812
</span>
913
);
1014
};

0 commit comments

Comments
 (0)