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

fix: Update the color (dark grey) in connectors admin - MEED-3067 - Meeds-io/meeds#1430 (#141) #142

Merged
merged 1 commit into from
Jan 3, 2024
Merged

fix: Update the color (dark grey) in connectors admin - MEED-3067 - Meeds-io/meeds#1430 (#141) #142

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions ...p/vue-app/githubAdminConnectorExtension/components/GithubAdminConnectionSettingDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
:step="1"
class="ma-0 pa-0"
editable>
<span class="font-weight-bold dark-grey-color text-subtitle-1">{{ $t('githubConnector.admin.label.stepOne') }}</span>
<span class="font-weight-bold text-color text-subtitle-1">{{ $t('githubConnector.admin.label.stepOne') }}</span>
</v-stepper-step>
<v-stepper-items>
<v-stepper-content step="1" class="mx-0 px-0">
<v-slide-y-transition>
<div class="pb-4 d-flex flex-column dark-grey-color">
<v-card-text class="ps-0 py-0 dark-grey-color">
<div class="pb-4 d-flex flex-column text-color">
<v-card-text class="ps-0 py-0 text-color">
{{ $t('githubConnector.admin.label.stepOne.noteOne') }}
</v-card-text>
<v-card-text class="ps-0 pb-0 dark-grey-color">
<v-card-text class="ps-0 pb-0 text-color">
{{ $t('githubConnector.admin.label.stepOne.instructionsOne') }}
</v-card-text>
<v-card-text class="ps-0 py-0 dark-grey-color">
<v-card-text class="ps-0 py-0 text-color">
{{ $t('githubConnector.admin.label.stepOne.instructionsTwo') }}
<a href="https://github.com/settings/apps" target="_blank">{{ $t('githubConnector.admin.label.developerSettings') }}
<v-icon size="14" class="pb-1 pe-1">fas fa-external-link-alt</v-icon>
Expand All @@ -71,23 +71,23 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
:step="2"
class="ma-0 pa-0"
editable>
<span class="font-weight-bold dark-grey-color text-subtitle-1">{{ $t('githubConnector.admin.label.stepTwo') }}</span>
<span class="font-weight-bold text-color text-subtitle-1">{{ $t('githubConnector.admin.label.stepTwo') }}</span>
</v-stepper-step>
<v-stepper-items>
<v-stepper-content step="2" class="mx-0 px-0">
<v-slide-y-transition>
<div class="pb-4 d-flex flex-column dark-grey-color">
<v-card-text class="ps-0 py-0 dark-grey-color">
<div class="pb-4 d-flex flex-column text-color">
<v-card-text class="ps-0 py-0 text-color">
{{ $t('githubConnector.admin.label.stepTwo.instructionsOne') }}
<a href="https://github.com/settings/developers" target="_blank">{{ $t('githubConnector.admin.label.oAuthApps') }} </a>
</v-card-text>
<v-card-text class="ps-0 pt-0 py-0 dark-grey-color">
<v-card-text class="ps-0 pt-0 py-0 text-color">
{{ $t('githubConnector.admin.label.stepTwo.instructionsTwo') }}
</v-card-text>
<v-card-text class="ps-0 py-0 dark-grey-color">
<v-card-text class="ps-0 py-0 text-color">
{{ $t('githubConnector.admin.label.stepTwo.instructionsThree') }}
</v-card-text>
<v-card-text class="dark-grey-color pb-1">
<v-card-text class="text-color pb-1">
{{ $t('githubConnector.admin.label.homepageURL') }}:
</v-card-text>
<div class="d-flex flex-row">
Expand All @@ -102,7 +102,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<v-icon>fas fa-copy</v-icon>
</v-btn>
</div>
<v-card-text class="dark-grey-color pb-1">
<v-card-text class="text-color pb-1">
{{ $t('githubConnector.admin.label.authorizationCallbackURL') }}:
</v-card-text>
<div class="d-flex flex-row">
Expand All @@ -127,24 +127,24 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
:step="3"
class="ma-0 pa-0"
editable>
<span class="font-weight-bold dark-grey-color text-subtitle-1">{{ $t('githubConnector.admin.label.stepThree') }}</span>
<span class="font-weight-bold text-color text-subtitle-1">{{ $t('githubConnector.admin.label.stepThree') }}</span>
</v-stepper-step>
<v-stepper-items>
<v-stepper-content step="3" class="mx-0 px-0">
<v-slide-y-transition>
<div class="pb-4 d-flex flex-column dark-grey-color">
<v-card-text class="ps-0 py-0 pb-4 dark-grey-color">
<div class="pb-4 d-flex flex-column text-color">
<v-card-text class="ps-0 py-0 pb-4 text-color">
{{ $t('githubConnector.admin.label.stepThree.instructionsOne') }}
</v-card-text>
<img
class="align-self-center"
src="/gamification-github/skin/images/github-oauth-creation.png"
alt="SignUpAgreement"
width="300">
<v-card-text class="ps-0 pb-4 dark-grey-color">
<v-card-text class="ps-0 pb-4 text-color">
{{ $t('githubConnector.admin.label.stepThree.instructionsTwo') }}
</v-card-text>
<v-card-text class="text-left ps-0 py-0 dark-grey-color">
<v-card-text class="text-left ps-0 py-0 text-color">
{{ $t('githubConnector.admin.label.clientId') }}
</v-card-text>
<v-card-text class="ps-0 pt-2">
Expand All @@ -158,7 +158,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@input="disabled = false"
@change="disabled = false">
</v-card-text>
<v-card-text class="text-left ps-0 py-0 dark-grey-color">
<v-card-text class="text-left ps-0 py-0 text-color">
{{ $t('githubConnector.admin.label.clientSecret') }}
</v-card-text>
<v-card-text class="ps-0 pt-2">
Expand Down
2 changes: 1 addition & 1 deletion .../webapp/vue-app/githubAdminConnectorExtension/components/GithubAdminConnectorHookList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<v-card class="pt-5 px-4" flat>
<div class="d-flex flex-row">
<div>
<v-card-text class="px-0 py-0 dark-grey-color font-weight-bold">
<v-card-text class="px-0 py-0 text-color font-weight-bold">
{{ $t('githubConnector.webhook.label.watchProject') }}
</v-card-text>
<v-card-text class="dark-grey-color px-0 pt-0">
Expand Down
6 changes: 3 additions & 3 deletions ...main/webapp/vue-app/githubAdminConnectorExtension/components/GithubAdminConnectorItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
outlined
v-on="on"
@click="backToConnectorDetail">
<v-icon size="18" class="icon-default-color mx-2">fa-arrow-left</v-icon>
<span class="text-header-title">{{ $t('githubConnector.admin.label.configuration') }}</span>
<v-icon size="18" class="text-color mx-2">fa-arrow-left</v-icon>
<span class="text-color font-weight-bold icon-default-size">{{ $t('githubConnector.admin.label.configuration') }}</span>
</v-btn>
</template>
<span>{{ $t('gamification.connectors.settings.BackToDetail') }}</span>
Expand All @@ -41,7 +41,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</div>
<div class="d-flex flex-row px-4">
<div>
<v-card-text class="px-0 py-0 dark-grey-color font-weight-bold">
<v-card-text class="px-0 py-0 text-color font-weight-bold">
{{ $t('githubConnector.admin.label.connect') }}
</v-card-text>
<v-card-text class="dark-grey-color px-0 pt-0">
Expand Down
22 changes: 11 additions & 11 deletions ...ain/webapp/vue-app/githubAdminConnectorExtension/components/GithubAdminHookFormDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,32 +40,32 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<v-stepper-step
step="1"
class="ma-0">
<span class="font-weight-bold dark-grey-color text-subtitle-1">{{ $t('githubConnector.admin.label.addAccessToken') }}</span>
<span class="font-weight-bold text-color text-subtitle-1">{{ $t('githubConnector.admin.label.addAccessToken') }}</span>
</v-stepper-step>
<v-slide-y-transition>
<div v-show="stepper === 1" class="px-6">
<div class="pb-4 d-flex flex-column dark-grey-color">
<v-card-text class="ps-0 dark-grey-color">
<div class="pb-4 d-flex flex-column text-color">
<v-card-text class="ps-0 text-color">
{{ $t('githubConnector.admin.label.accessToken.instructions.stepOne') }}
(<a href="https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic" target="_blank">{{ $t('githubConnector.admin.label.seeMore') }}
<v-icon size="14" class="pb-1 pe-1">fas fa-external-link-alt</v-icon>
</a>)
</v-card-text>
<v-card-text class="pt-0 ps-0 dark-grey-color">
<v-card-text class="pt-0 ps-0 text-color">
{{ $t('githubConnector.admin.label.accessToken.instructions.stepTwo') }}
</v-card-text>
<v-card-text class="pt-0 pb-1 ps-0 dark-grey-color">
<v-card-text class="pt-0 pb-1 ps-0 text-color">
{{ $t('githubConnector.admin.label.accessToken.instructions.stepThree') }} :
</v-card-text>
<span class="pt-0 ps-0 dark-grey-color">
<span class="pt-0 ps-0 text-color">
- repo
</span>
<span class="pt-0 ps-0 dark-grey-color">
<span class="pt-0 ps-0 text-color">
- admin:org_hook
</span>
</div>
<div class="d-flex flex-column py-0">
<v-card-text class="pt-0 pb-1 ps-0 dark-grey-color subtitle-1">
<v-card-text class="pt-0 pb-1 ps-0 text-color subtitle-1">
{{ $t('githubConnector.admin.label.accessToken') }}
</v-card-text>
<v-text-field
Expand All @@ -91,7 +91,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
</v-slide-x-reverse-transition>
</template>
</v-text-field>
<span v-if="isTokenEditing && accessTokenInput" class="text-caption dark-grey-color">{{ $t('githubConnector.webhook.message.confirmBeforeProceeding') }} ↵</span>
<span v-if="isTokenEditing && accessTokenInput" class="text-caption text-color">{{ $t('githubConnector.webhook.message.confirmBeforeProceeding') }} ↵</span>
</div>
</div>
</v-slide-y-transition>
Expand All @@ -101,11 +101,11 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
:complete="stepper > 2"
step="2"
class="ma-0">
<span class="font-weight-bold dark-grey-color text-subtitle-1">{{ $t('githubConnector.admin.label.identifyOrganization') }}</span>
<span class="font-weight-bold text-color text-subtitle-1">{{ $t('githubConnector.admin.label.identifyOrganization') }}</span>
</v-stepper-step>
<v-slide-y-transition>
<div v-show="stepper > 1" class="px-6">
<v-card-text class="d-flex flex-grow-1 text-no-wrap text-left dark-grey-color text-subtitle-1 pb-2 ps-0">
<v-card-text class="d-flex flex-grow-1 text-no-wrap text-left text-color text-subtitle-1 pb-2 ps-0">
{{ $t('githubConnector.admin.label.organization') }}
</v-card-text>
<v-card-text class="d-flex py-0 ps-0">
Expand Down