Skip to content

CSS work for Akamai Event, CSS cleanup, dependencies #438

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

Merged
deliciousmonster merged 6 commits into from
Dec 13, 2024
Merged

CSS work for Akamai Event, CSS cleanup, dependencies #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
05bf13b
CSS work for Akamai Event, CSS cleanup, dependencies
deliciousmonster Dec 2, 2024
2a56b44
Merge pull request #442 from HarperDB/stage
BboyAkers Dec 3, 2024
65bbb68
Merge branch 'master' into STUDIO-152
deliciousmonster Dec 4, 2024
fad6a6d
Update Free.js
deliciousmonster Dec 4, 2024
e320c24
Merge branch 'stage' into STUDIO-152
deliciousmonster Dec 13, 2024
d5a5ac9
fix merge issues
deliciousmonster Dec 13, 2024
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
5 changes: 0 additions & 5 deletions eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable import/no-extraneous-dependencies */
import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
import jsxA11Y from 'eslint-plugin-jsx-a11y';
import prettier from 'eslint-plugin-prettier';
Expand All @@ -7,7 +6,6 @@ import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

/* eslint-disable no-underscore-dangle */
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
Expand All @@ -25,9 +23,6 @@ export default [
prettier,
},

files: ['src/**/*.{js,jsx,ts,tsx}'],
ignores: ['public/**/*'],

rules: {
'camelcase': 0,
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"dependencies": {
"@monaco-editor/react": "^4.2.0",
"@stripe/react-stripe-js": "^2.1.0",
"@stripe/stripe-js": "^3.0.5",
"apexcharts": "^3.27.1",
"@stripe/react-stripe-js": "^3.1.0",
"@stripe/stripe-js": "^5.3.0",
"apexcharts": "^4.2.0",
"bootstrap-scss": "^5.0.1",
"classnames": "^2.3.2",
"deepmerge": "^4.2.2",
Expand All @@ -30,14 +30,14 @@
"react": "18.3.1",
"react-alert": "^7.0.3",
"react-apexcharts": "^1.3.9",
"react-country-region-selector": "^3.4.0",
"react-country-region-selector": "^4.0.1",
"react-dom": "18.3.1",
"react-dropzone": "^14.2.2",
"react-error-boundary": "^4.0.9",
"react-ga4": "^2.1.0",
"react-json-editor-ajrm": "^2.5.11",
"react-router": "^6.13.0",
"react-router-dom": "^6.13.0",
"react-router": "^7.0.2",
"react-router-dom": "^7.0.2",
"react-scripts": "^5.0.0",
"react-select": "^5.0.0",
"react-table": "^7.7.0",
Expand Down Expand Up @@ -82,7 +82,7 @@
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-hooks": "^5.1.0",
"husky": "^9.1.7",
"lint-staged": "^15.2.10",
"pinst": "^3.0.0",
Expand All @@ -91,7 +91,7 @@
"sass": "^1.46.0",
"stylelint": "^16.0.2",
"stylelint-config-sass-guidelines": "^12.0.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-config-standard-scss": "^14.0.0",
"stylelint-order": "^6.0.1",
"stylelint-scss": "^6.0.0",
"typescript": "^5.6.2"
Expand Down
2 changes: 0 additions & 2 deletions src/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@
// override styles
@import 'assets/styles/overrides/dark';
@import 'assets/styles/overrides/light';
@import 'assets/styles/overrides/lumen';
@import 'assets/styles/overrides/verizon';
@import 'assets/styles/overrides/akamai';
@import 'assets/styles/overrides/accessibility';
@import 'assets/styles/overrides/maintenance';
26 changes: 13 additions & 13 deletions src/assets/styles/components/_empty-prompt.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.empty-prompt {
align-items: center;
display: flex;
flex-direction: column;
height: calc(100vh - 262px) !important;
justify-content: center;
line-height: 1.5 !important;
align-items: center;
display: flex;
flex-direction: column;
height: calc(100vh - 282px) !important;
justify-content: center;
line-height: 1.5 !important;

> .warning-text {
color: $color-warning !important;
}
> .warning-text {
color: $color-warning !important;
}

&.narrow {
padding-left: 25%;
padding-right: 25%;
}
&.narrow {
padding-left: 25%;
padding-right: 25%;
}
}
Loading