chore: Cleanup page-top-bar style conflicts (#2407)

* chore: Class name cleanup page-top-bar.

* prettier spacing fixes

* Review fixes and adds storybook

* Circleci fixes
This commit is contained in:
Sivin Varghese 2021-06-10 09:35:15 +05:30 committed by GitHub
parent 174886671d
commit 8ca63f0b79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 70 additions and 30 deletions

View file

@ -1,9 +1,5 @@
.settings { .settings {
overflow: auto; overflow: auto;
.page-top-bar {
@include padding($space-normal $space-two $zero);
}
} }
// Conversation header - Light BG // Conversation header - Light BG
@ -27,7 +23,6 @@
@include flex-align($x: center, $y: middle); @include flex-align($x: center, $y: middle);
@include margin($zero); @include margin($zero);
} }
} }
.wizard-box { .wizard-box {

View file

@ -264,10 +264,6 @@ export default {
.modal-container { .modal-container {
width: 40rem; width: 40rem;
} }
.page-top-bar {
padding-bottom: $space-two;
}
} }
.account-selector { .account-selector {

View file

@ -0,0 +1,30 @@
import SettingIntroBanner from './SettingIntroBanner';
export default {
title: 'Components/Settings/Banner',
component: SettingIntroBanner,
argTypes: {
headerTitle: {
defaultValue: 'Acme Support',
control: {
type: 'text',
},
},
headerContent: {
defaultValue:
'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.',
control: {
type: 'text',
},
},
},
};
const Template = (args, { argTypes }) => ({
props: Object.keys(argTypes),
components: { SettingIntroBanner },
template: '<setting-intro-banner v-bind="$props" ></setting-intro-banner>',
});
export const Banner = Template.bind({});
Banner.args = {};

View file

@ -0,0 +1,33 @@
<template>
<div class="column page-top-banner">
<h2 class="page-sub-title">
{{ headerTitle }}
</h2>
<p v-if="headerContent" class="small-12 column">
{{ headerContent }}
</p>
<slot></slot>
</div>
</template>
<script>
export default {
props: {
headerTitle: {
type: String,
default: '',
},
headerContent: {
type: String,
default: '',
},
},
};
</script>
<style lang="scss" scoped>
.page-top-banner {
border-bottom: 1px solid var(--color-border);
background: var(--color-background-light);
padding: var(--space-normal) var(--space-large) 0;
}
</style>

View file

@ -1,6 +1,6 @@
<template> <template>
<div class="settings columns container"> <div class="settings columns container">
<woot-modal-header <setting-intro-banner
:header-image="inbox.avatarUrl" :header-image="inbox.avatarUrl"
:header-title="inboxName" :header-title="inboxName"
> >
@ -12,7 +12,7 @@
:show-badge="false" :show-badge="false"
/> />
</woot-tabs> </woot-tabs>
</woot-modal-header> </setting-intro-banner>
<div v-if="selectedTabKey === 'inbox_settings'" class="settings--content"> <div v-if="selectedTabKey === 'inbox_settings'" class="settings--content">
<settings-section <settings-section
@ -265,6 +265,7 @@ import { mapGetters } from 'vuex';
import { createMessengerScript } from 'dashboard/helper/scriptGenerator'; import { createMessengerScript } from 'dashboard/helper/scriptGenerator';
import configMixin from 'shared/mixins/configMixin'; import configMixin from 'shared/mixins/configMixin';
import alertMixin from 'shared/mixins/alertMixin'; import alertMixin from 'shared/mixins/alertMixin';
import SettingIntroBanner from 'dashboard/components/widgets/SettingIntroBanner';
import SettingsSection from '../../../../components/SettingsSection'; import SettingsSection from '../../../../components/SettingsSection';
import inboxMixin from 'shared/mixins/inboxMixin'; import inboxMixin from 'shared/mixins/inboxMixin';
import FacebookReauthorize from './facebook/Reauthorize'; import FacebookReauthorize from './facebook/Reauthorize';
@ -274,6 +275,7 @@ import Campaign from './components/Campaign';
export default { export default {
components: { components: {
SettingIntroBanner,
SettingsSection, SettingsSection,
FacebookReauthorize, FacebookReauthorize,
PreChatFormSettings, PreChatFormSettings,
@ -518,16 +520,10 @@ export default {
} }
} }
.page-top-bar {
@include background-light;
@include border-normal-bottom;
padding: $space-normal $space-large 0;
.tabs { .tabs {
padding: 0; padding: 0;
margin-bottom: -1px; margin-bottom: -1px;
} }
}
} }
.widget--feature-flag { .widget--feature-flag {

View file

@ -207,8 +207,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.content-box .page-top-bar::v-deep {
padding: var(--space-large) var(--space-large) var(--space-zero);
}
</style>

View file

@ -239,8 +239,3 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss" scoped>
.content-box .page-top-bar::v-deep {
padding: var(--space-large) var(--space-large) var(--space-zero);
}
</style>