2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c80947795972/ Changeset: c80947795972 Branch: stable User: jeremy goecks Date: 2014-02-21 22:57:59 Summary: Fix styles for embedded objects in Pages; these were broken during the last style upgrade. Affected #: 3 files diff -r dfcae0da21f7c3885f92c478bc0a44ba75f5f8b6 -r c809477959724304e2342ed5fbdba9d4b412b347 static/style/blue/embed_item.css --- a/static/style/blue/embed_item.css +++ b/static/style/blue/embed_item.css @@ -1,5 +1,5 @@ .embedded-item{margin:0em auto;width:90%;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em} -.embedded-item.display{padding:2px} +.embedded-item.display{padding:5px 10px 10px 10px} .embedded-item.history{background-color:#c1c9e5} .embedded-item.history p{background:#c1c9e5 no-repeat 2px 2px;margin-top:0;margin-bottom:0} .embedded-item.dataset{background-color:#cfc} @@ -8,10 +8,10 @@ .embedded-item.workflow p{background:#fbddb3 no-repeat 2px 2px;margin-top:0;margin-bottom:0} .embedded-item.visualization{background-color:#bbb} .embedded-item.visualization p{background:#bbb no-repeat 2px 2px;margin-top:0;margin-bottom:0} -.embedded-item .expanded-content{display:none} +.embedded-item .expanded-content{display:none;background-color:white;padding:5px} .embedded-item .item-content{max-height:25em;overflow:auto} .embedded-item.visualization .item-content{overflow:hidden} -.embedded-item .title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:2px} +.embedded-item .title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:5px} .embedded-item.placeholder .content{padding:0.5em 0.5em;font-style:italic;text-align:center} table.annotated-item{width:100%;border-collapse:collapse} table.annotated-item td,th{padding:0} diff -r dfcae0da21f7c3885f92c478bc0a44ba75f5f8b6 -r c809477959724304e2342ed5fbdba9d4b412b347 static/style/src/less/embed_item.less --- a/static/style/src/less/embed_item.less +++ b/static/style/src/less/embed_item.less @@ -7,7 +7,7 @@ } .embedded-item.display { - padding: 2px; + padding: 5px 10px 10px 10px; } .embedded-item.history { @@ -53,6 +53,8 @@ .embedded-item .expanded-content { display: none; + background-color: white; + padding: 5px; } .embedded-item .item-content { @@ -68,7 +70,7 @@ vertical-align: top; text-align: center; font-weight: bold; - padding-bottom: 2px; + padding-bottom: 5px; } .embedded-item.placeholder .content { diff -r dfcae0da21f7c3885f92c478bc0a44ba75f5f8b6 -r c809477959724304e2342ed5fbdba9d4b412b347 templates/embed_base.mako --- a/templates/embed_base.mako +++ b/templates/embed_base.mako @@ -14,7 +14,6 @@ ${self.render_summary_content( item, item_data )} </div><div class='expanded-content'> - <hr/><div class='item-content'></div></div></div> https://bitbucket.org/galaxy/galaxy-central/commits/6b6c7de6bbe1/ Changeset: 6b6c7de6bbe1 User: jeremy goecks Date: 2014-02-21 22:58:46 Summary: Automated merge of stable branch to default. Affected #: 3 files diff -r 1beac989dac959139f421353a5f33f53c1e78d96 -r 6b6c7de6bbe10721674f50ebb5e8a600d8586416 static/style/blue/embed_item.css --- a/static/style/blue/embed_item.css +++ b/static/style/blue/embed_item.css @@ -1,5 +1,5 @@ .embedded-item{margin:0em auto;width:90%;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em} -.embedded-item.display{padding:2px} +.embedded-item.display{padding:5px 10px 10px 10px} .embedded-item.history{background-color:#c1c9e5} .embedded-item.history p{background:#c1c9e5 no-repeat 2px 2px;margin-top:0;margin-bottom:0} .embedded-item.dataset{background-color:#cfc} @@ -8,10 +8,10 @@ .embedded-item.workflow p{background:#fbddb3 no-repeat 2px 2px;margin-top:0;margin-bottom:0} .embedded-item.visualization{background-color:#bbb} .embedded-item.visualization p{background:#bbb no-repeat 2px 2px;margin-top:0;margin-bottom:0} -.embedded-item .expanded-content{display:none} +.embedded-item .expanded-content{display:none;background-color:white;padding:5px} .embedded-item .item-content{max-height:25em;overflow:auto} .embedded-item.visualization .item-content{overflow:hidden} -.embedded-item .title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:2px} +.embedded-item .title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:5px} .embedded-item.placeholder .content{padding:0.5em 0.5em;font-style:italic;text-align:center} table.annotated-item{width:100%;border-collapse:collapse} table.annotated-item td,th{padding:0} diff -r 1beac989dac959139f421353a5f33f53c1e78d96 -r 6b6c7de6bbe10721674f50ebb5e8a600d8586416 static/style/src/less/embed_item.less --- a/static/style/src/less/embed_item.less +++ b/static/style/src/less/embed_item.less @@ -7,7 +7,7 @@ } .embedded-item.display { - padding: 2px; + padding: 5px 10px 10px 10px; } .embedded-item.history { @@ -53,6 +53,8 @@ .embedded-item .expanded-content { display: none; + background-color: white; + padding: 5px; } .embedded-item .item-content { @@ -68,7 +70,7 @@ vertical-align: top; text-align: center; font-weight: bold; - padding-bottom: 2px; + padding-bottom: 5px; } .embedded-item.placeholder .content { diff -r 1beac989dac959139f421353a5f33f53c1e78d96 -r 6b6c7de6bbe10721674f50ebb5e8a600d8586416 templates/embed_base.mako --- a/templates/embed_base.mako +++ b/templates/embed_base.mako @@ -14,7 +14,6 @@ ${self.render_summary_content( item, item_data )} </div><div class='expanded-content'> - <hr/><div class='item-content'></div></div></div> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.