Merge pull request #4848 from learningequality/unstable

Update `search-recommendations` with the latest from `unstable`

Author: bjester

.github/pull_request_template.md

@@ -45,21 +45,6 @@ jobs:
         npm rebuild node-sass
     - name: Run tests
       run: yarn run lint-frontend:format
-    - name: Check for modified files
-      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository
-      id: git-check
-      run: echo ::set-output name=modified::$(git diff-index --name-only HEAD)
-    - uses: tibdex/github-app-token@v2
-      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository && steps.git-check.outputs.modified != ''
-      id: generate-token
-      with:
-        app_id: ${{ secrets.CODE_FIX_APP_ID }}
-        private_key: ${{ secrets.CODE_FIX_APP_PRIVATE_KEY }}
-    - name: Push changes
-      if: github.event.pull_request && github.event.pull_request.head.repo.full_name == github.repository && steps.git-check.outputs.modified != ''
-      run: |
-        git config --global user.name 'Learning Equality'
-        git config --global user.email 'dev@learningequality.org'
-        git remote set-url origin https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com/${{ github.repository }}
-        git commit -am "Frontend linting of ${{ steps.git-check.outputs.modified }}"
-        git push
+    - name: Run pre-commit-ci-lite
+      uses: pre-commit-ci/lite-action@v1.1.0
+      if: always()

.github/workflows/frontendlint.yml

@@ -38,7 +38,7 @@ migrate:
 # 4) Remove the management command from this `deploy-migrate` recipe
 # 5) Repeat!
 deploy-migrate:
-	python contentcuration/manage.py rectify_incorrect_contentnode_source_fields
+	echo "Nothing to do here!"
 
 contentnodegc:
 	python contentcuration/manage.py garbage_collect

Makefile

@@ -4,7 +4,7 @@
     class="recommended-resource-card"
     :to="to"
     :title="title"
-    layout="horizontal"
+    orientation="horizontal"
     :headingLevel="headingLevel"
     thumbnailScaleType="contain"
     thumbnailDisplay="small"

contentcuration/contentcuration/frontend/RecommendedResourceCard/components/RecommendedResourceCard.vue

@@ -30,7 +30,7 @@
           <VListTileAction class="handle-col" :aria-hidden="!hover" @click.stop>
             <transition name="fade">
               <VBtn :disabled="copying" flat icon>
-                <Icon :color="$themePalette.grey.v_600" icon="dragVertical" />
+                <Icon :color="$themePalette.grey.v_700" icon="dragVertical" />
               </VBtn>
             </transition>
           </VListTileAction>

contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeEditListItem.vue

@@ -9,7 +9,7 @@
   <span v-else-if="error" class="mx-2">
     <VTooltip bottom lazy>
       <template #activator="{ on }">
-        <VIconWrapper :color="$themePalette.red.v_1100" v-on="on">
+        <VIconWrapper :color="$themePalette.red.v_600" v-on="on">
           error
         </VIconWrapper>
       </template>
@@ -19,7 +19,7 @@
   <span v-else-if="warning" class="mx-2">
     <VTooltip bottom lazy>
       <template #activator="{ on }">
-        <VIconWrapper :color="$themePalette.yellow.v_1100" v-on="on">
+        <VIconWrapper :color="$themePalette.yellow.v_600" v-on="on">
           warning
         </VIconWrapper>
       </template>

contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeValidator.vue

@@ -4562,7 +4562,7 @@ p {
   transition-property: box-shadow;
 }
 .v-card--hover:hover {
-  @extend %dropshadow-4dp;
+  @extend %dropshadow-6dp;
 }
 .v-card--hover.v-card--flat:hover {
   @extend %dropshadow-2dp;

contentcuration/contentcuration/frontend/shared/styles/vuetify.scss

@@ -9,8 +9,8 @@
       wrap="soft"
       aria-hidden="true"
       :style="[dynamicHeightStyle, {
-        backgroundColor: $themePalette.grey.v_50,
-        border: $themePalette.grey.v_100,
+        backgroundColor: $themePalette.grey.v_100,
+        border: $themePalette.grey.v_200,
       }]"
     >
     </textarea>

contentcuration/contentcuration/frontend/shared/views/errors/TechnicalTextBlock.vue

@@ -6,12 +6,12 @@ export default function theme() {
   const tokens = themeTokens();
   return Object.assign(
     {
-      loading: palette.black,
-      primaryBackground: brand.primary.v_200,
-      backgroundColor: palette.grey.v_50,
-      greyBackground: palette.grey.v_200,
+      loading: palette.grey.v_900,
+      primaryBackground: brand.primary.v_100,
+      backgroundColor: palette.grey.v_100,
+      greyBackground: palette.grey.v_300,
       greyBorder: palette.grey.v_400,
-      grey: palette.grey.v_600,
+      grey: palette.grey.v_700,
       darkGrey: palette.grey.v_800,
       greenSuccess: tokens.success,
       topic: palette.grey.v_400,
@@ -23,11 +23,11 @@ export default function theme() {
       html5: tokens.explore,
       zim: tokens.explore,
       slideshow: tokens.read,
-      channelHighlightDefault: palette.grey.v_200,
-      draggableDropZone: palette.grey.v_100,
-      draggableDropOverlay: brand.primary.v_400,
-      greenHighlightBackground: brand.secondary.v_200,
-      roleVisibilityCoach: palette.lightblue.v_1100,
+      channelHighlightDefault: palette.grey.v_300,
+      draggableDropZone: palette.grey.v_200,
+      draggableDropOverlay: brand.primary.v_200,
+      greenHighlightBackground: brand.secondary.v_100,
+      roleVisibilityCoach: palette.lightblue.v_600,
     },
     tokens
   );