am 3497ef57: am 98a2a71f: edit code-caption style margin

* commit '3497ef575318aafbe06387a474ae6d5152fae82f':
  edit code-caption style margin
This commit is contained in:
Scott Main 2013-07-19 15:48:46 -07:00 committed by Android Git Automerger
commit bc66ddea44

View file

@ -90,7 +90,7 @@ body {
outline:none;
width:auto;
margin: 20px 0 0; }
#devdoc-nav h2 {
border:0;
}
@ -99,7 +99,7 @@ body {
position: fixed;
margin:0;
top: 20px; }
#devdoc-nav span.small {
font-size:12px;
font-weight:normal;
@ -116,7 +116,7 @@ acronym:hover {
a:focus,
a:active {
color: #33b5e5 !important; }
a.external-link {
background:url('../images/styles/open_new_page.png') no-repeat 100% 50%;
padding-right:16px;
@ -338,10 +338,10 @@ video.with-shadow {
width: 34px;
height: 34px; }
#nav li.expanded li ul.tree-list-children {
padding:0;
padding:0;
}
#nav li.expanded li ul.tree-list-children .tree-list-children {
padding:0 0 0 10px;
padding:0 0 0 10px;
}
#nav li span.tree-list-subtitle {
display:inline-block;
@ -408,7 +408,7 @@ video.with-shadow {
.content-header.just-links {
margin-bottom:0;
padding-bottom:0;}
.content-header h1 {
color:#000;
margin:0;
@ -470,8 +470,8 @@ video.with-shadow {
height: 10px;
display: inline-block;
margin-left: 5px; }
.training-nav-top a {
display:block;
float:left;
@ -488,25 +488,25 @@ video.with-shadow {
border-left:0;
width:123px;
}
.paging-links a.disabled,
.training-nav-top a.disabled,
.content-footer a.disabled {
color:#bbb;
}
.paging-links a.disabled:hover,
.training-nav-top a.disabled:hover,
.content-footer a.disabled:hover {
cursor:default;
color:#bbb !important;
}
.training-nav-top a.start-class-link,
.training-nav-top a.start-course-link {
width:262px;
}
/* list of classes on course landing page */
ol.class-list {
list-style:none;
@ -549,7 +549,7 @@ video.with-shadow {
ol.class-list li a.title:hover span {
display:block;
}
#jd-content
ol.class-list li img {
float:left;
@ -577,29 +577,29 @@ video.with-shadow {
margin:0 0 6px;
line-height:16px;
}
.hide {
display:none !important;
}
.content-footer.next-class {
display:block;
border:0;
margin-top:0;
padding-top:0;
}
.content-footer.next-class a.next-class-link {
display:block;
float:right;
text-transform:uppercase;
}
/* inner-doc tabs w/ title */
div#title-tabs-wrapper {
border-bottom:1px solid #ccc;
margin:20px 0 30px;
@ -932,7 +932,7 @@ scroll top left;
.ui-table th,
.ui-table td {
padding: 5px 10px;
background-color: inherit;
background-color: inherit;
border:0;}
.ui-table thead th {
font-weight: bold; }
@ -957,7 +957,7 @@ scroll top left;
background-image: url(../images/styles/ico_wrong.png); }
.do-dont-label.good {
background-image: url(../images/styles/ico_good.png); }
@ -1008,7 +1008,7 @@ q {
fieldset, iframe, img {
border: 0;
}
img {
img {
-ms-interpolation-mode: bicubic;
vertical-align: middle;
max-width: 100%;
@ -1043,7 +1043,7 @@ h1.short {
margin-right:320px;
}
h1.super {
font-size: 37px;
font-size: 37px;
}
h2 {
color:#333;
@ -1064,13 +1064,13 @@ h4 {
font-size: 16px;
}
h5 {
font-size: 14px;
font-size: 14px;
}
h5, h6 {
margin: 5px 0;
}
h6 {
font-size: 12px;
font-size: 12px;
}
hr { /* applied to the bottom of h2 elements */
height: 1px;
@ -1256,7 +1256,7 @@ color-stop(50%, #acbc00), color-stop(50%, #bdde00), color-stop(100%, #bdde00));
padding: 0 24px 0 0;
}
.locales form {
margin: 0;
margin: 0;
}
.locales select, .sites select {
line-height: 3.08;
@ -1352,7 +1352,7 @@ color-stop(50%, #acbc00), color-stop(50%, #bdde00), color-stop(100%, #bdde00));
padding: 2.5em 0;
border-top: solid 1px #ddd;
border-bottom: solid 1px #ddd;
background: #f7f7f7;
background: #f7f7f7;
}
.wrap {
margin: 0 auto;
@ -1478,7 +1478,7 @@ Header, Login, Nav-X, Search
top: 24px;
left: 0
}
.search .left, .search .right {
.search .left, .search .right {
height: 5px;
width: 1px
}
@ -1549,7 +1549,7 @@ Header, Login, Nav-X, Search
padding: 0
}
.search-dropdown ul li {
clear: both
clear: both
}
.search-dropdown img {
float: left;
@ -1682,7 +1682,7 @@ color-stop(5%,#f9f9f9), color-stop(50%,#fafafa), color-stop(90%,#f9f9f9), color-
endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */
-webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
-moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
color: #258AAF !important;
}
.button.big {
@ -1715,7 +1715,7 @@ endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */
width:130px;
text-transform:uppercase;
font-weight:bold;
background-color: #f3f3f3;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), to(#ececec));
background-image: -webkit-linear-gradient(top, #f9f9f9, #ececec);
@ -1973,9 +1973,9 @@ ul ul {
padding: 5px;
width: 130px;
}
.article form .browse .browse-msg {
font-size: 11.5px;
font-size: 11.5px;
}
.article form .browse .button-secondary {
height: auto;
@ -1990,7 +1990,7 @@ ul ul {
color: #222;
line-height: normal;
padding: 6px 10px;
width: 300px;
width: 300px;
}
.article form textarea {
height: 150px;
@ -2097,7 +2097,7 @@ pre {
padding: 1em;
overflow: auto;
border: solid 1px #ddd;
background: #f7f7f7;
background: #f7f7f7;
}
.str { color: #080; }
.kwd { color: #008; }
@ -2127,16 +2127,16 @@ Three-Pane
height:270px;
max-height: inherit;
overflow: hidden;
position: relative;
position: relative;
}
#classes-nav {
overflow: hidden;
position: relative;
position: relative;
}
#packages-nav ul, #classes-nav ul {
list-style-type: none;
margin: 10px 0 20px 0;
padding: 0;
padding: 0;
}
#classes-nav li {
font-weight: bold;
@ -2154,7 +2154,7 @@ Three-Pane
#classes-nav li li a, #classes-nav li li a:active, #classes-nav li li a:visited,
#nav-tree li a, #nav-tree li a:active, #nav-tree li a:visited {
color: #222;
font-weight: normal;
font-weight: normal;
}
#packages-nav li a, #packages-nav li a:active, #packages-nav li a:visited,
#classes-nav li li a, #classes-nav li li a:active, #classes-nav li li a:visited {
@ -2200,7 +2200,7 @@ a:visited,
#nav-swap .fullscreen.disabled {
background-position: 0 0;
}
#nav-swap .fullscreen:hover,
#nav-swap .fullscreen:hover,
#nav-swap .fullscreen:focus {
cursor:pointer;
}
@ -2277,13 +2277,13 @@ a:visited,
margin-right:0;
}
#doc-content-container {
margin-left: 291px
margin-left: 291px
}
#doc-header, #doc-content {
padding: 1em 2em;
}
#doc-header {
background: #f7f7f7;
background: #f7f7f7;
}
#doc-header h1 {
line-height: 0;
@ -2411,7 +2411,7 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; }*/
border-bottom: solid 1px #ededed;
background: #f7f7f7 url("../images/resizable-s2.png") no-repeat scroll center center; }
/*
.ui-resizable-e {
.ui-resizable-e {
cursor: e-resize; width: 10px; right: 0; top: 0; height: 100%; border-right: solid
1px #ededed;background: #f7f7f7 url("../images/resizable-e2.png") no-repeat scroll center center; }
*/
@ -2419,7 +2419,7 @@ cursor: e-resize; width: 10px; right: 0; top: 0; height: 100%; border-right: sol
/* --------------------------------------------------------------------------
Lightbox
*/
.lightbox {
.lightbox {
width: 769px;
padding: 1.5em;
margin: 0 auto;
@ -2432,7 +2432,7 @@ Lightbox
.lightbox .header {
float: left;
width: 720px;
margin: -10px 20px 10px 0;
margin: -10px 20px 10px 0;
}
.lightbox .close {
float: right;
@ -2492,7 +2492,7 @@ table.blank th, table.blank td {
.caption {
margin: 0.5em 0 2em 0;
color: #000;
font-size: 11.5px;
font-size: 11.5px;
}
.nolist {
@ -2551,19 +2551,19 @@ p.table-caption {
}
p.code-caption {
margin: 0 0 4px 0;
margin-bottom: 4px;
font: 12px/1.5 monospace;
color:#666;
}
div.note,
div.caution,
div.note,
div.caution,
div.warning {
margin: 0 0 15px;
}
p.note, div.note,
p.caution, div.caution,
p.note, div.note,
p.caution, div.caution,
p.warning, div.warning {
padding: 0 0 0 10px;
border-left: 4px solid;
@ -2719,12 +2719,12 @@ a.header-toggle {
/* -----------------------------------------------
good/bad example containers
good/bad example containers
*/
div.example-block {
background-repeat: no-repeat;
background-position:10px 8px;
background-position:10px 8px;
background-color:#ccc;
padding:4px;
margin:.8em auto 1.5em 2em;
@ -2758,7 +2758,7 @@ div.example-block {
}
/* -----------------------------------------------
Dialog box for popup messages
Dialog box for popup messages
*/
div.dialog {
@ -2824,9 +2824,9 @@ div#naMessage strong {
/* --------------------------------------------------------------------------
Slideshow Controls & Next/Prev
Slideshow Controls & Next/Prev
*/
.slideshow-next, .slideshow-prev {
.slideshow-next, .slideshow-prev {
width: 20px;
height: 36px;
text-indent: -1000em;
@ -2849,7 +2849,7 @@ a.slideshow-next, a.slideshow-next:visited {
a.slideshow-prev, a.slideshow-prev:visited {
float: left;
float: left;
background: url(../images/arrow-left.png) no-repeat 0 0
@ -2857,18 +2857,18 @@ a.slideshow-prev, a.slideshow-prev:visited {
.slideshow-next:hover, .slideshow-prev:hover, .slideshow-next:focus, .slideshow-prev:focus {
background-position: 0 -36px
background-position: 0 -36px
}
.slideshow-next:active, .slideshow-prev:active {
background-position: 0 -72px
background-position: 0 -72px
}
.slideshow-nav {
width: 74px;
margin: 0 auto;
margin: 0 auto;
}
.slideshow-nav a, .slideshow-nav a:visited {
display: inline-block;
@ -2888,7 +2888,7 @@ a.slideshow-prev, a.slideshow-prev:visited {
.slideshow-nav a:active {
background: #1e799a;
background: #ebebeb;
background: #ebebeb;
-webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
-moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05);
@ -2901,7 +2901,7 @@ Tabs
*/
ul.tabs {
padding: 0;
margin: 2em 0 0 0;
margin: 2em 0 0 0;
}
ul.tabs:before, ul.tabs:after {
content: "";
@ -2910,7 +2910,7 @@ ul.tabs:before, ul.tabs:after {
}
ul.tabs li {
list-style-type: none;
float: left;
float: left;
}
ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited {
display: block;
@ -2924,7 +2924,7 @@ ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited {
-moz-border-radius-bottomright: px;
-moz-border-radius-bottomleft: px;
-webkit-border-radius: 2px 2px px px;
border-radius: 2px 2px px px;
border-radius: 2px 2px px px;
border-top: solid 1px #ebebeb;
border-left: solid 1px #ebebeb;
border-right: solid 1px #ebebeb;
@ -2939,7 +2939,7 @@ ul.tabs li a, ul.tabs li a:active, ul.tabs li a:visited {
EndColorStr='#fafafa');
}
ul.tabs li a:hover {
color: #33B5E5;
color: #33B5E5;
}
ul.tabs li a.selected {
height: 37px;
@ -2978,9 +2978,9 @@ Feature Boxes
.dialog .box-border .top,
.dialog .box-border .bottom { width:391px; }
.box-border .left, .box-border .right {
.box-border .left, .box-border .right {
width: 1px;
height: 8px;
height: 8px;
}
.box-border .top { top: 0; left: 0 }
.box-border .top .left { top: 1px; left: 0 }
@ -3015,10 +3015,10 @@ Feature Boxes
transition: color .4s ease;
}
.feature-box:hover {
cursor: pointer;
cursor: pointer;
}
.feature-box:hover .box-border .top, .feature-box:hover .box-border .bottom, .feature-box:hover
.left, .feature-box:hover .right {
.left, .feature-box:hover .right {
background-color: #33B5E5;
}
.feature-box:hover h4, .feature-box:hover a {
@ -3027,7 +3027,7 @@ Feature Boxes
/* --------------------------------------------------------------------------
Page-Specific Styles
*/
.colors {
.colors {
position: relative;
float: left;
width: 92px;
@ -3446,7 +3446,7 @@ ul.search_filtered {
font-size:0.85em;
}
.suggest-card.reference
.suggest-card.reference
.search_filtered li.header {
color:#aaa;
font-size: 0.81em;
@ -3797,7 +3797,7 @@ EndColorStr='#ececec');
}
#quicknav {
float:none;
float:none;
clear:both;
margin-left:180px;
margin-top:-30px;
@ -3865,7 +3865,7 @@ EndColorStr='#ececec');
#header-wrap.quicknav {
height:196px;
}
/* SEARCH AND MORE */
@ -3912,7 +3912,7 @@ EndColorStr='#ececec');
left: 0
}
.search .left, .search .right {
.search .left, .search .right {
height: 5px;
width: 1px
}
@ -3938,10 +3938,10 @@ EndColorStr='#ececec');
.search form input {
color: #2f2f2f;
font-size: 0.95em;
width: 178px;
width: 178px;
border: none;
margin-left: 6px;
z-index: 1500;
margin-left: 6px;
z-index: 1500;
position: relative;
background-color: transparent;
border-bottom:1px solid #CCC;
@ -4010,10 +4010,10 @@ EndColorStr='#ececec');
opacity:0;
-webkit-transform-origin:100% 0%;
-moz-transform-origin:100% 0%;
-moz-transform-origin:100% 0%;
-o-transform-origin:100% 0%;
transform-origin:100% 0%;
-webkit-transition-property: -webkit-opacity;
-webkit-transition-duration: .25s;
-webkit-transition-timing-function:ease;
@ -4025,7 +4025,7 @@ EndColorStr='#ececec');
-o-transition-property: -o-opacity;
-o-transition-duration: .25s;
-o-transition-timing-function:ease;
transition-property: opacity;
transition-duration: .25s;
transition-timing-function:ease;
@ -4123,9 +4123,9 @@ EndColorStr='#ececec');
border-radius:6px;
background-color:#ccc;
cursor:pointer;
-webkit-transition:color .5s ease-in;
-moz-transition:color .5s ease-in;
-o-transition:color .5s ease-in;
-webkit-transition:color .5s ease-in;
-moz-transition:color .5s ease-in;
-o-transition:color .5s ease-in;
transition:color .5s ease-in;
}
.slideshow-container .pagination ul li:hover {
@ -4261,7 +4261,7 @@ a.download-sdk {
background-image: -ms-linear-gradient(left, #5dbcd9, #4cadcb);
background-image: -o-linear-gradient(left, #5dbcd9, #4cadcb);
background-image: linear-gradient(left, #5dbcd9, #4cadcb);
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#5dbcd9', EndColorStr='#4cadcb');
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#5dbcd9', EndColorStr='#4cadcb');
}
.jspHorizontalBar .jspTrack,