chrome/browser/resources/about_conflicts.html - Issue 10641013: Build fix after r143476

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/about_conflicts.html

Issue 10641013: Build fix after r143476 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/resources/about_conflicts.html

diff --git a/chrome/browser/resources/about_conflicts.html b/chrome/browser/resources/about_conflicts.html

index 7a1f85afbc435e4592d787bc7541f02afeeb3b42..d5b7f17000f305025fc9fc48c16fb29a535e8998 100644

--- a/chrome/browser/resources/about_conflicts.html

+++ b/chrome/browser/resources/about_conflicts.html

@@ -26,7 +26,7 @@ div#header {

}

#header h1 {

- background: url('../../app/theme/about_conflicts.png') 0px 20px no-repeat;

+ background: url('../../app/theme/default_100_percent/about_conflicts.png') 0px 20px no-repeat;

display: inline;

margin: 0;

padding-bottom: 43px;

@@ -35,7 +35,7 @@ div#header {

}

html[dir=rtl] #header h1 {

- background: url('../../app/theme/about_conflicts.png') right no-repeat;

+ background: url('../../app/theme/default_100_percent/about_conflicts.png') right no-repeat;

padding-right: 95px;

padding-left: 0;

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »