Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/different table font #180

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feat/different table font #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d1afe8
fixed config to allow normal importing of fonts
paddymul Nov 25, 2023
1b17a43
using the new font importing fix to try a different font
paddymul Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,5 @@ buckaroo/nbextension/*
buckaroo/labextension/*
docs/*.js
docs/*.js.map
docs/*js*
docs/*js*
docs/source/_static/*woff*
4 changes: 2 additions & 2 deletions js/components/staticData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export const tableDf: DFWhole = {
'end station name': 'Elizabeth St & Hester St',
tripduration: 471,
'start station name': 'Catherine St & Monroe St',
floatCol: '1.111',
floatCol: '1111.111',
nanNumeric: null,
nanObject: null,
nanFloat: null,
Expand All @@ -331,7 +331,7 @@ export const tableDf: DFWhole = {
'end station name': 'South St & Whitehall St',
tripduration: 1494,
'start station name': '1 Ave & E 30 St',
floatCol: '8.888',
floatCol: '7778.888',
nanNumeric: null,
nanObject: null,
nanFloat: null,
Expand Down
4 changes: 4 additions & 0 deletions js/dcefwidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@

import 'ag-grid-community/styles/ag-grid.css';
import 'ag-grid-community/styles/ag-theme-alpine.css';
import '@ibm/plex/css/ibm-plex.css';
import '../js/style/dcf-npm.css';


Check failure on line 25 in js/dcefwidget.ts

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 3.8) 

Delete `⏎⏎⏎`


export class DCEFWidgetModel extends DOMWidgetModel {
defaults(): Backbone.ObjectHash {
return {
Expand Down
6 changes: 5 additions & 1 deletion js/style/dcf-npm.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,11 @@ div.dependent-tabs ul.tabs li.active {
}

.ag-row .ag-cell {
font-family: monospace;
/*font-family: monospace;*/
font-family: 'IBM Plex Mono';
/*, 'Menlo', 'DejaVu Sans Mono',
'Bitstream Vera Sans Mono', Courier, monospace;*/
color:orange;
white-space: pre;
}
.left-menu {
Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"dev": "webpack-cli serve --config webpack-local-dev.config.js --mode=development --env development --open"
},
"dependencies": {
"@ibm/plex": "^6.3.0",
"@jupyter-widgets/base": "^2 || ^3 || ^4 || ^6.0.0",
"@jupyterlab/apputils": "^3.0.2",
"ag-grid-community": "^29.2.0",
Expand Down Expand Up @@ -100,18 +101,18 @@
"markdown-loader": "^7.0.0",
"mkdirp": "^0.5.1",
"npm-run-all": "^4.1.3",
"prettier": "^2.6.2",
"prettier-standalone": "^1.3.1-0",
"prismjs": "^1.28.0",
"postcss": "^8.4.14",
"postcss-loader": "^7.0.1",
"postcss-preset-env": "^7.7.2",
"postcss-nested": "^6.0.0",
"sass": "^1.53.0",
"sass-loader": "^13.0.2",
"postcss-preset-env": "^7.7.2",
"prettier": "^2.6.2",
"prettier-standalone": "^1.3.1-0",
"prismjs": "^1.28.0",
"react-router": "^6.3.0",
"react-router-dom": "^5.2.0",
"rimraf": "^3.0.2",
"sass": "^1.53.0",
"sass-loader": "^13.0.2",
"source-map-loader": "^0.2.4",
"style-loader": "^2.0.0",
"svg-url-loader": "^7.1.1",
Expand Down
42 changes: 21 additions & 21 deletions webpack-local-dev.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,26 @@ const baseRules = [

{ test: /\.js$/, loader: 'source-map-loader' },
{ test: /\.css$/, use: ['style-loader', 'css-loader'] },
{
test: /\.scss$/,
use: [
// We're in dev and want HMR, SCSS is handled in JS
// In production, we want our css as files
"style-loader",
"css-loader",
{
loader: "postcss-loader",
options: {
postcssOptions: {
plugins: [
["postcss-preset-env"],
],
},
},
},
"sass-loader"
],
},
{
test: /\.scss$/,
use: [
// We're in dev and want HMR, SCSS is handled in JS
// In production, we want our css as files
"style-loader",
"css-loader",
{
loader: "postcss-loader",
options: {
postcssOptions: {
plugins: [
["postcss-preset-env"],
],
},
},
},
"sass-loader"
],
},
{
test: luminoThemeImages,
issuer: /\.css$/,
Expand All @@ -51,7 +51,7 @@ const baseRules = [
},
},
{
test: /\.(jpg|png|gif)$/,
test: /\.(jpg|png|gif|woff|woff2)$/,
exclude: luminoThemeImages,
use: ['file-loader'],
},
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const baseRules = [
},
},
{
test: /\.(jpg|png|gif)$/,
test: /\.(jpg|png|gif|woff|woff2)$/,
exclude: luminoThemeImages,
use: ['file-loader'],
},
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,11 @@
gud "^1.0.0"
warning "^4.0.3"

"@ibm/plex@^6.3.0":
version "6.3.0"
resolved "https://registry.npmjs.org/@ibm/plex/-/plex-6.3.0.tgz"
integrity sha512-kb1ATGXrFu/gF2NZY40OlRUAEWCcrq9mIEYkuWqXUPaC6Zrb7iA9wQYTkJdAPP+V6ySfp7NLAyzAnK9c5k90Sg==

"@istanbuljs/load-nyc-config@^1.0.0":
version "1.1.0"
resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
Expand Down
Loading