Skip to content

Commit

Permalink
cleaned up spacing on metabar
Browse files Browse the repository at this point in the history
  • Loading branch information
mikhuang committed Apr 15, 2013
1 parent 9f17043 commit 1775db2
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion deme_django/cms/templates/includes/metabar_section.html
@@ -1,4 +1,4 @@
<div class="section">
<button type="button" class="header collapsed" data-toggle="collapse" data-target="#{{id}}"><span class="icon"><i class="glyphicon glyphicon-play"></i></span> {{title}}:</button>
<div class="collapse" id="{{id}}"></div>
<div class="collapse" id="{{id}}"><div class="content"></div></div>
</div>
10 changes: 8 additions & 2 deletions deme_django/static/css/deme.css
Expand Up @@ -4844,7 +4844,7 @@ you can use the generic selector below, but it's slower:
text-align: left;
background: none;
font-size: 12px;
padding: 5px 10px;
padding: 2px 10px;
}
#metabar .section > button.header .icon {
font-size: 9px;
Expand All @@ -4866,11 +4866,17 @@ you can use the generic selector below, but it's slower:
transform: rotate(0deg);
}
#metabar .section > .collapse {
margin: 0 10px;
margin: 0;
}
#metabar .section > .collapse .content {
margin: 10px;
}
#metabar .section > .collapse h3 {
font-size: 1em;
line-height: 1;
margin: 0;
font-weight: bold;
}
#metabar .section > .collapse#metadata_content_item_details h3:first-child {
display: none;
}
4 changes: 2 additions & 2 deletions deme_django/static/javascripts/deme/metabar.js
Expand Up @@ -68,11 +68,11 @@ $(function(){
var target = $this.attr('data-target');
var name = target.replace('#metadata_content_', '');
var url = metabar_ajax_url(name);
$this.next('.collapse').html('Loading&hellip;');
$this.next('.collapse').find('.content').html('Loading&hellip;');
$.ajax({
url: url,
success: function(data) {
$this.next('.collapse').html(data);
$this.next('.collapse').find('.content').html(data);
}
})
$this.addClass('ajax-loaded');
Expand Down
11 changes: 7 additions & 4 deletions deme_django/static/less/deme/metabar.less
Expand Up @@ -60,7 +60,7 @@
text-align: left;
background: none;
font-size: 12px;
padding: 5px 10px;
padding: 2px 10px;
.icon {
//margin-top: 8px;
font-size: 9px;
Expand All @@ -77,15 +77,18 @@
}
}
> .collapse {
margin: 0 10px;
margin: 0;
.content {
margin: 10px;
}
h3 {
font-size: 1em;
line-height: 1;
margin: 0;
font-weight: bold;
}
h3:first-child {
//display: none; // removing header from being displayed as opposed to changing code
&#metadata_content_item_details h3:first-child {
display: none; // removing header from being displayed as opposed to changing code
}
}
}
Expand Down

0 comments on commit 1775db2

Please sign in to comment.