diff options
| author | Scott Main <smain@google.com> | 2013-02-21 15:20:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-21 15:20:06 -0800 |
| commit | 341ac8b42315e8dcd7d76c0a7801eff5bb60a3b5 (patch) | |
| tree | b52b4fa6ef126c9fc2e18de59962ce1145afde84 /tools | |
| parent | 283d7a0231982f3f34ab9f2c572de01146c58f76 (diff) | |
| parent | 3c205c4fef400c6fce60d9d1f425491a0b5ea3c5 (diff) | |
| download | build-341ac8b42315e8dcd7d76c0a7801eff5bb60a3b5.zip build-341ac8b42315e8dcd7d76c0a7801eff5bb60a3b5.tar.gz build-341ac8b42315e8dcd7d76c0a7801eff5bb60a3b5.tar.bz2 | |
am 3c205c4f: am 4edc153f: am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
* commit '3c205c4fef400c6fce60d9d1f425491a0b5ea3c5':
docs: add image frame style and left-float figure box
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index 20e462c..96123b2 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -2443,7 +2443,8 @@ p.img-caption { color:#666; } -div.figure { +div.figure, +div.figure-right { float:right; clear:right; margin:10px 0 0 0; @@ -2451,6 +2452,19 @@ div.figure { /* width must be defined w/ an inline style matching the image width */ } +div.figure-left { + float:left; + clear:left; + margin:10px 0 0 0; + padding:0 0 0 20px; + /* width must be defined w/ an inline style matching the image width */ +} + +img.frame { + border:1px solid #DDD; + padding:4px; +} + p.table-caption { margin: 0 0 4px 0; font-size:13px; |