Commit 576e0e41 authored by MrMan's avatar MrMan

Resolves #30, Added "keep searching" text to recs page

- Also change styling for bottom buttons on preferences to match
parent fe2db22d
Pipeline #2498844 skipped
...@@ -230,22 +230,24 @@ class PreferencesPage extends React.Component { ...@@ -230,22 +230,24 @@ class PreferencesPage extends React.Component {
</div> </div>
</div> </div>
<div className="abs pinned-to-bottom full-width"> <div className="pinned-to-bottom page-bottom-controls">
<div className="pure-g"> <div className="pure-g">
<div className="pure-u-1-2"> <div className="pure-u-1-2">
<button type="submit" <button type="submit"
className="pure-button button-success full-width squared" className="pure-u-1 pure-button button-success button-lg squared"
onClick={this.updatePreferences.bind(this)}> onClick={this.updatePreferences.bind(this)}>
<i className="fa fa-save"></i> {this.i18n`pages.preferences.updatePreferences`} <div><i className="fa fa-save"></i></div>
<div className="center-aligned-text small-text">{this.i18n`pages.preferences.updatePreferences`}</div>
</button> </button>
</div> </div>
<div className="pure-u-1-2"> <div className="pure-u-1-2">
<button type="button" <button type="button"
className="pure-button full-width squared" className="pure-u-1 pure-button button-lg squared"
onClick={this.resetPreferences.bind(this)}> onClick={this.resetPreferences.bind(this)}>
<i className="fa fa-trash"></i> {this.i18n`pages.preferences.undoChanges`} <div><i className="fa fa-trash"></i></div>
<div className="center-aligned-text small-text">{this.i18n`pages.preferences.undoChanges`}</div>
</button> </button>
</div> </div>
......
...@@ -124,17 +124,19 @@ class RecsPage extends React.Component { ...@@ -124,17 +124,19 @@ class RecsPage extends React.Component {
{detailFragment} {detailFragment}
<div className="pinned-to-bottom recs-page-controls"> <div className="pinned-to-bottom page-bottom-controls">
<div className="pure-g"> <div className="pure-g">
<div className="pure-u-1-2"> <div className="pure-u-1-2">
<button onClick={this.pass.bind(this)} className="pure-u-1 pure-button button-lg squared button-error"> <button onClick={this.pass.bind(this)} className="pure-u-1 pure-button button-lg squared button-error">
<i className="fa fa-binoculars"></i> <div><i className="fa fa-binoculars"></i></div>
<div className="center-aligned-text small-text">{this.i18n`pages.recs.keepSearching`}</div>
</button> </button>
</div> </div>
<div className="pure-u-1-2"> <div className="pure-u-1-2">
<button onClick={this.like.bind(this)} className="pure-u-1 pure-button button-lg squared button-success"> <button onClick={this.like.bind(this)} className="pure-u-1 pure-button button-lg squared button-success">
<i className="fa fa-heart"></i> <div><i className="fa fa-heart"></i></div>
<div className="center-aligned-text small-text">{this.i18n`pages.recs.interested`}</div>
</button> </button>
</div> </div>
</div> </div>
......
...@@ -40,8 +40,8 @@ export default { ...@@ -40,8 +40,8 @@ export default {
locationSectionHeading: "Location", locationSectionHeading: "Location",
fromGPS: "From GPS", fromGPS: "From GPS",
customLocation: "Custom Location", customLocation: "Custom Location",
updatePreferences: "Update", updatePreferences: "Update preferences",
undoChanges: "Reset changes", undoChanges: "Undo changes",
inbetweenAges: "to" inbetweenAges: "to"
}, },
login: { login: {
...@@ -55,7 +55,9 @@ export default { ...@@ -55,7 +55,9 @@ export default {
managePrefs: "Manage Preferences", managePrefs: "Manage Preferences",
friendsInCommon: "{} friends in common", friendsInCommon: "{} friends in common",
commonInterests: "{} common interests", commonInterests: "{} common interests",
lastActive: "last active" lastActive: "last active",
keepSearching: "Keep Searching",
interested: "Interested"
}, },
matches: { matches: {
pageSubtitle: "Talk with your matches", pageSubtitle: "Talk with your matches",
......
...@@ -94,9 +94,14 @@ body { ...@@ -94,9 +94,14 @@ body {
text-shadow: 0px 1px 1px black; text-shadow: 0px 1px 1px black;
} }
.recs-page-controls { .page-bottom-controls {
width: 100%; width: 100%;
height: 44px; height: 4em;
}
.page-bottom-controls button {
padding-top: 0;
min-height: 4em;
} }
.recs-page-header { .recs-page-header {
...@@ -283,6 +288,9 @@ span.large { ...@@ -283,6 +288,9 @@ span.large {
font-size: 1.5em; font-size: 1.5em;
} }
.small-text { font-size: small; }
.smaller-text { font-size: smaller; }
.pinned-to-bottom { .pinned-to-bottom {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment