Skip to content

Commit 67305b3

Browse files
checkpoint
1 parent ea40d07 commit 67305b3

File tree

19 files changed

+71
-237
lines changed

19 files changed

+71
-237
lines changed

.coderabbit.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
2+
language: "en-US"
3+
early_access: false
4+
reviews:
5+
profile: "chill"
6+
request_changes_workflow: false
7+
high_level_summary: true
8+
poem: true
9+
review_status: true
10+
collapse_walkthrough: false
11+
auto_review:
12+
enabled: true
13+
drafts: false
14+
tools:
15+
golangci-lint:
16+
enabled: true
17+
eslint:
18+
enabled: true
19+
chat:
20+
auto_reply: true

.github/workflows/changelog.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ on:
3838
required: false
3939
default: false
4040
type: boolean
41+
description: 'Dry run mode'
4142
latest:
4243
required: false
4344
default: false
4445
type: boolean
46+
description: 'Generate changelog for the latest release'
4547

4648
permissions:
4749
contents: write

.github/workflows/deploy-cloud-run-grafana-prod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy Grafana Server Cloud Run on prod
33
on:
44
push:
55
branches:
6-
- fluxninja_micro_frontends
6+
- coderabbit_micro_frontend
77
paths:
88
- "/**"
99
workflow_dispatch:

.github/workflows/deploy-cloud-run-grafana.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy Grafana Server Cloud Run
33
on:
44
push:
55
branches:
6-
- fluxninja_micro_frontends
6+
- coderabbit_micro_frontend
77
paths:
88
- "/**"
99
workflow_dispatch:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"version": "11.3.0-pre",
77
"repository": "github:grafana/grafana",
88
"scripts": {
9-
"build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
9+
"build": "NODE_ENV=dev nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
1010
"build:nominify": "yarn run build -- --env noMinify=1",
1111
"dev": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js",
1212
"e2e": "./e2e/start-and-run-suite",

packages/grafana-data/src/themes/createShape.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function createShape(options: ThemeShapeInput): ThemeShape {
2222
const baseBorderRadius = options.borderRadius ?? 6;
2323

2424
const radius = {
25-
default: '2px',
25+
default: '6px',
2626
pill: '9999px',
2727
circle: '100%',
2828
};

packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
381381
container: css({
382382
padding: theme.spacing(1),
383383
border: `1px ${theme.colors.border.weak} solid`,
384-
borderRadius: theme.shape.radius.default,
384+
borderRadius: theme.shape.borderRadius(),
385385
backgroundColor: theme.colors.background.primary,
386386
zIndex: theme.zIndex.modal,
387387
}),

packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarBody.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ export const getBodyStyles = (theme: GrafanaTheme2) => {
111111
zIndex: theme.zIndex.modal,
112112
backgroundColor: theme.colors.background.primary,
113113
width: '268px',
114+
borderRadius: theme.shape.borderRadius(),
114115

115116
'.react-calendar__navigation': {
116117
display: 'flex',
@@ -181,6 +182,9 @@ export const getBodyStyles = (theme: GrafanaTheme2) => {
181182
borderTopLeftRadius: '20px',
182183
borderBottomLeftRadius: '20px',
183184
},
185+
'& button': {
186+
borderRadius: 0,
187+
},
184188

185189
[`${hasActiveSelector}, .react-calendar__tile--rangeEnd`]: {
186190
borderTopRightRadius: '20px',

packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme2, isReversed, hideQuickRang
281281
background: theme.colors.background.primary,
282282
boxShadow: theme.shadows.z3,
283283
width: `${isFullscreen ? '546px' : '262px'}`,
284-
borderRadius: theme.shape.radius.default,
284+
borderRadius: theme.shape.borderRadius(),
285285
border: `1px solid ${theme.colors.border.weak}`,
286286
[`${isReversed ? 'left' : 'right'}`]: 0,
287287
}),

packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { SelectableValue, parseDuration } from '@grafana/data';
55
import { selectors } from '@grafana/e2e-selectors';
66

77
import { t } from '../../utils/i18n';
8-
import { ButtonGroup } from '../Button';
98
import { ButtonSelect } from '../Dropdown/ButtonSelect';
109
import { ToolbarButtonVariant, ToolbarButton } from '../ToolbarButton';
1110

@@ -102,7 +101,7 @@ export class RefreshPicker extends PureComponent<Props> {
102101
const tooltipAutoRefresh = selectedValue.value === '' ? tooltipAutoRefreshOff : tooltipIntervalSelected;
103102

104103
return (
105-
<ButtonGroup className="refresh-picker">
104+
<div style={{ display: 'flex', alignItems: 'center', gap: 4 }} className="refresh-picker">
106105
<ToolbarButton
107106
aria-label={text}
108107
tooltip={tooltip}
@@ -125,7 +124,7 @@ export class RefreshPicker extends PureComponent<Props> {
125124
tooltip={tooltipAutoRefresh}
126125
/>
127126
)}
128-
</ButtonGroup>
127+
</div>
129128
);
130129
}
131130
}

0 commit comments

Comments
 (0)