Skip to content

MajSite #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Piloow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

MajSite #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added public/images/background_no_logo_p23.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo_p23.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ const PUBLIC_URL = process.env.PUBLIC_URL;
// I usually already have this, to include a CSS
// reset, set border-box, and other global concerns.
const GlobalStyles = createGlobalStyle`
html {
--color-primary: #7ADFCE;
--color-secondary: #D4E4E0;
--color-third: #1D1D1B;
--color-light: #3499FF;
--color-warning: #3499FF;
--color-important: #3499FF;
--color-font: #FAFAFA;
}
html {
--color-primary: #BAB9B9;
--color-secondary: #D4E4E0;
--color-third: #1D1D1B;
--color-light: #464646;
--color-warning: #464646;
--color-important: #464646;
--color-font: #FAFAFA;
}
`;

class App extends React.Component {
Expand Down
17 changes: 10 additions & 7 deletions src/components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ export function IconButtonLink(props) {
}


const COUVERTURE_PATH = asset_url('/images/background_a22.png')
const COUVERTURE_PATH_XS = asset_url('/images/background_no_logo_a22.png')
const LOGO_PATH = asset_url('/images/logo_a22.png')
//const COUVERTURE_PATH = asset_url('/images/background_a22.png')
const COUVERTURE_PATH = asset_url('/images/background_no_logo_p23.gif')
const COUVERTURE_PATH_XS = asset_url('/images/background_no_logo_p23.gif')
const LOGO_PATH = asset_url('/images/logo_p23.png')


class Header extends React.Component {
Expand Down Expand Up @@ -82,6 +83,7 @@ class Header extends React.Component {
</Hidden>
<Hidden xsDown implementation="css">
<img alt="couverture_pic" src={COUVERTURE_PATH} className={classes.couverture}/>
<img alt="logo_pic" src={LOGO_PATH} className={classes.logoCouv} />
</Hidden>
</div>
</React.Fragment>
Expand All @@ -101,12 +103,12 @@ const styles = theme => ({
appBar: {
backgroundColor: 'var(--color-light)',
color: 'white',

},
logo: {
flexGrow: 1,
},
menuButton: {
backgroundColor: 'var(--color-light)',
fontSize: 35,
padding: "10px",
marginTop: 0,
Expand All @@ -117,6 +119,7 @@ const styles = theme => ({
borderTop: "3px solid var(--color-primary)",
textDecoration: "none",
},
boxshadow: '0 0 60px 30px #fff',
},
icon: {
fontSize: 35,
Expand All @@ -134,10 +137,10 @@ const styles = theme => ({
objectFit: 'cover',
},
logoCouv: {
width: '70%',
width: '50%',
position: 'absolute',
top: '15%',
left: '15%'
top: '3%',
left: '25%'
},
couvXS: {
display: 'flex'
Expand Down