diff options
| author | Scott Main <smain@google.com> | 2013-07-15 21:15:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-15 21:15:26 +0000 |
| commit | d67d02274da846184449ac02aba7eafdcba889b1 (patch) | |
| tree | a156a40c76c0ddd2d42fcae3b911bcfdd0f503e4 | |
| parent | 988251c92269676c891dcb548fecdc100755b431 (diff) | |
| parent | e80ddbe976eae576de3c9c32d45c2f2a35097887 (diff) | |
| download | platform_build-jb-mr2-dev.tar.gz platform_build-jb-mr2-dev.tar.bz2 platform_build-jb-mr2-dev.zip | |
Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-devjb-mr2-dev
* changes:
fix design/develop boxes float
add style to add nexus 4 frame to screenshots
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 13 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png | bin | 0 -> 301931 bytes |
2 files changed, 13 insertions, 0 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index f71d0a0447..91b0f596f0 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -844,6 +844,18 @@ scroll top left; width: 216px; height: 384px; } +.framed-nexus4-port-216 { + background: transparent url(../images/styles/device_nexus4_blank_port_432.png) no-repeat +scroll top left; + background-size:240px 465px; + padding: 52px 12px 52px 12px; + overflow: hidden; } + .framed-nexus4-port-216, .framed-nexus4-port-216 video, + .framed-nexus4-port-216 img { + width: 216px; + height: 360px; } + + /* landing page disclosures */ .landing-page-link { text-decoration: none; @@ -2649,6 +2661,7 @@ div.design-announce p { a.notice-developers, a.notice-designers { float:right; + clear:right; width:238px; min-height:50px; margin:0 0 20px 20px; diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png Binary files differnew file mode 100644 index 0000000000..9d41aa330a --- /dev/null +++ b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png |
