-
Notifications
You must be signed in to change notification settings - Fork 4
General Changes #15
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.
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
base: master
Are you sure you want to change the base?
General Changes #15
Changes from 20 commits
91d72ab
6dab1e1
0210564
ce35043
e1f907e
62d6d35
e45ae9f
c1f7ca0
cd4f8d8
deb48e2
c1982e8
b2ef7a9
d2f734b
af8e01a
db6c0f8
3c90b99
403d334
c21d328
3f101e5
687cdc5
7a54356
dd060e9
c35cb99
762ee5b
d9a00e7
a155b07
ff4450e
5415f1c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,15 +13,18 @@ function CortexCardContents(props) { | |
}}> | ||
<h1>{props.title}</h1> | ||
<p>{props.body}</p> | ||
|
||
</div> | ||
</div> | ||
{/* This is an image placeholder **Imagine an Image** */} | ||
<div style={{ | ||
<img style={{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe the original indentation was correct here. |
||
border: '2px solid black', | ||
backgroundColor: 'black', | ||
minHeight: '196px', | ||
width: '196px', | ||
}} /> | ||
}} | ||
src={props.image} alt={props.alt} | ||
/> | ||
</div> | ||
); | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,11 @@ import CortexCardContainer from './CortexCardContainer/CortexCardContainer'; | |
import CortexCardContents from './CortexCardContents/CortexCardContents'; | ||
import MagicArrow from './MagicArrow/MagicArrow'; | ||
|
||
/*image imports*/ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think prettier or something enforces import ordering, so I typically just put all the imports together so the autoformatter can do its thing. |
||
import DummySquadImg from './img/Team.png' | ||
import JoystickImg from './img/Joystick.png' | ||
import BuymenuImg from './img/BuyMenu.png' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. probably These can alternatively be included in |
||
|
||
function Home() { | ||
return ( | ||
<div style={{ backgroundColor: '#111'}}> | ||
|
@@ -27,19 +32,25 @@ function Home() { | |
<CortexCardContents | ||
title='Upgraded Engine' | ||
body='The source code has been enhanced to improve performance.' | ||
image={DummySquadImg} | ||
alt='A Handdrawn/Pixelart Image of a Dummy Squad from Cortex Command.' | ||
/> | ||
</CortexCard> | ||
<CortexCard right> | ||
<CortexCardContents | ||
right | ||
title='New Content' | ||
body='New weapons, characters, and scenes.' | ||
image={BuymenuImg} | ||
alt='A Handdrawn/Pixelart Image of the Buy Menu from Cortex Command.' | ||
/> | ||
</CortexCard> | ||
<CortexCard> | ||
<CortexCardContents | ||
title='Improved Strategic Gameplay' | ||
body='The team has focused on accentuating the most satisfying gameplay elements.' | ||
image={JoystickImg} | ||
alt='A Handdrawn/Pixelart Image of a Joystick, an input method that can be used to (ineffiecently) play Cortex Command.' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. probably too long for alt text - though I appreciate the levity. Also I think sentence case is appropriate for these alt texts. Thanks for providing alt text, it's probably not super critical for a site for a game that has 0 accessibility features, but it helps for making the web a bit more inclusive. |
||
/> | ||
</CortexCard> | ||
</CortexCardContainer> | ||
|
@@ -50,4 +61,4 @@ function Home() { | |
) | ||
} | ||
|
||
export default Home; | ||
export default Home; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,27 +3,45 @@ import Template from '../../Template/Template'; | |
import Card from '../../Card/Card'; | ||
import Button from '../../Button/Button'; | ||
|
||
|
||
import EmojiGood from '../../Emoji/good.png'; | ||
|
||
function Downloads() { | ||
return ( | ||
<Template> | ||
<h1 style={{ marginTop: '48px' }}>Downloads</h1> | ||
<h2>Project Releases</h2> | ||
<Card title={'Cortex Command Community Project'}> | ||
<p style={{ | ||
marginBottom: '18px', | ||
}}>This is where you can find the community's plans for Cortex Command's future. There'll be rebalancing, new weapons and units, and much more.</p> | ||
marginTop: '8px', marginBottom: '18px', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't know if there's any current consistency across the site on a 6px vs 8px based unit size, but it's probably worth being consistent at least internally. Eventually we'd want to move to being able to do something like,
or whatever. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So the takeaway here is to choose which looks better: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Definitely agree that setting up standardized sizes is the way to go. Probably too late to be convenient now, but using rem sizes as opposed to px sizes is quite nice. |
||
}}>This is where you can find the community's plans for Cortex Command's future. There'll be rebalancing, new weapons, units, and much <i>much</i> more.</p> | ||
|
||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases'>Releases</Button> | ||
|
||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/download/v0.1.0-pre2/CCCP.v0.1.0-pre2.zip'>Pre 2 <img width='14px' height='14px' marginBottom='-12px' src={EmojiGood}/> (latest)</Button> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I like including this link here. Not sure about the icon though. What's your thinking on that? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm also on the fence about the icon - it's a cute idea but I think it looks a little odd. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
</Card> | ||
<h2>Mods</h2> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. With the addition of some more content on this page I think it's looking a little cluttered. No action required now, but I will probably be restructuring some of the headings on this page/grouping up some of the card content. |
||
<Card title={'Get Mods'}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Definitely an important addition. |
||
<p style={{ | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>What is Cortex Command without <strong>MODS</strong>? Luckily, we've got you covered. There are 2 great ways to get mods and if neither of them suit your fancy, you can use the Legacy Mod Converter to convert mods from the Data Realms Fan Forums or the Steam Workshop!</p> | ||
|
||
<Button link to='https://discord.gg/yuZvazK'>Discord</Button> | ||
|
||
<Button link to='https://cccp.mod.io/'>Mod.io (Coming Soon)</Button> | ||
|
||
</Card> | ||
<h2>Modding Tools</h2> | ||
<Card title={'Legacy Mod Converter'}> | ||
<p style={{ | ||
marginBottom: '18px', | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>This project automates most of the conversion work required to convert the legacy Cortex Command mods into Cortex Command Community Project compatible mods.</p> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter'>Get source</Button> | ||
</Card> | ||
<Card title={'Bender'}> | ||
<p style={{ | ||
marginBottom: '18px', | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>The purpose of this tool is to make the life of modders easier by automagically generating bent limb sprites from limb parts.</p> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Bender/releases'>Releases</Button> | ||
</Card> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,20 @@ | ||
import React from 'react'; | ||
import Template from '../../Template/Template'; | ||
|
||
import EmojiDunno from '../../Emoji/dunno.png'; | ||
|
||
function NotFound() { | ||
return ( | ||
<Template> | ||
<div style={{textAlign: 'center'}}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think left aligned is more professional looking, at least for text. |
||
<h1 style={{ marginTop: '48px' }}>Page Not Found</h1> | ||
<p>Sorry, but the page you were trying to view does not exist.</p> | ||
<br /> | ||
<br /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not wholly opposed to using Don't change it if you don't feel like it. |
||
<a href='https://www.youtube.com/watch?v=t0s9dRNjhfg?autoplay=1'><img style={{postion: 'absolute', width: '25%'}} src={EmojiDunno}/></a> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Interesting easter egg. Doesn't seem super relevant in this context, but I'm fine with it. |
||
</div> | ||
</Template> | ||
|
||
); | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,8 +12,10 @@ function Template(props) { | |
<Header /> | ||
<div style={{ | ||
margin: 'auto', | ||
marginBottom: '0px', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What are the changes in this file for? |
||
maxWidth: '800px', | ||
width: '100%', | ||
height: '100%', | ||
flex: '1', | ||
}}> | ||
<div style={{ padding: '0 8px', }}> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the light theme :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, can you pull out the theme edits into a separate branch? I think it needs to be addressed separately. I think it's a good opportunity to adjust the stylesheets and how style is managed across the site.
See #9