Skip to content

Commit

Permalink
fixing Nav partials conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
aliciascott committed May 9, 2024
2 parents d4eecc4 + fadf256 commit 0306b8f
Show file tree
Hide file tree
Showing 1,191 changed files with 58,920 additions and 56,140 deletions.
8 changes: 4 additions & 4 deletions .apigentools-info
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2024-04-23 18:22:57.730840",
"spec_repo_commit": "50a32b2b"
"regenerated": "2024-05-09 08:10:38.432153",
"spec_repo_commit": "f983a01b"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2024-04-23 18:23:05.505126",
"spec_repo_commit": "50a32b2b"
"regenerated": "2024-05-09 08:10:46.472041",
"spec_repo_commit": "f983a01b"
}
}
}
30 changes: 28 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ before_script:
when: on_success
# ================== templates ================== #
.base_template: &base_template
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/websites-images:webops-site-build-32821063
image: registry.ddbuild.io/ci/websites/webops-site-build:v33259941-f0dfbc91
tags:
- "arch:amd64"
rules:
Expand Down Expand Up @@ -462,7 +462,7 @@ link_checks:on-schedule:

# template for what runs in pa11y to avoid duplication
.pa11y_live_template: &pa11y_live_template
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/websites-images:pa11y-25121683
image: registry.ddbuild.io/ci/websites/pa11y:v33259941-f0dfbc91
tags: ["arch:amd64"]
stage: post-deploy
cache: []
Expand Down Expand Up @@ -562,6 +562,32 @@ set_redirect_metadata_live:
- in-isolation run_update_redirect_metadata
interruptible: true

run_notranslate_tag:schedule:
<<: *base_template
<<: *live_schedule_rules
stage: post-deploy
dependencies:
- build_live
timeout: 2h
script:
- export transifex_api_key="$(get_secret 'transifex_api_key')"
- python3 ./local/bin/py/add_notranslate_tag.py

# run_notranslate_tag:manual:
# <<: *base_template
# <<: *live_schedule_rules
# allow_failure: true
# stage: post-deploy
# timeout: 2h
# script:
# - export transifex_api_key="$(get_secret 'transifex_api_key')"
# - python3 ./local/bin/py/add_notranslate_tag.py
# rules:
# - if: $CI_COMMIT_TAG != null || $CI_COMMIT_BRANCH =~ "/pull/\/.*/"
# when: never
# - if: $CI_COMMIT_TAG == null
# when: manual

####################################
# #
# Failure Notifications #
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ placeholders: hugpython update_pre_build
hugpython: local/etc/requirements3.txt
@${PY3} -m venv --clear $@ && . $@/bin/activate && $@/bin/pip install --upgrade pip wheel && $@/bin/pip install -r $<;\
if [[ "$(CI_COMMIT_REF_NAME)" != "" ]]; then \
$@/bin/pip install https://binaries.ddbuild.io/dd-source/python/assetlib-0.0.28306535-py3-none-any.whl; \
$@/bin/pip install https://binaries.ddbuild.io/dd-source/python/assetlib-0.0.33893004-py3-none-any.whl; \
fi

update_pre_build: hugpython
Expand Down
11 changes: 4 additions & 7 deletions assets/scripts/datadog-docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,8 @@ window.addEventListener(
'popstate',
function (event) {
setMobileNav();
if (event.state) {
loadPage(window.location.href);
closeNav();
getPathElement();
}
},
false
loadPage(window.location.href);
closeNav();
getPathElement();
}
);
13 changes: 13 additions & 0 deletions assets/styles/components/_integrations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,19 @@ $screen-md-max: ($screen-lg-min - 1) !default;
height: auto;
}

table {
tr {
th:empty {
display: none;
}

td {
word-break: break-word;
width: 50%;
}
}
}

table.table-metrics {
tr {
td {
Expand Down
2 changes: 1 addition & 1 deletion assets/styles/pages/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ dl {
}

dd {
padding: 0 0.75rem 1rem 1.75rem;
padding: 0 0.75rem 0rem 1.75rem;

&:last-of-type {
padding-bottom: 0.5rem;
Expand Down
28 changes: 28 additions & 0 deletions assets/styles/pages/_standard-attributes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,32 @@
}
}
}

@include media-breakpoint-up(xl) {
.table-wrapper {
overflow-x: unset;

table {
table-layout: fixed;

thead > tr {
th:nth-child(1) {
width: 8%;
}

th:nth-child(2) {
width: 14%;
}

th:nth-child(3) {
width: 30%;
}

th:nth-child(4) {
width: 8%;
}
}
}
}
}
}
10 changes: 9 additions & 1 deletion assets/styles/vendor/_chroma-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
/* Error */ .chroma .err { color: #000000 }
/* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; }
/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; }
/* LineHighlight */ .chroma .hl { display: block; width: 100%; box-shadow: inset 4px 0 0 #632ca6; background-color: #c987ff1d; }
/* LineHighlight */ .chroma .hl {
display: block;
width: 100%;
box-shadow: inset 4px 0 0 #632ca6;
background-color: #c987ff1d;
position: relative;
margin-left: -8px;
padding-left: 8px;
}
/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
/* Keyword */ .chroma .k { color: #a90d91 }
Expand Down
11 changes: 10 additions & 1 deletion config/_default/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ markup:
guessSyntax: true

module:
imports:
imports:
- path: github.com/DataDog/websites-modules
disabled: false
mounts:
Expand Down Expand Up @@ -83,6 +83,15 @@ module:
- source: static/fonts/iconfont.woff
target: static/fonts/iconfont.woff

- path: github.com/DataDog/websites-sources
disabled: false
mounts:
- source: content/en/integrations
target: content/integrations
lang: en
- source: data
target: data

mounts:
# default mounts
- source: content/en
Expand Down
Loading

0 comments on commit 0306b8f

Please sign in to comment.