wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1205206 - Move Loop Standalone Terms of Service text from footer to under Join button. r=Standard8

Browse Source
This commit is contained in:
David Critchley 2015-09-30 09:38:24 +01:00
parent 24b18c78ee
commit 73850afe0a
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
browser/components/loop/standalone/content/css/webapp.css
View File

@ -254,8 +254,7 @@ html[dir="rtl"] .rooms-footer .footer-logo {
.room-inner-info-area {
color: #fff;
margin: auto;
/* 290px is the width of the widest info child, i.e., a tile */
width: 290px;
padding: 0 5px;
}
.room-inner-info-area > button {
@ -300,3 +299,14 @@ html[dir="rtl"] .rooms-footer .footer-logo {
/* Override the default iframe 300px width with the inherited width */
width: 100%;
}
/* Terms of Service */
.room-inner-info-area > .terms-service {
margin-top: 20px;
}
.room-inner-info-area > .terms-service,
.room-inner-info-area > .terms-service > a {
color: #999;
}

10
browser/components/loop/standalone/content/js/standaloneRoomViews.js
View File

@ -118,8 +118,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
this._renderJoinButton()
),
React.createElement(ToSView, {
dispatcher: this.props.dispatcher}),
React.createElement(ToSView, {dispatcher: this.props.dispatcher}),
React.createElement("p", {className: "mozilla-logo"})
)
)
@ -309,7 +308,8 @@ loop.standaloneRoomViews = (function(mozL10n) {
React.createElement("button", {className: "btn btn-join btn-info",
onClick: this.props.joinRoom},
mozL10n.get("rooms_room_join_label")
)
),
React.createElement(ToSView, {dispatcher: this.props.dispatcher})
)
);
}
@ -422,9 +422,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
render: function() {
return (
React.createElement("footer", {className: "rooms-footer"},
React.createElement("div", {className: "footer-logo"}),
React.createElement(ToSView, {
dispatcher: this.props.dispatcher})
React.createElement("div", {className: "footer-logo"})
)
);
}

6
browser/components/loop/standalone/content/js/standaloneRoomViews.jsx
View File

@ -118,8 +118,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
this._renderJoinButton()
}
</div>
<ToSView
dispatcher={this.props.dispatcher} />
<ToSView dispatcher={this.props.dispatcher} />
<p className="mozilla-logo" />
</div>
</div>
@ -310,6 +309,7 @@ loop.standaloneRoomViews = (function(mozL10n) {
onClick={this.props.joinRoom}>
{mozL10n.get("rooms_room_join_label")}
</button>
<ToSView dispatcher={this.props.dispatcher} />
</div>
);
}
@ -423,8 +423,6 @@ loop.standaloneRoomViews = (function(mozL10n) {
return (
<footer className="rooms-footer">
<div className="footer-logo" />
<ToSView
dispatcher={this.props.dispatcher} />
</footer>
);
}

2
browser/components/loop/standalone/content/l10n/en-US/loop.properties
View File

@ -30,7 +30,7 @@ unsupported_platform_learn_more_link=Learn more about why your platform doesn't
promote_firefox_hello_heading=Download {{brandShortname}} to make free audio and video calls!
get_firefox_button=Get {{brandShortname}}
initiate_call_cancel_button=Cancel
legal_text_and_links=By using {{clientShortname}} you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}
legal_text_and_links=By using {{clientShortname}} you agree to the {{terms_of_use_url}} and {{privacy_notice_url}}.
terms_of_use_link_text=Terms of use
privacy_notice_link_text=Privacy notice
self_view_hidden_message=Self-view hidden but still being sent; resize window \