scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-27 05:11:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

change verbiage, begin work on responsive nav/footer

Browse source
This commit is contained in:
Technoboy10 2016-07-20 16:53:50 -04:00
parent e3378d0f6a
commit 22dc55c030
6 changed files with 30 additions and 10 deletions
src
components
footer/www
footer.jsxfooter.scss
login
login.jsx
l10n.jsonroutes.json
views/splash
splash.jsx

12
src/components/footer/www/footer.jsx
View file

@ -16,7 +16,7 @@ var Footer = React.createClass({
<dt>
<FormattedMessage id='general.about' />
</dt>
<dd>
<dd className="showMobile">
<a href="/about/">
<FormattedMessage id='general.aboutScratch' />
</a>
@ -41,7 +41,7 @@ var Footer = React.createClass({
<FormattedMessage id='general.credits' />
</a>
</dd>
<dd>
<dd className="showMobile">
<a href="/jobs/">
<FormattedMessage id='general.jobs' />
</a>
@ -57,7 +57,7 @@ var Footer = React.createClass({
<dt>
<FormattedMessage id='general.community' />
</dt>
<dd>
<dd className="showMobile">
<a href="/community_guidelines/">
<FormattedMessage id='general.guidelines' />
</a>
@ -98,7 +98,7 @@ var Footer = React.createClass({
<FormattedMessage id='general.offlineEditor' />
</a>
</dd>
<dd>
<dd className="showMobile">
<a href="/contact-us/">
<FormattedMessage id='general.contactUs' />
</a>
@ -114,12 +114,12 @@ var Footer = React.createClass({
<dt>
<FormattedMessage id='general.legal'/>
</dt>
<dd>
<dd className="showMobile">
<a href="/terms_of_use/">
<FormattedMessage id='general.termsOfUse' />
</a>
</dd>
<dd>
<dd className="showMobile">
<a href="/privacy_policy/">
<FormattedMessage id='general.privacyPolicy' />
</a>

18
src/components/footer/www/footer.scss
View file

@ -1,4 +1,5 @@
@import "../../../colors";
@import "../../../frameless";
#footer {
.lists {
@ -46,3 +47,20 @@
text-align: center;
}
}
//4 and 6 columns
@media only screen and (max-width: $tablet - 1) {
#footer .lists dd {
&:not(.showMobile) {
display: none;
}
}
#footer .lists dl {
dt {
display: none;
}
}
}

2
src/components/login/login.jsx
View file

@ -50,7 +50,7 @@ var Login = React.createClass({
</Button>
] : [
<Button className="submit-button white" type="submit" key="submitButton">
<FormattedMessage id='general.signIn' />
<FormattedMessage id='general.logIn' />
</Button>
]}
<a className="right" href="/accounts/password_reset/" key="passwordResetLink">

4
src/l10n.json
View file

@ -27,7 +27,7 @@
"general.guidelines": "Community Guidelines",
"general.help": "Help",
"general.jobs": "Jobs",
"general.joinScratch": "Join Scratch",
"general.signUp": "Sign Up",
"general.legal": "Legal",
"general.loadMore": "Load More",
"general.learnMore": "Learn More",
@ -62,7 +62,7 @@
"general.scratchFoundation": "Scratch Foundation",
"general.scratchJr": "ScratchJr",
"general.search": "Search",
"general.signIn": "Sign in",
"general.logIn": "Log in",
"general.statistics": "Statistics",
"general.studios": "Studios",
"general.support": "Support",

2
src/routes.json
View file

@ -3,6 +3,7 @@
"name": "splash",
"pattern": "^/?$",
"view": "splash/splash",
"viewportWidth": "device-width",
"title": "Imagine, Program, Share"
},
{
@ -65,6 +66,7 @@
"name": "faq",
"pattern": "^/info/faq/?$",
"view": "faq/faq",
"viewportWidth": "device-width",
"title": "FAQ"
},
{

2
src/views/splash/splash.jsx
View file

@ -393,7 +393,7 @@ var Splash = injectIntl(React.createClass({
<News items={this.state.news} messages={messages} />
</div>
] : [
<Intro projectCount={this.state.projectCount} messages={messages} key="intro"/>
/*<Intro projectCount={this.state.projectCount} messages={messages} key="intro"/>*/
]) : []
}