am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* commit 'd67d02274da846184449ac02aba7eafdcba889b1':
fix design/develop boxes float
add style to add nexus 4 frame to screenshots
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index f71d0a0..91b0f59 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -844,6 +844,18 @@
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 @@
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
new file mode 100644
index 0000000..9d41aa3
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png
Binary files differ
