TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-05 18:34:39 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #207 from matthojo/Widget-Fixes

Browse Source 
Widget Bug Fixes
This commit is contained in:
Hannah Wolfe 2013-06-24 08:49:03 -07:00
commit 3713cc4755
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/admin/assets/js/views/dashboard.js
View File

@ -149,6 +149,9 @@
this.$el.html(this.template(this.model.toJSON())); this.$el.html(this.template(this.model.toJSON()));
if (!this.model.attributes.settings.enabled) { if (!this.model.attributes.settings.enabled) {
this.$(".widget-content").html(this.addSubview(new WidgetContent({model: this.model})).render().el); this.$(".widget-content").html(this.addSubview(new WidgetContent({model: this.model})).render().el);
} else {
var size = !this.model.get('size') ? "1x1" : this.model.get('size');
this.$el.find("[data-size='" + size + "']").addClass('active');
} }
return this; return this;
} }

10
core/admin/assets/sass/layouts/dashboard.scss
View File

@ -349,6 +349,16 @@
} }
} }
&.widget-settings {
.widget-content {
background-image: none;
}
.widget-footer {
background: inherit;
opacity: 1;
}
}
} // .widget-image } // .widget-image
/* ========================================================================== /* ==========================================================================

2
core/admin/assets/tpl/widget.hbs
View File

@ -12,7 +12,7 @@
</section> </section>
<footer class="widget-footer"> <footer class="widget-footer">
<div class="widget-size-options"> <div class="widget-size-options">
<div class="size-options-container active js-widget-resizer" data-size="1x1"> <div class="size-options-container js-widget-resizer" data-size="1x1">
<span class="mini-widget size-1x1 active"></span> <span class="mini-widget size-1x1 active"></span>
<span class="mini-widget size-1x1"></span> <span class="mini-widget size-1x1"></span>
<span class="mini-widget size-1x1"></span> <span class="mini-widget size-1x1"></span>