Skip to content

Commit 904b770

Browse files
committed
using jupyterlab variables for colors to get consistent behavior with other UI.
1 parent c34a111 commit 904b770

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

style/base.css

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
gap: 12px;
8888
background: var(--jp-layout-color1);
8989
border: 1px solid var(--jp-border-color2);
90-
border-radius: 8px;
90+
border-radius: 4px;
9191
padding: 8px 12px;
9292
box-shadow: 0 2px 8px #00000040;
9393
z-index: 200;
@@ -101,24 +101,25 @@
101101
font-size: 13px;
102102
border-radius: 4px;
103103
cursor: pointer;
104-
color: white;
105104
font-weight: inherit;
106105
border: none;
107106
transition: background-color 0.2s ease-in-out;
108107
}
109108

110109
.jp-unified-diff-floating-panel .jp-merge-accept-button {
111-
background-color: #089e03;
110+
background-color: var(--jp-success-color1);
111+
color: var(--jp-ui-inverse-font-color0);
112112
}
113113

114114
.jp-unified-diff-floating-panel .jp-merge-accept-button:hover {
115-
background-color: #027e1d;
115+
background-color: var(--jp-success-color0);
116116
}
117117

118118
.jp-unified-diff-floating-panel .jp-merge-reject-button {
119-
background-color: #b80606;
119+
background-color: var(--jp-error-color1);
120+
color: var(--jp-ui-inverse-font-color0);
120121
}
121122

122123
.jp-unified-diff-floating-panel .jp-merge-reject-button:hover {
123-
background-color: #8f0505;
124+
background-color: var(--jp-error-color0);
124125
}

0 commit comments

Comments
 (0)