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

Improve integration manager dialog style #8888

Merged
merged 6 commits into from
Jun 25, 2022
Merged

Improve integration manager dialog style #8888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
45cd77d
Include in mx_IntegrationManager
luixxiul Jun 24, 2022
42b740c
yarn run lint:style --fix
luixxiul Jun 24, 2022
30463c3
Apply text-align to both loading and error div
luixxiul Jun 24, 2022
0abb1c2
Nesting etc.
luixxiul Jun 24, 2022
c504376
Enable padding, keeping the dialog size with the box-sizing declaration
luixxiul Jun 24, 2022
c9be1d7
Use Heading component
luixxiul Jun 24, 2022
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
56 changes: 29 additions & 27 deletions res/css/views/settings/_IntegrationManager.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,33 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_IntegrationManager .mx_Dialog {
width: 60%;
height: 70%;
overflow: hidden;
padding: 0px;
max-width: initial;
max-height: initial;
}

.mx_IntegrationManager iframe {
background-color: #fff;
border: 0px;
width: 100%;
height: 100%;
}

.mx_IntegrationManager_loading h3 {
text-align: center;
}

.mx_IntegrationManager_error {
text-align: center;
padding-top: 20px;
}

.mx_IntegrationManager_error h3 {
color: $alert;
.mx_IntegrationManager {
.mx_Dialog {
box-sizing: border-box;
width: 60%;
height: 70%;
overflow: hidden;
max-width: initial;
max-height: initial;
}

iframe {
background-color: #fff;
border: 0;
width: 100%;
height: 100%;
}

h3 {
margin-block: $spacing-20;
}

.mx_IntegrationManager_loading,
.mx_IntegrationManager_error {
text-align: center;
}

.mx_IntegrationManager_error h3 {
color: $alert;
}
}
5 changes: 3 additions & 2 deletions src/components/views/settings/IntegrationManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { ActionPayload } from '../../../dispatcher/payloads';
import Spinner from "../elements/Spinner";
import { getKeyBindingsManager } from "../../../KeyBindingsManager";
import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
import Heading from '../typography/Heading';

interface IProps {
// false to display an error saying that we couldn't connect to the integration manager
Expand Down Expand Up @@ -88,7 +89,7 @@ export default class IntegrationManager extends React.Component<IProps, IState>
if (this.props.loading) {
return (
<div className='mx_IntegrationManager_loading'>
<h3>{ _t("Connecting to integration manager...") }</h3>
<Heading size="h3">{ _t("Connecting to integration manager...") }</Heading>
<Spinner />
</div>
);
Expand All @@ -97,7 +98,7 @@ export default class IntegrationManager extends React.Component<IProps, IState>
if (!this.props.connected || this.state.errored) {
return (
<div className='mx_IntegrationManager_error'>
<h3>{ _t("Cannot connect to integration manager") }</h3>
<Heading size="h3">{ _t("Cannot connect to integration manager") }</Heading>
<p>{ _t("The integration manager is offline or it cannot reach your homeserver.") }</p>
</div>
);
Expand Down