Skip to content

Commit 45c6f0d

Browse files
filiptronicekfiliptronicek
authored
Fix GitLab (#194)
1 parent 4d824da commit 45c6f0d

File tree

3 files changed

+29
-40
lines changed

3 files changed

+29
-40
lines changed

‎src/button/button-contributions.ts‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -232,40 +232,27 @@ export const buttonContributions: ButtonContributionParams[] = [
232232
id: "gl-merge-request",
233233
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/merge_requests/1"],
234234
match: /\/merge_requests\//,
235-
selector: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div",
236-
containerElement: createElement("div", { marginLeft: "8px", marginRight: "-8px" }),
235+
selector: "#content-body > div.merge-request .js-issuable-actions",
236+
containerElement: createElement("div", {}),
237237
application: "gitlab",
238-
insertBefore: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div > div",
238+
insertBefore: "#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown",
239239
manipulations: [
240240
{
241241
// make the clone button secondary
242242
element:
243-
"#content-body > div.merge-request > div.detail-page-header.border-bottom-0.gl-display-block.gl-pt-5.gl-sm-display-flex\\!.is-merge-request > div.detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex > div > div.gl-sm-ml-3.dropdown.gl-dropdown > button",
243+
"#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown > button",
244244
remove: "btn-confirm",
245245
},
246246
],
247247
},
248248
{
249249
id: "gl-issue",
250250
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/issues/1"],
251-
match: /\/issues\//,
252-
selector:
253-
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div:nth-child(1) > div > div.gl-flex.gl-items-start.gl-flex-col.md\\:gl-flex-row.gl-gap-3.gl-pt-3 > div",
251+
match: /\/issues(?:\/\d+|\?)/,
252+
selector: "#content-body [data-testid='detail-wrapper'] > div > div:has(div > [data-testid='work-item-actions-dropdown'])",
254253
containerElement: createElement("div", { marginLeft: "0", marginRight: "0px" }),
255254
application: "gitlab",
256-
insertBefore: "#new-actions-header-dropdown",
257-
manipulations: [
258-
{
259-
element:
260-
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-md.btn-confirm.js-create-merge-request",
261-
remove: "btn-confirm",
262-
},
263-
{
264-
element:
265-
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-icon.btn-md.btn-confirm.js-dropdown-toggle.dropdown-toggle.create-merge-request-dropdown-toggle",
266-
remove: "btn-confirm",
267-
},
268-
],
255+
insertBefore: "#content-body [data-testid='detail-wrapper'] > div > div:has(div > [data-testid='work-item-actions-dropdown']) > div",
269256
},
270257

271258
// GitHub

‎src/button/button.css‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,21 @@
252252
--dropdown-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
253253
}
254254

255+
@media (prefers-color-scheme: dark) {
256+
.gitlab {
257+
--primary-bg-color: #63a6e9;
258+
--primary-hover-bg-color: #9ec7f1;
259+
--primary-color: #18171d;
260+
--primary-hover-color: #18171d;
261+
--primary-separator-color: #18171e;
262+
263+
--dropdown-color: #ececef;
264+
--dropdown-bg-color: #28272e;
265+
--dropdown-hover-bg-color: #4f4e53;
266+
--dropdown-border-color: #4c4b51;
267+
}
268+
}
269+
255270
.bitbucket-server {
256271
--font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Fira Sans, Droid Sans,
257272
Helvetica Neue, sans-serif;

‎test/src/button-contributions-copy.ts‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -232,40 +232,27 @@ export const buttonContributions: ButtonContributionParams[] = [
232232
id: "gl-merge-request",
233233
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/merge_requests/1"],
234234
match: /\/merge_requests\//,
235-
selector: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div",
236-
containerElement: createElement("div", { marginLeft: "8px", marginRight: "-8px" }),
235+
selector: "#content-body > div.merge-request .js-issuable-actions",
236+
containerElement: createElement("div", {}),
237237
application: "gitlab",
238-
insertBefore: "body[data-project-id] div.detail-page-header-actions.is-merge-request > div > div",
238+
insertBefore: "#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown",
239239
manipulations: [
240240
{
241241
// make the clone button secondary
242242
element:
243-
"#content-body > div.merge-request > div.detail-page-header.border-bottom-0.gl-display-block.gl-pt-5.gl-sm-display-flex\\!.is-merge-request > div.detail-page-header-actions.gl-align-self-start.is-merge-request.js-issuable-actions.gl-display-flex > div > div.gl-sm-ml-3.dropdown.gl-dropdown > button",
243+
"#content-body > div.merge-request .js-issuable-actions > div.dropdown.gl-dropdown > button",
244244
remove: "btn-confirm",
245245
},
246246
],
247247
},
248248
{
249249
id: "gl-issue",
250250
exampleUrls: ["https://gitlab.com/svenefftinge/browser-extension-test/-/issues/1"],
251-
match: /\/issues\//,
252-
selector:
253-
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div:nth-child(1) > div > div.gl-flex.gl-items-start.gl-flex-col.md\\:gl-flex-row.gl-gap-3.gl-pt-3 > div",
251+
match: /\/issues(?:\/\d+|\?)/,
252+
selector: "#content-body [data-testid='detail-wrapper'] > div > div:has(div > [data-testid='work-item-actions-dropdown'])",
254253
containerElement: createElement("div", { marginLeft: "0", marginRight: "0px" }),
255254
application: "gitlab",
256-
insertBefore: "#new-actions-header-dropdown",
257-
manipulations: [
258-
{
259-
element:
260-
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-md.btn-confirm.js-create-merge-request",
261-
remove: "btn-confirm",
262-
},
263-
{
264-
element:
265-
"#content-body > div.issue-details.issuable-details.js-issue-details > div.detail-page-description.content-block.js-detail-page-description.gl-pt-3.gl-pb-0.gl-border-none > div.js-issue-widgets > div > div > div.new-branch-col.gl-font-size-0.gl-my-2 > div > div.btn-group.available > button.gl-button.btn.btn-icon.btn-md.btn-confirm.js-dropdown-toggle.dropdown-toggle.create-merge-request-dropdown-toggle",
266-
remove: "btn-confirm",
267-
},
268-
],
255+
insertBefore: "#content-body [data-testid='detail-wrapper'] > div > div:has(div > [data-testid='work-item-actions-dropdown']) > div",
269256
},
270257

271258
// GitHub

0 commit comments

Comments
 (0)