diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-07 15:42:14 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-07 15:42:14 -0500 |
| commit | f6b149e1909dd0507d1377b9f085123820772594 (patch) | |
| tree | 9b79b650e3b60b4e3cd65f9b889eb3f6136d19f2 /public | |
| parent | 7bbe52577c1ccf5fbd884362282e16a42262c06e (diff) | |
more embed stuff
Diffstat (limited to 'public')
| -rw-r--r-- | public/assets/javascripts/ui/reader/EmbedView.js | 7 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 16 |
2 files changed, 19 insertions, 4 deletions
diff --git a/public/assets/javascripts/ui/reader/EmbedView.js b/public/assets/javascripts/ui/reader/EmbedView.js index 21e351c..7a75e00 100644 --- a/public/assets/javascripts/ui/reader/EmbedView.js +++ b/public/assets/javascripts/ui/reader/EmbedView.js @@ -8,7 +8,7 @@ var EmbedView = ModalView.extend({ "click [name=mute]": "build", "click [name=interactive]": "build", "click textarea": "selectAll", - "click #test": "test", + "click #testEmbed": "test", }, defaultWidth: 600, @@ -45,10 +45,13 @@ var EmbedView = ModalView.extend({ var embed_link = link embed_link += "?mute=" + mute embed_link += "&embed=1" + if (interactive) { + embed_link += "&interactive=1" + } var kode = "<iframe src='" + encodeURI(embed_link) + "' width='" + width + "' height='" + height + "'" kode += " seamless scrolling='no' style='border: 0'" - kode += " webkitAllowFullScreen mozallowfullscreen allowfullscreen" + kode += " webkitallowfullscreen mozallowfullscreen allowfullscreen" if (! interactive) { kode += " style='pointer-events:none;'" } diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 8b987c1..8989aef 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2702,6 +2702,9 @@ a[data-role="forgot-password"] { /* EMBED CODE GENERATOR */ +.embedView { + font-weight: 300; +} .embedView textarea { border: 1px solid black; width: 100%; @@ -2719,9 +2722,18 @@ a[data-role="forgot-password"] { } .embedView label { font-size: 14px; + padding: 0 3px; } -.embedView { - font-weight: 300; +#testEmbed { + cursor: pointer; + float: right; + font-size: 11px; + margin-top: 11px; + font-weight: 100; + color: #888; +} +#testEmbed:hover { + text-decoration: underline; } /* MARCHING ANTS ANIMATION */ |
