Skip to content

Commit

Permalink
change fonts to be same in diff and in definition tabs (#133)
Browse files Browse the repository at this point in the history
change diff tab layout to use flex style
  • Loading branch information
tot-ra authored May 24, 2022
1 parent 9af2bef commit 3a223b4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

## [3.2.1] - 2022-05-14

### Updated

- Added react-refresh-webpack-plugin. It only executes in development mode: its setup is conditionally imported in server side, so its inclusion is omitted in production mode.
- For the setup of the previous one, I've had to wrap all the server setup in a async function to make the conditional import works. It doesn't affect to any functionality.
- Added source map loading for node_modules libraries.
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ docker-compose -f docker-compose.dev.yml up
To have fast iteration of working on UI changes, you can avoid running node service in docker, and run only mysql & redis

```
docker-compose -f docker-compose.light.yml up
docker-compose -f docker-compose.light.yml up -d
npm run develop
```

Expand Down Expand Up @@ -210,7 +210,9 @@ npm run test-functional
```

### Testing Dockerimage build

If you change build process in Dockerfile or Dockerfile.CI, consider checking also testing it

```
# run db
docker-compose -f docker-compose.light.yml up
Expand Down
2 changes: 1 addition & 1 deletion client/prism-material-light.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pre[class*="language-"],
code[class*="language-"] {
color: #d4d4d4;
font-size: 13px;
font-size: 14px;
text-shadow: none;
font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace;
direction: ltr;
Expand Down
23 changes: 9 additions & 14 deletions client/schema/service-details/CodeDiff.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,25 @@ const newStyles = {
},
},
emptyGutter: {
'min-width': '1px',
padding: '0',
},
gutter: {
'min-width': '1px',
width: 'auto',
},
line: {
display: 'flex',
'line-height': '1',
'font-size': '13px',
'font-size': '14px',
'font-family': 'Consolas,Monaco,Andale Mono,Ubuntu Mono,monospace',
'&:hover': {
background: '#000e95',
},
},
content: {
height: '18px',
width: 'auto',
pre: {
'line-height': '18px',
},
gutter: {
minWidth: '20px',
},
diffContainer: {
content: {
flexGrow: 1,
overflow: 'none',
pre: {
'line-height': '18px',
'font-family': 'Consolas,Monaco,Andale Mono,Ubuntu Mono,monospace',
},
},
marker: {
Expand Down
2 changes: 1 addition & 1 deletion client/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ body a {
color: inherit;
}

body * {
body {
font-family: Source Sans Pro;
}

0 comments on commit 3a223b4

Please sign in to comment.