Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
[Search] Adjust buttons in the first run experience.
Browse files Browse the repository at this point in the history
Pure HTML/CSS changes. No tests affected.

BUG=413337,416228

Review URL: https://codereview.chromium.org/612823005

Cr-Commit-Position: refs/heads/master@{#297270}
  • Loading branch information
mathp authored and Commit bot committed Sep 29, 2014
1 parent 665bf30 commit 09cf097
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 19 deletions.
2 changes: 1 addition & 1 deletion chrome/app/chromium_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ Signing in anyway will merge Chromium information like bookmarks, history, and o
Search with one touch
</message>
<message name="IDS_CONTEXTUAL_SEARCH_PROMO_DESCRIPTION_1" desc="Part 1 of the description of the Contextual Search feature. Combined with FEATURE_NAME and DESCRIPTION_2 below, the whole should be a paragraph describing the feature. This line can be empty if it makes sense to start the sentence with FEATURE_NAME.">
Learn about topics on websites without leaving your browser.
Learn about topics on websites without leaving your tab.
</message>
<message name="IDS_CONTEXTUAL_SEARCH_PROMO_FEATURE_NAME" desc="Name of the Contextual Search feature. See explanation in DESCRIPTION_1.">
Tap to Search
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/google_chrome_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
Search with one touch
</message>
<message name="IDS_CONTEXTUAL_SEARCH_PROMO_DESCRIPTION_1" desc="Part 1 of the description of the Contextual Search feature. Combined with FEATURE_NAME and DESCRIPTION_2 below, the whole should be a paragraph describing the feature. This line can be empty if it makes sense to start the sentence with FEATURE_NAME.">
Learn about topics on websites without leaving your browser.
Learn about topics on websites without leaving your tab.
</message>
<message name="IDS_CONTEXTUAL_SEARCH_PROMO_FEATURE_NAME" desc="Name of the Contextual Search feature. See explanation in DESCRIPTION_1.">
Tap to Search
Expand Down
45 changes: 31 additions & 14 deletions chrome/browser/resources/contextual_search/promo.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,13 @@ body {
}

a {
color: #414141;
text-decoration: none;
}

.colored {
a.colored-link {
color: rgb(66, 133, 244);
}

.label {
display: inline-block;
font-size: 14px;
font-weight: bold;
padding: 28px;
white-space: nowrap;
}

.label a {
text-transform: uppercase;
}

#button-container {
text-align: right;
width: 100%;
Expand Down Expand Up @@ -66,3 +53,33 @@ a {
height: 100px;
margin: 0 auto 24px auto;
}

.label {
display: inline-block;
font-size: 14px;
margin: 14px 0;
/* We use a slightly different top-bottom padding because Roboto has a
rendering bug which makes an extra padding to be rendered at the bottom of
text. */
padding: 17px 14px 13px 14px;
white-space: nowrap;
}

.label a {
text-transform: uppercase;
}

#optin-label {
background: rgb(66, 133, 244);
background-clip: padding-box;
border-radius: 3px;
margin-right: 24px;
}

#optin-label a {
color: white;
}

#optout-label a {
color: rgb(66, 133, 244);
}
6 changes: 3 additions & 3 deletions chrome/browser/resources/contextual_search/promo.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<p i18n-content="heading" id="heading"></p>
<p id="description">
<span i18n-content="description-1"></span>
<a class="colored" href="#learn-more" i18n-content="feature-name"></a>
<a class="colored-link" href="#learn-more" i18n-content="feature-name"></a>
<span i18n-content="description-2"></span>
</p>
<div id="button-container">
<span class="label"><a href="#optout" i18n-content="optOut"></a></span>
<span id="optin-label" class="label"><a class="colored" href="#optin" i18n-content="optIn"></a></span>
<span id="optout-label" class="label"><a href="#optout" i18n-content="optOut"></a></span>
<span id="optin-label" class="label"><a href="#optin" i18n-content="optIn"></a></span>
</div>
</div>
</body>
Expand Down

0 comments on commit 09cf097

Please sign in to comment.