Skip to content

Commit

Permalink
Merge branch 'master' into bpenkov/standalone-migrations
Browse files Browse the repository at this point in the history
  • Loading branch information
Lipata committed Dec 12, 2023
2 parents 7c836df + e8335dd commit fdab47a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect, test } from 'vitest';
import { render } from '@testing-library/react';
import App from './App';
import App from './app';

test('renders without crashing', () => {
const wrapper = render(<App />);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ body {
-moz-osx-font-smoothing: grayscale;
}

html, body, #root {
height: 100%;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
monospace;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import { routes } from "./app/app-routes";
import App from './app/App';
import App from './app/app';
import 'react-app-polyfill/ie11';
import './index.css';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Outlet } from "react-router-dom";
import { routes } from './app-routes';
import NavigationHeader from "../components/navigation-header";
import "./App.css";
import "./app.css";

export default function App() {
const name = "$(name)";
Expand Down

0 comments on commit fdab47a

Please sign in to comment.