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

[stable28] fix(AdminSettings): fix style specificity #10984

Merged
merged 1 commit into from
Nov 23, 2023
Merged

[stable28] fix(AdminSettings): fix style specificity #10984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/components/AdminSettings/HostedSignalingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<template>
<section v-if="showForm"
id="hosted_signaling_server"
class="videocalls section">
class="hosted-signaling section">
<h2>
{{ t('spreed', 'Hosted high-performance backend') }}
</h2>
Expand Down Expand Up @@ -273,15 +273,21 @@ export default {
</script>

<style lang="scss" scoped>
.form {
&__textfield,
&__select {
width: 300px;
}
.hosted-signaling {
.form {
&__textfield {
width: 300px;
margin-top: 12px;
}

&__label {
display: block;
padding: 4px 0;
&__select {
width: 300px;
}

&__label {
display: block;
padding: 4px 0;
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/AdminSettings/RecordingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,9 @@ export default {
display: flex;
align-items: center;

&__textfield {
& &__textfield {
width: 300px;
flex-shrink: 0;
}

&__checkbox {
Expand Down
8 changes: 5 additions & 3 deletions src/components/AdminSettings/RecordingServers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
-->

<template>
<section id="recording_server" class="videocalls section">
<section id="recording_server" class="recording-servers section">
<h2>
{{ t('spreed', 'Recording backend') }}
</h2>
Expand Down Expand Up @@ -235,8 +235,10 @@ export default {
</script>

<style lang="scss" scoped>
.form__textfield {
width: 300px;
.recording-servers {
.form__textfield {
width: 300px;
}
}

.additional-top-margin {
Expand Down
34 changes: 18 additions & 16 deletions src/components/AdminSettings/SIPBridge.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<div id="sip-bridge" class="section">
<div id="sip-bridge" class="sip-bridge section">
<h2>{{ t('spreed', 'SIP configuration') }}</h2>

<NcNoteCard v-if="!showForm" type="warning">
Expand Down Expand Up @@ -233,25 +233,27 @@ export default {
</script>

<style lang="scss" scoped>
h3 {
margin-top: 24px;
font-weight: 600;
}
.sip-bridge {
h3 {
margin-top: 24px;
font-weight: 600;
}

.form {
width: 300px;
.form {
width: 300px;

&__textarea {
margin-bottom: 6px;
}
&__textarea {
margin-bottom: 6px;
}

&__select {
margin-bottom: 12px;
}
&__select {
margin-bottom: 12px;
}

&__label {
display: block;
padding: 4px 0;
&__label {
display: block;
padding: 4px 0;
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/AdminSettings/SignalingServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,9 @@ export default {
display: flex;
align-items: center;

&__textfield {
& &__textfield {
width: 300px;
flex-shrink: 0;
}

&__checkbox {
Expand Down
8 changes: 5 additions & 3 deletions src/components/AdminSettings/SignalingServers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
-->

<template>
<section id="signaling_server" class="videocalls section">
<section id="signaling_server" class="signaling-servers section">
<h2>
{{ t('spreed', 'High-performance backend') }}
</h2>
Expand Down Expand Up @@ -196,8 +196,10 @@ export default {
</script>

<style lang="scss" scoped>
.form__textfield {
width: 300px;
.signaling-servers {
.form__textfield {
width: 300px;
}
}

.additional-top-margin {
Expand Down
11 changes: 3 additions & 8 deletions src/components/AdminSettings/TurnServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,19 +392,14 @@ export default {
grid-column-gap: 4px;
margin-bottom: 4px;

&__textfield {
height: 48px;

& :deep(.input-field__input) {
height: 48px !important;
}

& &__textfield {
&.error :deep(.input-field__input) {
border: 2px solid var(--color-error);
}
}

&__select {
& &__select {
margin-block-start: 6px;
min-width: unset;
}
}
Expand Down