diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml deleted file mode 100644 index 0e99ffd..0000000 --- a/.github/workflows/firebase-hosting-merge.yml +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by the Firebase CLI -# https://github.com/firebase/firebase-tools - -name: Deploy to Firebase Hosting on merge -'on': - push: - branches: - - master -jobs: - build_and_deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: npm ci && npm run build - - uses: FirebaseExtended/action-hosting-deploy@v0 - with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_STACJOWNIK_TD2 }}' - channelId: live - projectId: stacjownik-td2 diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml deleted file mode 100644 index b285e68..0000000 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Deploy to Firebase Hosting on PR -'on': pull_request -jobs: - build_and_preview: - if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: npm ci && npm run build - - uses: FirebaseExtended/action-hosting-deploy@v0 - with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_STACJOWNIK_TD2 }}' - projectId: stacjownik-td2 \ No newline at end of file diff --git a/package.json b/package.json index bff377b..084419a 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "scripts": { "dev": "vite", "build": "vue-tsc --noEmit && vite build", + "deploy": "yarn build && firebase deploy --only hosting", "preview": "vite preview" }, "dependencies": { diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 6cebdc7..e3fd302 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -293,7 +293,7 @@ export default defineComponent({ @import '../../styles/variables.scss'; @import '../../styles/icons.scss'; -$rowCol: #4b4b4b; +$rowCol: #424242; .change-anim { &-enter-active, diff --git a/src/styles/filters_options.scss b/src/styles/filters_options.scss index 0f07283..ff01048 100644 --- a/src/styles/filters_options.scss +++ b/src/styles/filters_options.scss @@ -115,6 +115,8 @@ h1.option-title { button { margin: 0.25em 0.5em; + background-color: #424242; + color: white; } } diff --git a/src/styles/search_box.scss b/src/styles/search_box.scss index e3848d5..183a5a2 100644 --- a/src/styles/search_box.scss +++ b/src/styles/search_box.scss @@ -20,14 +20,14 @@ &-input { border: none; border-radius: 0.5em 0 0 0.5em; - background-color: #333; + background-color: #424242; padding: 0.35em 0.5em; width: 100%; } &-exit { - background-color: #333; + background-color: #424242; padding: 0 0.5em; border-radius: 0 0.5em 0.5em 0;