author | Wes Kocher <wkocher@mozilla.com> |
Mon, 21 Sep 2015 09:42:12 -0700 | |
changeset 263584 | d68909e51b6e0454f1c7d28fe5d15b33eb78046d |
parent 263579 | 039a8490891595736b16a3ccb17f025f4dcf13eb (current diff) |
parent 263583 | 1e9eb1e4c06b901a070fcf54ba47461bf1fa5ff7 (diff) |
child 263585 | 197af2fb7e29ff8e4b3b6ced723b6172e954e17d |
push id | 65352 |
push user | kwierso@gmail.com |
push date | Mon, 21 Sep 2015 16:52:59 +0000 |
treeherder | mozilla-inbound@ee92eb117e92 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | merge |
milestone | 44.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/components/loop/content/shared/css/conversation.css +++ b/browser/components/loop/content/shared/css/conversation.css @@ -988,18 +988,16 @@ body[platform="win"] .share-service-drop } .showing-room-name > .text-chat-entries > .text-chat-scroller > .context-url-view-wrapper { padding-top: 0; } .room-context { background: #fff; - border-top: 2px solid #444; - border-bottom: 2px solid #444; position: absolute; left: 0; bottom: 0; width: 100%; height: 100%; font-size: .9em; display: flex; flex-flow: column nowrap; @@ -1031,67 +1029,42 @@ body[platform="win"] .share-service-drop } .room-context > .error-display-area.error { margin: 1em 0 .5em 0; text-align: center; text-shadow: 1px 1px 0 rgba(0,0,0,.3); } -.room-context > .checkbox-wrapper { - margin-bottom: .5em; - width: 100%; -} - .room-context-header { color: #333; font-size: 1.2rem; font-weight: bold; margin: 1rem auto; } -.room-context-comment { - color: #707070; -} - -.room-context-comment { - word-wrap: break-word; -} - -:not(input).room-context-url { - color: #0095dd; - font-style: italic; - text-decoration: none; - display: block; - cursor: pointer; -} - -.room-context-url:hover { - text-decoration: underline; -} - .room-context > form { margin-bottom: 1rem; padding: .5rem; width: 100%; } .room-context > form > textarea, .room-context > form > input[type="text"] { + border: 1px solid #c3c3c3; + border-radius: 4px; + box-shadow: none; + color: #4a4a4a; display: block; - width: 100%; - outline: none; - border-radius: 4px; + font-size: 1.1rem; + height: 2.6rem; margin: 10px 0; - border: 1px solid #c3c3c3; - height: 2.6rem; + outline: none; padding: 6px; - font-size: 1.1rem; - color: #4a4a4a; - box-shadow: none; + width: 100%; } .room-context > form > textarea { font-family: inherit; height: 5.2rem; resize: none; }
--- a/browser/components/loop/standalone/content/l10n/en-US/loop.properties +++ b/browser/components/loop/standalone/content/l10n/en-US/loop.properties @@ -80,13 +80,13 @@ rooms_read_while_wait_offer=Want somethi ## replaced by the brand name. standalone_title_with_room_name={{roomName}} — {{clientShortname}} status_error=Something went wrong # Text chat strings chat_textbox_placeholder=Type here… # LOCALIZATION NOTE (context_inroom_label2): this string is followed by the -# title/URL of the website you are having a conversation about, displayed on a +# title/domain of the website you are having a conversation about, displayed on a # separate line. If this structure doesn't work for your locale, you might want # to consider this as a stand-alone title. See example screenshot: # https://bug1084991.bugzilla.mozilla.org/attachment.cgi?id=8614721 context_inroom_label2=Let's Talk About:
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties +++ b/browser/locales/en-US/chrome/browser/loop/loop.properties @@ -27,16 +27,21 @@ sign_in_again_use_as_guest_button2=Use { first_time_experience_button_label=Get Started ## LOCALIZATION_NOTE(first_time_experience_subheading): Message inviting the ## user to create his or her first conversation. first_time_experience_subheading=Join the conversation invite_header_text=Invite someone to join you. invite_header_text2=Invite a friend to join you +## LOCALIZATION_NOTE(invite_facebook_button, invite_facebook_triggered, +## invite_contacts_button, invite_contacts_triggered, invite_copy_button, +## invite_copy_triggered, invite_email_button, invite_email_triggered): These +## button/triggered pairs are labels under an iconic button that switch to the +## triggered text when clicked/activated. invite_facebook_button=share on Facebook invite_facebook_triggered=shared! invite_contacts_button=share with contacts invite_contacts_triggered=shared! invite_copy_button=copy link invite_copy_triggered=copied! invite_email_button=email link invite_email_triggered=emailed!
--- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -2748,16 +2748,17 @@ public class BrowserApp extends GeckoApp // prevents this issue. fm.executePendingTransactions(); Fragment f = fm.findFragmentById(R.id.search_container); // checking if fragment is already present if (f != null) { fm.beginTransaction().show(f).commitAllowingStateLoss(); + mBrowserSearch.resetScrollState(); } else { // add fragment if not already present fm.beginTransaction().add(R.id.search_container, mBrowserSearch, BROWSER_SEARCH_TAG).commitAllowingStateLoss(); } mBrowserSearch.setUserVisibleHint(true); // We want to adjust the window size when the keyboard appears to bring the // SearchEngineBar above the keyboard. However, adjusting the window size
--- a/mobile/android/base/home/BrowserSearch.java +++ b/mobile/android/base/home/BrowserSearch.java @@ -505,16 +505,20 @@ public class BrowserSearch extends HomeF // Great! Return including the rest of the path segment. return uriSubstringUpToMatchedPath(url, hostOffset, hostOffset + searchLength); } } while (searchCount < MAX_AUTOCOMPLETE_SEARCH && c.moveToNext()); return null; } + public void resetScrollState() { + mSearchEngineBar.scrollToPosition(0); + } + private void filterSuggestions() { if (mSuggestClient == null || !mSuggestionsEnabled) { return; } if (mSuggestionLoaderCallbacks == null) { mSuggestionLoaderCallbacks = new SuggestionLoaderCallbacks(); }