Change style preprocessor to less, as semantic-ui is using that, so we need only one

This commit is contained in:
Paul Bienkowski 2021-11-26 13:37:26 +01:00
parent b06b7ba1ad
commit f183b9e33a
16 changed files with 31 additions and 30 deletions

View file

@ -7,7 +7,7 @@ import {from} from 'rxjs'
import {pluck} from 'rxjs/operators' import {pluck} from 'rxjs/operators'
import {useConfig} from 'config' import {useConfig} from 'config'
import styles from './App.module.scss' import styles from './App.module.less'
import { import {
HomePage, HomePage,

View file

@ -1,4 +1,4 @@
@import 'styles.scss'; @import 'styles.less';
:global(#root) { :global(#root) {
padding-top: 60px; padding-top: 60px;
@ -17,8 +17,8 @@
min-height: 12rem; min-height: 12rem;
padding: 2rem 0; padding: 2rem 0;
background: $obsColorB4; background: @obsColorB4;
color: $obsColorW; color: @obsColorW;
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
&:global(.ui.header) { &:global(.ui.header) {
@ -68,7 +68,7 @@
font-size: 18pt; font-size: 18pt;
&, &:hover { &, &:hover {
color: $obsColorB4; color: @obsColorB4;
} }
} }

View file

@ -2,7 +2,7 @@ import React from 'react'
import {Comment} from 'semantic-ui-react' import {Comment} from 'semantic-ui-react'
import classnames from 'classnames' import classnames from 'classnames'
import './styles.scss' import './styles.less'
function hashCode(s) { function hashCode(s) {
let hash = 0 let hash = 0

View file

@ -1,4 +1,4 @@
@import '../../styles.scss'; @import '../../styles.less';
.page { .page {
margin-top: 32px; margin-top: 32px;

View file

@ -2,7 +2,7 @@ import React from 'react'
import classnames from 'classnames' import classnames from 'classnames'
import {Container} from 'semantic-ui-react' import {Container} from 'semantic-ui-react'
import styles from './Page.module.scss' import styles from './Page.module.less'
export default function Page({small, children, fullScreen, stage}: {small?: boolean, children: ReactNode, fullScreen?: boolean,stage?: ReactNode}) { export default function Page({small, children, fullScreen, stage}: {small?: boolean, children: ReactNode, fullScreen?: boolean,stage?: ReactNode}) {
return ( return (

View file

@ -1,7 +1,7 @@
import React from 'react' import React from 'react'
import {Settings} from 'luxon' import {Settings} from 'luxon'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import 'semantic-ui-less/semantic.less' import 'fomantic-ui-less/semantic.less'
import './index.css' import './index.css'
import App from './App' import App from './App'

View file

@ -10,7 +10,7 @@ import {Stats, Page} from 'components'
import {TrackListItem} from './TracksPage' import {TrackListItem} from './TracksPage'
import {CustomMap} from './MapPage' import {CustomMap} from './MapPage'
import styles from './HomePage.module.scss' import styles from './HomePage.module.less'
function MostRecentTrack() { function MostRecentTrack() {
const track: Track | null = useObservable( const track: Track | null = useObservable(

View file

@ -4,7 +4,7 @@ import {Page} from 'components'
import {useConfig, Config} from 'config' import {useConfig, Config} from 'config'
import ReactMapGl, {AttributionControl } from 'react-map-gl' import ReactMapGl, {AttributionControl } from 'react-map-gl'
import styles from './MapPage.module.scss' import styles from './MapPage.module.less'
import {obsRoads, basemap } from '../mapstyles' import {obsRoads, basemap } from '../mapstyles'

View file

@ -16,7 +16,7 @@ import TrackComments from './TrackComments'
import TrackDetails from './TrackDetails' import TrackDetails from './TrackDetails'
import TrackMap from './TrackMap' import TrackMap from './TrackMap'
import styles from './TrackPage.module.scss' import styles from './TrackPage.module.less'
function useTriggerSubject() { function useTriggerSubject() {
const subject$ = React.useMemo(() => new Subject(), []) const subject$ = React.useMemo(() => new Subject(), [])

View file

@ -73,6 +73,14 @@
@item : 'default'; @item : 'default';
@statistic : 'default'; @statistic : 'default';
@toast : 'default';
@slider : 'default';
@calendar : 'default';
@text : 'default';
@emoji : 'default';
/******************************* /*******************************
Folders Folders
*******************************/ *******************************/
@ -88,7 +96,7 @@
Import Theme Import Theme
*******************************/ *******************************/
@import (multiple) "~semantic-ui-less/theme.less"; @import (multiple) "~fomantic-ui-less/theme.less";
@fontPath : '../../../themes/@{theme}/assets/fonts'; @fontPath : '../../../themes/@{theme}/assets/fonts';
/* End Config */ /* End Config */

10
frontend/src/styles.less Normal file
View file

@ -0,0 +1,10 @@
@obsColorB4: #114594;
@obsColorG1: #76520E;
@obsColorW: #FFFFFF;
@obsColorB1: #122037;
@obsColorG6: #EFB509;
@obsColorS: #000000;
@primaryColor: @obsColorB4;
@secondaryColor: @obsColorG1;

View file

@ -1,17 +0,0 @@
@mixin container {
max-width: 1200px;
margin: 0 auto;
padding: 0 16px;
}
$obsColorB4: #114594;
$obsColorG1: #76520E;
$obsColorW: #FFFFFF;
$obsColorB1: #122037;
$obsColorG6: #EFB509;
$obsColorS: #000000;
$primaryColor: $obsColorB4;
$secondaryColor: $obsColorG1;