Skip to content

Commit 8f93354

Browse files
authored
fix(styling): ensure authorize button stays on the right (#9387)
Refs #8940 Refs #9325
1 parent 3238718 commit 8f93354

File tree

2 files changed

+39
-13
lines changed

2 files changed

+39
-13
lines changed

src/core/components/layouts/base.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,12 @@ export default class BaseLayout extends React.Component {
112112
{hasServers || hasSchemes || hasSecurityDefinitions ? (
113113
<div className="scheme-container">
114114
<Col className="schemes wrapper" mobile={12}>
115-
{hasServers ? <ServersContainer /> : null}
116-
{hasSchemes ? <SchemesContainer /> : null}
115+
{hasServers || hasSchemes ? (
116+
<div className="schemes-server-container">
117+
{hasServers ? <ServersContainer /> : null}
118+
{hasSchemes ? <SchemesContainer /> : null}
119+
</div>
120+
) : null}
117121
{hasSecurityDefinitions ? <AuthorizeBtnContainer /> : null}
118122
</Col>
119123
</div>

src/style/_layout.scss

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -795,26 +795,48 @@
795795

796796
gap: 10px;
797797

798-
> label
798+
/*
799+
This wraps the servers or schemes selector.
800+
This was added to make sure the Authorize button is always on the right
801+
and the servers or schemes selector is always on the left.
802+
*/
803+
> .schemes-server-container
799804
{
800-
font-size: 12px;
801-
font-weight: bold;
802-
803805
display: flex;
804-
flex-direction: column;
806+
flex-wrap: wrap;
805807

806-
margin: -20px 15px 0 0;
808+
gap: 10px;
807809

808-
@include text_headline();
809-
810-
select
810+
> label
811811
{
812-
min-width: 130px;
812+
font-size: 12px;
813+
font-weight: bold;
814+
815+
display: flex;
816+
flex-direction: column;
813817

814-
text-transform: uppercase;
818+
margin: -20px 15px 0 0;
819+
820+
@include text_headline();
821+
822+
select
823+
{
824+
min-width: 130px;
825+
826+
text-transform: uppercase;
827+
}
815828
}
816829
}
817830

831+
/*
832+
This checks if the schemes-server-container is not present and
833+
aligns the authorize button to the right
834+
*/
835+
&:not(:has(.schemes-server-container))
836+
{
837+
justify-content: flex-end;
838+
}
839+
818840
/*
819841
Target Authorize Button in schemes wrapper
820842
This was added here to fix responsiveness issues with the authorize button

0 commit comments

Comments
 (0)