Skip to content

Commit

Permalink
Squashed 'plugins/embed/' changes from 799d7be..5e42b4a
Browse files Browse the repository at this point in the history
5e42b4a Merge pull request #216 from nistormihai/master
a1f06cd LB-1883: nzz theme isn't rendering

git-subtree-dir: plugins/embed
git-subtree-split: 5e42b4a583f2c236fd331afb2bd58d349aaa955a
  • Loading branch information
nistormihai committed Jul 15, 2014
1 parent 5f4ad43 commit f25405e
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions gui-resources/scripts/js/build/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gui-resources/scripts/js/build/themes/nzz/desktop.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gui-resources/scripts/js/build/themes/zeit-solo/desktop.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gui-resources/scripts/js/build/themes/zeit/desktop.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gui-themes/themes/nzz/desktop/container.dust
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{>"themeBase/container"/}
{<mainContainer}
<div id="livedesk-root">
<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
{+main}
<div class="liveblog-container">

Expand Down
2 changes: 1 addition & 1 deletion gui-themes/themes/zeit-solo/desktop/container.dust
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{>"themeBase/container"/}
{<mainContainer}
<div id="livedesk-root" data-gimme="blog.view">
<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
{+main}
<div class="liveblog-container">

Expand Down
2 changes: 1 addition & 1 deletion gui-themes/themes/zeit/desktop/container.dust
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{>"themeBase/container"/}
{<mainContainer}
<div id="livedesk-root" data-gimme="blog.view">
<div id="livedesk-root" {+additionalAttributes}{/additionalAttributes} data-gimme="blog.view">
{+main}
<div class="liveblog-container">

Expand Down

0 comments on commit f25405e

Please sign in to comment.