Compare commits
3 Commits
dev
...
d944147a77
| Author | SHA1 | Date | |
|---|---|---|---|
| d944147a77 | |||
| 09d5bac9a7 | |||
| 70c57feaa8 |
@@ -1,4 +1,3 @@
|
||||
|
||||
/**
|
||||
* HEY HO
|
||||
*/
|
||||
@@ -17,7 +16,7 @@
|
||||
box-sizing: border-box; /* 1 */
|
||||
border-width: 0; /* 2 */
|
||||
border-style: solid; /* 2 */
|
||||
border-color: #EEEEEE; /* 2 */
|
||||
border-color: #eeeeee; /* 2 */
|
||||
}
|
||||
|
||||
::before,
|
||||
@@ -36,7 +35,9 @@ html {
|
||||
line-height: 1.5; /* 1 */
|
||||
-webkit-text-size-adjust: 100%; /* 2 */ /* 3 */
|
||||
tab-size: 4; /* 3 */
|
||||
font-family: Inter var, Roboto, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 4 */
|
||||
font-family: Inter var, Roboto, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
|
||||
'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
|
||||
'Segoe UI Symbol', 'Noto Color Emoji'; /* 4 */
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -110,7 +111,8 @@ code,
|
||||
kbd,
|
||||
samp,
|
||||
pre {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; /* 1 */
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono',
|
||||
'Courier New', monospace; /* 1 */
|
||||
font-size: 1em; /* 2 */
|
||||
}
|
||||
|
||||
@@ -318,7 +320,7 @@ textarea {
|
||||
input::placeholder,
|
||||
textarea::placeholder {
|
||||
opacity: 1; /* 1 */
|
||||
color: #BDBDBD; /* 2 */
|
||||
color: #bdbdbd; /* 2 */
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -326,7 +328,7 @@ Set the default cursor for buttons.
|
||||
*/
|
||||
|
||||
button,
|
||||
[role="button"] {
|
||||
[role='button'] {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@@ -374,7 +376,9 @@ Ensure the default browser behavior of the `hidden` attribute.
|
||||
display: none;
|
||||
}
|
||||
|
||||
*, ::before, ::after {
|
||||
*,
|
||||
::before,
|
||||
::after {
|
||||
--tw-translate-x: 0;
|
||||
--tw-translate-y: 0;
|
||||
--tw-rotate: 0;
|
||||
|
||||
@@ -2,12 +2,14 @@ import FuseDialog from '@fuse/core/FuseDialog';
|
||||
import FuseMessage from '@fuse/core/FuseMessage';
|
||||
import FuseSuspense from '@fuse/core/FuseSuspense';
|
||||
import { styled } from '@mui/material/styles';
|
||||
import Hidden from '@mui/material/Hidden';
|
||||
import AppContext from 'src/app/contexts/AppContext';
|
||||
import { selectFuseCurrentLayoutConfig } from 'app/store/fuse/settingsSlice';
|
||||
import { memo, useContext } from 'react';
|
||||
import { useSelector } from 'react-redux';
|
||||
import { useRoutes } from 'react-router-dom';
|
||||
import NavbarWrapperLayout1 from './components/NavbarWrapperLayout1';
|
||||
import NavbarToggleButton from '../shared-components/NavbarToggleButton';
|
||||
|
||||
const Root = styled('div')(({ theme, config }) => ({
|
||||
...(config.mode === 'boxed' && {
|
||||
@@ -36,6 +38,10 @@ function Layout1(props) {
|
||||
{config.navbar.display && config.navbar.position === 'left' && <NavbarWrapperLayout1 />}
|
||||
|
||||
<main id="fuse-main" className="flex flex-col flex-auto min-h-full min-w-0 relative z-10">
|
||||
<Hidden lgUp>
|
||||
<NavbarToggleButton className="w-40 h-40 p-0 mx-0 sm:mx-8" />
|
||||
</Hidden>
|
||||
|
||||
<div className="flex flex-col flex-auto min-h-0 relative z-10">
|
||||
<FuseDialog />
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
/**
|
||||
* Custom base styles
|
||||
*/
|
||||
@@ -25,17 +24,19 @@ html {
|
||||
|
||||
body {
|
||||
font-size: 14px;
|
||||
line-height: 1.4;
|
||||
line-height: normal;
|
||||
overflow-x: hidden;
|
||||
font-feature-settings: "salt";
|
||||
font-feature-settings: 'salt';
|
||||
}
|
||||
|
||||
html, body {
|
||||
html,
|
||||
body {
|
||||
-webkit-font-smoothing: auto;
|
||||
-moz-osx-font-smoothing: auto;
|
||||
}
|
||||
|
||||
html, body {
|
||||
html,
|
||||
body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: relative;
|
||||
@@ -47,33 +48,42 @@ html, body {
|
||||
|
||||
#root {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex: 1 1 auto;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
/* layout 2 workaround */
|
||||
#root:has(> #fuse-main) {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
h1, .h1 {
|
||||
h1,
|
||||
.h1 {
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
h2, .h2 {
|
||||
h2,
|
||||
.h2 {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
h3, .h3 {
|
||||
h3,
|
||||
.h3 {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
h4, .h4 {
|
||||
h4,
|
||||
.h4 {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
h5, .h5 {
|
||||
h5,
|
||||
.h5 {
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
h6, .h6 {
|
||||
h6,
|
||||
.h6 {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
@@ -82,11 +92,11 @@ h6, .h6 {
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
a[role=button] {
|
||||
a[role='button'] {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
[role="tooltip"] {
|
||||
[role='tooltip'] {
|
||||
z-index: 9999;
|
||||
}
|
||||
|
||||
@@ -137,10 +147,9 @@ button:focus {
|
||||
input:-webkit-autofill,
|
||||
input:-webkit-autofill:hover,
|
||||
input:-webkit-autofill:focus,
|
||||
input:-webkit-autofill:active
|
||||
{
|
||||
transitionDelay: 9999s;
|
||||
transitionProperty: background-color, color;
|
||||
input:-webkit-autofill:active {
|
||||
transitiondelay: 9999s;
|
||||
transitionproperty: background-color, color;
|
||||
}
|
||||
|
||||
:focus {
|
||||
|
||||
@@ -53,6 +53,7 @@ module.exports = {
|
||||
'gradient-to-bl': 'linear-gradient(to bottom left, var(--tw-gradient-stops))',
|
||||
'gradient-to-l': 'linear-gradient(to left, var(--tw-gradient-stops))',
|
||||
'gradient-to-tl': 'linear-gradient(to top left, var(--tw-gradient-stops))',
|
||||
'home-welcome': 'url(/src/assets/images/welcome-background.webp)',
|
||||
},
|
||||
backgroundOpacity: ({ theme }) => theme('opacity'),
|
||||
backgroundPosition: {
|
||||
@@ -130,6 +131,7 @@ module.exports = {
|
||||
'2xl': '0 25px 50px -12px rgba(0, 0, 0, 0.25)',
|
||||
inner: 'inset 0 2px 4px 0 rgba(0,0,0,0.06)',
|
||||
none: 'none',
|
||||
light: '1px 1px 5px 0px rgba(0, 0, 0, 0.1)',
|
||||
active: '2px 2px 5px 0px rgba(0, 0, 0, 0.2)',
|
||||
hover: '2px 2px 5px 0px rgba(0, 0, 0, 0.4)',
|
||||
0: '0px 0px 0px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 0px rgba(0, 0, 0, 0.14), 0px 0px 0px 0px rgba(0, 0, 0, 0.12)',
|
||||
@@ -1258,6 +1260,7 @@ module.exports = {
|
||||
'5xl': '102.4rem',
|
||||
'6xl': '115.2rem',
|
||||
'7xl': '128rem',
|
||||
'8xl': '142rem',
|
||||
px: '1px',
|
||||
0: '0px',
|
||||
0.5: '0.05rem',
|
||||
|
||||
Reference in New Issue
Block a user