Reconcile with jb-dev (2cb0549a) · Commits · e / os / android_build

tools/droiddoc/templates-sdk/assets/css/default.css

+20 −8

Original line number	Diff line number	Diff line
		@@ -96,6 +96,11 @@ body {
		margin:0;
		top: 20px; }

		#devdoc-nav span.small {
		font-size:12px;
		font-weight:normal;
		}

		#content {
		width: 760px;
		float: left; }
		@@ -914,7 +919,7 @@ ul ul, ul ol, ol ul, ol ol {
		margin-top: 0;
		}
		li {
		margin:0 0 4px;
		margin:0 0 5px;
		}
		dd {
		margin:0 0 10px 30px;
		@@ -924,7 +929,7 @@ dd p {
		}
		ul p,
		ol p {
		margin:10px 0 0;
		margin:5px 0 0;
		}
		pre strong, pre b, a strong, a b, a code {
		color: inherit;
		@@ -1620,6 +1625,7 @@ EndColorStr='#ececec');
		border-left:4px solid #99CC00;
		float:right;
		padding:0 0 0 10px;
		margin:0 0 1em 20px;
		}

		.sidebox h2,
		@@ -1819,7 +1825,7 @@ form .form-error input[type='text'], form .form-error textarea {
		Code Style
		*/
		pre {
		margin: 1em 0;
		margin:0 0 1em 0;
		padding: 1em;
		overflow: auto;
		border: solid 1px #ddd;
		@@ -2224,11 +2230,17 @@ div.figure {
		}

		p.table-caption {
		margin: 0 0 4px 0; /* matches default table left-margin */
		margin: 0 0 4px 0;
		font-size:13px;
		color:#666;
		}

		p.code-caption {
		margin: 0 0 4px 0;
		font: 13px/1.5 'courier new', courier, monospace;
		color:#666;
		}

		div.note,
		div.caution,
		div.warning {
		@@ -2242,15 +2254,15 @@ p.warning, div.warning {
		border-left: 4px solid;
		}

		p.note {
		p.note, div.note {
		border-color: #258AAF;
		}

		p.caution {
		p.caution, div.caution {
		border-color: #FF8800;
		}

		p.warning {
		p.warning, div.warning {
		border-color: #ff4443;
		}

		@@ -2274,7 +2286,7 @@ div.note.distribute {
		margin-bottom:0;
		}

		blockquote {
		body.about blockquote {
		display:block;
		float:right;
		width:280px;

+9 −8

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ $(document).ready(function() {
		$('.scroll-pane').jScrollPane( {verticalGutter:0} );

		// add HRs below all H2s (except for a few other h2 variants)
		$('h2').not('#qv h2').not('#tb h2').not('#devdoc-nav h2').css({marginBottom:0}).after('<hr/>');
		$('h2').not('#qv h2').not('#tb h2').not('.sidebox h2').not('#devdoc-nav h2').css({marginBottom:0}).after('<hr/>');

		// set search's onkeyup handler here so we can show suggestions
		// even while search results are visible
		@@ -1811,13 +1811,14 @@ function escapeHTML(string) {
		/* ################# JAVADOC REFERENCE ################### */
		/* ######################################################## */

		/* Initialize some droiddoc stuff */
		/* Initialize some droiddoc stuff, but only if we're in the reference */
		if (location.pathname.indexOf("/reference") == 0) {
		$(document).ready(function() {

		// init available apis based on user pref
		changeApiLevel();
		initSidenavHeightResize()
		});
		}

		var API_LEVEL_COOKIE = "api_level";
		var minLevel = 1;