Skip to content

Commit

Permalink
change_header_and_primary_colors
Browse files Browse the repository at this point in the history
  • Loading branch information
NoelKova committed Jul 30, 2024
1 parent c1022cb commit 0aa2c19
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 11 deletions.
3 changes: 1 addition & 2 deletions apps/sensenet/src/components/appbar/desktop-app-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useRepository } from '@sensenet/hooks-react'
import { clsx } from 'clsx'
import React, { useContext } from 'react'
import { Link } from 'react-router-dom'
import logo from '../../assets/sensenet-icon-32.png'
import logo from '../../../../../../sn-client/examples/sn-dms-demo/src/assets/sensenet_white.png'
import { ResponsivePersonalSettings } from '../../context'
import { globals, useGlobalStyles } from '../../globalStyles'
import { CommandPalette } from '../command-palette/CommandPalette'
Expand All @@ -28,7 +28,6 @@ const useStyles = makeStyles((theme: Theme) => {
},
logo: {
marginRight: '32px',
filter: 'drop-shadow(0px 0px 3px black)',
},
commandPaletteReplacement: {
flex: 1,
Expand Down
2 changes: 1 addition & 1 deletion apps/sensenet/src/components/appbar/desktop-nav-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export const DesktopNavMenu: FunctionComponent = () => {
<Typography component="div" className={classes.checkboxMenuItem} style={{ width: '100%' }}>
<Grid component="label" container alignItems="center" justify="space-between">
<Grid item style={{ paddingRight: '16px' }} data-test="theme-status">
{personalSettings.theme === 'dark' ? 'Light theme' : 'Dark theme'}
{'Dark theme'}
</Grid>
<Grid item>
<Switch
Expand Down
6 changes: 3 additions & 3 deletions apps/sensenet/src/context/ThemeProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ export const ThemeProvider: React.FunctionComponent = (props) => {
secondary: pageTheme === 'light' ? '#000000' : '#FFFFFF',
},
primary: {
light: '#80cbc4',
main: '#26a69a',
dark: '#00796b',
light: '#00B1E4',
main: '#0192db',
dark: '#004E8F',
},
secondary: {
light: '#90caf9',
Expand Down
4 changes: 2 additions & 2 deletions apps/sensenet/src/globalStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export const globals = {
settingsDrawerWidth: 250,
addButtonHeight: 60,
//Colors
headerBackground: '#353B4E',
headerLightBackground: '#929292',
headerBackground: '#0192db',
headerLightBackground: '#0192db',
headerText: 'rgba(255,255,255,0.87)',
secondaryIconSize: '16px',
elavationShadow: '1px 1px 3px 0px hsl(0deg 0% 0% / 28%)',
Expand Down
2 changes: 1 addition & 1 deletion examples/sn-dms-demo/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const blobToFile = (theBlob: Blob, fileName: string): File => {

Cypress.Commands.add('uploadWithApi', (options: UploadOptions) => {
cy.visit('')
cy.fixture('logo.png').then(async (img) => {
cy.fixture('sensenet_white.png').then(async (img) => {
Cypress.log({
name: 'upload',
consoleProps: () => {
Expand Down
2 changes: 1 addition & 1 deletion examples/sn-dms-demo/src/components/AppBarLogo.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import MediaQuery from 'react-responsive'
import { Link } from 'react-router-dom'
import sensenetLogo from '../assets/logo.png'
import sensenetLogo from '../assets/sensenet_white.png'

const styles = {
logo: {
Expand Down
2 changes: 1 addition & 1 deletion examples/sn-dms-demo/src/pages/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Button from '@material-ui/core/Button'
import React from 'react'
import MediaQuery from 'react-responsive'
import logo from '../assets/logo.png'
import { resources } from '../assets/resources'
import logo from '../assets/sensenet_white.png'
import { WelcomeMessage } from '../components/WelcomeMessage'
import { userManager } from '../userManager'

Expand Down

0 comments on commit 0aa2c19

Please sign in to comment.