Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into test-de
Browse files Browse the repository at this point in the history
  • Loading branch information
caugner committed Oct 28, 2024
2 parents f70117e + e6f9525 commit f9afd66
Show file tree
Hide file tree
Showing 11 changed files with 356 additions and 450 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,17 @@ on:
branches:
- main

permissions:
contents: write
pull-requests: write

jobs:
build:
if: github.repository == 'mdn/yari'
runs-on: ubuntu-latest

steps:
- name: Release
uses: google-github-actions/release-please-action@v4
uses: googleapis/release-please-action@v4
id: release
with:
token: ${{ secrets.RELEASE_PLEASE_PAT }}

- name: Checkout
uses: actions/checkout@v4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../../../ui/vars" as *;

@media (min-width: $screen-md) {
.table-container {
width: calc(100% + 6rem);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../../../ui/vars" as *;

@media (min-width: $screen-xl) {
.table-container {
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../../../ui/vars" as *;

// Style for desktop.

@media (min-width: $screen-sm) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../../../ui/vars" as *;

// Style for mobile.

@media (max-width: $screen-sm - 1px) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:meta";
@use "~@mdn/minimalist/sass/mixins/utils" as *;
@use "../../../ui/vars" as *;

Expand Down Expand Up @@ -383,10 +384,10 @@ dl.bc-notes-list {
}
}

@import "./index-mobile";
@import "./index-desktop";
@import "./index-desktop-md";
@import "./index-desktop-xl";
@include meta.load-css("index-mobile");
@include meta.load-css("index-desktop");
@include meta.load-css("index-desktop-md");
@include meta.load-css("index-desktop-xl");

.bcd-cell-text-wrapper {
display: flex;
Expand Down
6 changes: 4 additions & 2 deletions client/src/ui/_color-palette.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@use "sass:color";

@function tint($color, $percentage) {
@return mix(white, $color, $percentage);
@return color.mix(white, $color, $percentage);
}

@function shade($color, $percentage) {
@return mix(black, $color, $percentage);
@return color.mix(black, $color, $percentage);
}

@function mdn-color($color, $value) {
Expand Down
150 changes: 75 additions & 75 deletions deployer/poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions deployer/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "^3.10"
click = "^8.1.7"
boto3 = "^1.35.44"
boto3 = "^1.35.49"
python-decouple = "^3.8"
requests = {extras = ["security"], version = "^2.32.3"}
elasticsearch-dsl = "^7.4.1"
selectolax = "^0.3.24"
selectolax = "^0.3.25"
PyGithub = "^1.59"
unidiff = "^0.7.5"

Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
"@codemirror/state": "^6.4.1",
"@codemirror/theme-one-dark": "^6.1.2",
"@fast-csv/parse": "^5.0.2",
"@inquirer/prompts": "^7.0.0",
"@inquirer/prompts": "^7.0.1",
"@lit/react": "^1.0.6",
"@mdn/bcd-utils-api": "^0.0.7",
"@mdn/browser-compat-data": "^5.6.9",
"@mdn/browser-compat-data": "^5.6.10",
"@mozilla/glean": "5.0.3",
"@sentry/node": "^8.35.0",
"@stripe/stripe-js": "^4.9.0",
Expand Down Expand Up @@ -116,9 +116,9 @@
"loglevel": "^1.9.2",
"lru-cache": "^10.4.3",
"md5-file": "^5.0.0",
"mdast-util-from-markdown": "^2.0.1",
"mdast-util-from-markdown": "^2.0.2",
"mdast-util-phrasing": "^4.1.0",
"mdn-data": "^2.11.1",
"mdn-data": "^2.12.0",
"open": "^10.1.0",
"open-editor": "^5.0.0",
"openai": "^4.68.4",
Expand Down Expand Up @@ -151,16 +151,16 @@
"web-specs": "^3.23.0"
},
"devDependencies": {
"@babel/core": "^7.25.8",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.25.9",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@mdn/dinocons": "^0.5.5",
"@mdn/minimalist": "^2.0.4",
"@playwright/test": "^1.48.1",
"@playwright/test": "^1.48.2",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@svgr/webpack": "^8.1.0",
"@swc/core": "^1.7.39",
"@swc/core": "^1.7.40",
"@testing-library/react": "^15.0.7",
"@types/async": "^3.2.24",
"@types/cli-progress": "^3.11.6",
Expand Down Expand Up @@ -195,7 +195,7 @@
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-jsx-a11y": "^6.10.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-n": "^17.11.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^4.6.2",
Expand Down Expand Up @@ -241,7 +241,7 @@
"resolve": "^1.22.8",
"resolve-url-loader": "^5.0.0",
"rough-notation": "^0.5.1",
"sass": "^1.79.5",
"sass": "^1.80.4",
"sass-loader": "^16.0.2",
"source-map-loader": "^5.0.0",
"style-loader": "^3.3.4",
Expand Down
Loading

0 comments on commit f9afd66

Please sign in to comment.