Skip to content

Commit

Permalink
chore: resolve rebase issues
Browse files Browse the repository at this point in the history
anuradha9712 committed Dec 18, 2024
1 parent 2a174ea commit cca12fc
Showing 6 changed files with 45 additions and 972 deletions.
2 changes: 1 addition & 1 deletion core/components/atoms/popperWrapper/PopperWrapper.tsx
Original file line number Diff line number Diff line change
@@ -342,7 +342,7 @@ export class PopperWrapper extends React.Component<PopperWrapperProps, PopperWra
},
};

const classes = classNames('d-inline-flex flex-grow-1', triggerClass);
const classes = classNames('PopperWrapper-trigger', triggerClass);

const shouldPopoverClose = (clicked: HTMLElement): boolean => {
const popover = this.popupRef.current as HTMLElement;
2 changes: 0 additions & 2 deletions css/gulpfile.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@ const sourcemaps = require('gulp-sourcemaps');
const concat = require('gulp-concat');
const postcssColorMod = require('postcss-color-mod-function');
const cleaner = require('gulp-clean');
const path = require('path');

const materialIcons = './material-design-icons/iconfont/material-icons.css';
const materialFont = './material-design-icons/iconfont/*.{ttf,otf,woff2}';
@@ -18,7 +17,6 @@ const sources = [
'./src/components/*.css',
'./src/ai-components/*.css',
'./src/utils/*.css',
path.join(__dirname, '../core/components/**/*.css'),
];

function clean() {
6 changes: 0 additions & 6 deletions examples/esm-umd-ts/index.html
Original file line number Diff line number Diff line change
@@ -941,11 +941,5 @@
Read this page for adding React with JSX to an existing project:
https://react.dev/learn/add-react-to-an-existing-project
-->
<<<<<<< HEAD
</body>
</html>
=======
</body>

</html>
>>>>>>> e61d83d8 (chore: migrate to module css)
Loading

0 comments on commit cca12fc

Please sign in to comment.