diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000000..2ff691238e --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,34 @@ +name: PushImage + +on: push + +permissions: + contents: read + packages: write + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + steps: + + - name: Extract branch name + id: extract_branch + run: echo "::set-output name=branch::$(echo ${GITHUB_REF#refs/heads/})" + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Log in to the Container registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build image and push to Docker Hub and GitHub Container Registry + uses: docker/build-push-action@v2 + with: + push: true + tags: ghcr.io/sul-dlss/folio-platform-complete:${{ steps.extract_branch.outputs.branch }} + file: ./docker/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile index 76a4755eca..b78a1613bb 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,8 +17,12 @@ RUN yarn config set python /usr/bin/python3 RUN yarn config set @folio:registry https://repository.folio.org/repository/npm-folio/ RUN yarn install RUN yarn build-module-descriptors -ARG OKAPI_URL=http://localhost:9130 -ARG TENANT_ID=diku + +COPY tenant-assets/MainNav.css node_modules/@folio/stripes-core/src/components/MainNav +COPY tenant-assets/Pane.css node_modules/@folio/stripes-components/lib/Pane + +ARG OKAPI_URL=https://okapi-dev.stanford.edu +ARG TENANT_ID=sul RUN yarn build output --okapi $OKAPI_URL --tenant $TENANT_ID # nginx stage diff --git a/stripes.config.js b/stripes.config.js index 32d4a38728..5eacbeed58 100644 --- a/stripes.config.js +++ b/stripes.config.js @@ -4,6 +4,9 @@ module.exports = { logCategories: 'core,path,action,xhr', logPrefix: '--', maxUnpagedResourceCount: 2000, + welcomeMessage: 'FOLIO DEV - Stanford University', + platformName: 'FOLIO - Dev', + helpUrl: 'https://sites.google.com/stanford.edu/folio-training-central/help', showPerms: false }, modules: { @@ -59,7 +62,6 @@ module.exports = { '@folio/plugin-query-builder' : {}, '@folio/quick-marc': {}, '@folio/receiving' : {}, - '@folio/remote-storage' : {}, '@folio/requests' : {}, '@folio/servicepoints' : {}, "@folio/service-interaction": {}, @@ -71,11 +73,11 @@ module.exports = { }, branding: { logo: { - src: './tenant-assets/opentown-libraries-logo.png', - alt: 'Opentown Libraries', + src: './tenant-assets/SUSig_2color_Stree_StnfrdOnly_Left.png', + alt: 'Stanford University', }, favicon: { - src: './tenant-assets/opentown-libraries-favicon.png', + src: './tenant-assets/stanford-favicon.png', }, } -}; \ No newline at end of file +}; diff --git a/tenant-assets/MainNav.css b/tenant-assets/MainNav.css new file mode 100644 index 0000000000..b6b7e9505d --- /dev/null +++ b/tenant-assets/MainNav.css @@ -0,0 +1,51 @@ +@import '@folio/stripes-components/lib/variables.css'; + +:root { + --main-nav-min-height-desktop: 56px; + --main-nav-min-height-mobile: 48px; + --main-nav-border-bottom-color: rgba(0, 0, 0, 0.9); + --main-nav-background-color: rgb(111, 143, 175); + --main-nav-text-color: #ffffff; +} + +.navRoot { + background-color: var(--main-nav-background-color); + border-bottom: 1px solid var(--main-nav-border-bottom-color); + color: var(--main-nav-text-color); + display: flex; + justify-content: space-between; + align-content: stretch; + align-items: center; + width: 100%; + flex: 0 0 auto; + padding: 0 var(--gutter-static-one-third); + min-height: var(--main-nav-min-height-desktop); + z-index: 99999; + position: relative; + + & li { + color: var(--color-text); + } +} + +.nowrap { + white-space: nowrap; +} + +.startSection, +.endSection { + display: flex; + align-items: center; +} + +.endSection { + flex: 1; + justify-content: flex-end; + min-width: 0; +} + +@media (--medium-down) { + .navRoot { + min-height: var(--main-nav-min-height-mobile); + } +} diff --git a/tenant-assets/Pane.css b/tenant-assets/Pane.css new file mode 100644 index 0000000000..7c1644ac06 --- /dev/null +++ b/tenant-assets/Pane.css @@ -0,0 +1,73 @@ +@import '../variables.css'; + +.pane { + background: var(--bg); + border-right: 1px solid var(--color-border); + height: 100%; + max-height: calc(100vh - 44px); + display: flex; + flex-direction: column; + top: 0; + left: 0; + width: 100%; + + /* transition: all .25s ease-in-out; */ + overflow: hidden; + position: absolute; + will-change: transform; + + @media print { + overflow: visible; + } +} + +.focusIndicator { + composes: focusWithinIndicator from "../sharedStyles/focusWithinIndicator.css"; +} + +[dir="ltr"] .pane:last-child { + border-right: none; +} + +[dir="rtl"] .pane:first-child { + border-right: none; +} + +[dir="rtl"] .pane:last-child { + border-left: none; +} + +/** + * Pane Content + */ + +.paneContent { + height: 100%; + width: 100%; + overflow: auto; + outline: 0; + position: relative; + + &.hasPadding { + padding: var(--gutter-static); + } + + &.noOverflow { + overflow: hidden; + } + + @media print { + overflow: visible; + } +} + +.container { + max-width: var(--container-max-width); + margin: auto; +} + +@media (--medium-up) { + .pane { + position: relative; + } +} \ No newline at end of file diff --git a/tenant-assets/SUSig_2color_Stree_StnfrdOnly_Left.png b/tenant-assets/SUSig_2color_Stree_StnfrdOnly_Left.png new file mode 100644 index 0000000000..864708c785 Binary files /dev/null and b/tenant-assets/SUSig_2color_Stree_StnfrdOnly_Left.png differ diff --git a/tenant-assets/stanford-favicon.ico b/tenant-assets/stanford-favicon.ico new file mode 100644 index 0000000000..49e70f583a Binary files /dev/null and b/tenant-assets/stanford-favicon.ico differ diff --git a/tenant-assets/stanford-favicon.png b/tenant-assets/stanford-favicon.png new file mode 100644 index 0000000000..50566b7730 Binary files /dev/null and b/tenant-assets/stanford-favicon.png differ diff --git a/yarn.lock b/yarn.lock index 8add26f415..e9d4c7b4a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8527,7 +8527,7 @@ postcss-calc@^9.0.1: postcss-selector-parser "^6.0.11" postcss-value-parser "^4.2.0" -"postcss-color-function@github:folio-org/postcss-color-function": +postcss-color-function@folio-org/postcss-color-function: version "4.1.0" resolved "https://codeload.github.com/folio-org/postcss-color-function/tar.gz/c128aad740ae740fb571c4b6493f467dd51efe85" dependencies: