Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
4f1fffb9
Unverified
Commit
4f1fffb9
authored
Dec 16, 2019
by
Torkel Ödegaard
Committed by
GitHub
Dec 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FontSize: Change base font size to 14px (#21104)
parent
842dde3d
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
5 additions
and
10 deletions
+5
-10
packages/grafana-data/src/types/theme.ts
+0
-1
packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
+0
-1
packages/grafana-ui/src/themes/default.ts
+1
-2
public/sass/_variables.generated.scss
+1
-2
public/sass/base/_reboot.scss
+1
-2
public/sass/components/_modals.scss
+1
-1
public/sass/components/_slate_editor.scss
+1
-1
No files found.
packages/grafana-data/src/types/theme.ts
View file @
4f1fffb9
...
...
@@ -19,7 +19,6 @@ export interface GrafanaThemeCommons {
monospace
:
string
;
};
size
:
{
root
:
string
;
base
:
string
;
xs
:
string
;
sm
:
string
;
...
...
packages/grafana-ui/src/themes/_variables.scss.tmpl.ts
View file @
4f1fffb9
...
...
@@ -99,7 +99,6 @@ $height-lg: ${theme.height.lg};
$font-family-sans-serif:
${
theme
.
typography
.
fontFamily
.
sansSerif
}
;
$font-family-monospace:
${
theme
.
typography
.
fontFamily
.
monospace
}
;
$font-size-root:
${
theme
.
typography
.
size
.
root
}
!default;
$font-size-base:
${
theme
.
typography
.
size
.
base
}
!default;
$font-size-lg:
${
theme
.
typography
.
size
.
lg
}
!default;
...
...
packages/grafana-ui/src/themes/default.ts
View file @
4f1fffb9
...
...
@@ -31,8 +31,7 @@ const theme: GrafanaThemeCommons = {
monospace
:
"Menlo, Monaco, Consolas, 'Courier New', monospace"
,
},
size
:
{
root
:
'14px'
,
base
:
'13px'
,
base
:
'14px'
,
xs
:
'10px'
,
sm
:
'12px'
,
md
:
'14px'
,
...
...
public/sass/_variables.generated.scss
View file @
4f1fffb9
...
...
@@ -102,8 +102,7 @@ $height-lg: 48px;
$font-family-sans-serif
:
'Roboto'
,
'Helvetica Neue'
,
Arial
,
sans-serif
;
$font-family-monospace
:
Menlo
,
Monaco
,
Consolas
,
'Courier New'
,
monospace
;
$font-size-root
:
14px
!
default
;
$font-size-base
:
13px
!
default
;
$font-size-base
:
14px
!
default
;
$font-size-lg
:
18px
!
default
;
$font-size-md
:
14px
!
default
;
...
...
public/sass/base/_reboot.scss
View file @
4f1fffb9
...
...
@@ -55,7 +55,7 @@ html {
html
{
// Sets a specific default `font-size` for user with `rem` type scales.
font-size
:
$font-size-
root
;
font-size
:
$font-size-
base
;
// As a side-effect of setting the @viewport above,
// IE11 & Edge make the scrollbar overlap the content and automatically hide itself when not in use.
// Unfortunately, the auto-showing of the scrollbar is sometimes too sensitive,
...
...
@@ -69,7 +69,6 @@ html {
}
body
{
// Make the `body` use the `font-size-root`
font-family
:
$font-family-sans-serif
;
font-size
:
$font-size-base
;
line-height
:
$line-height-base
;
...
...
public/sass/components/_modals.scss
View file @
4f1fffb9
...
...
@@ -110,7 +110,7 @@
}
.confirm-modal-text2
{
font-size
:
$font-size-
root
;
font-size
:
$font-size-
base
;
padding-top
:
$spacer
;
}
...
...
public/sass/components/_slate_editor.scss
View file @
4f1fffb9
.slate-query-field
{
font-size
:
$font-size-
root
;
font-size
:
$font-size-
base
;
font-family
:
$font-family-monospace
;
height
:
auto
;
word-break
:
break-word
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment