aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorMaZderMind2015-02-27 17:21:51 +0100
committerMaZderMind2015-02-27 17:21:51 +0100
commit18031079f5ca57cdac6aa4ab4c236182329bc1f7 (patch)
tree0a63e5861033f3a689af1da4d20ddcf519afee59 /assets
parentea0e8de1c5d132103010ba5aaf98ecb162f66358 (diff)
Work on Room-Page
Diffstat (limited to 'assets')
-rw-r--r--assets/css/_bootstrap-selection.less2
-rw-r--r--assets/css/_room.less25
-rw-r--r--assets/css/_structure.less5
-rw-r--r--assets/js/lustiges-script.js4
4 files changed, 30 insertions, 6 deletions
diff --git a/assets/css/_bootstrap-selection.less b/assets/css/_bootstrap-selection.less
index 3be8064..55c51b8 100644
--- a/assets/css/_bootstrap-selection.less
+++ b/assets/css/_bootstrap-selection.less
@@ -21,7 +21,7 @@
//@import "bootstrap-3.3.2/dropdowns.less";
@import "bootstrap-3.3.2/button-groups.less";
@import "bootstrap-3.3.2/input-groups.less";
-//@import "bootstrap-3.3.2/navs.less";
+@import "bootstrap-3.3.2/navs.less";
@import "bootstrap-3.3.2/navbar.less";
//@import "bootstrap-3.3.2/breadcrumbs.less";
//@import "bootstrap-3.3.2/pagination.less";
diff --git a/assets/css/_room.less b/assets/css/_room.less
new file mode 100644
index 0000000..3bb9d81
--- /dev/null
+++ b/assets/css/_room.less
@@ -0,0 +1,25 @@
+video, audio {
+ display: block;
+}
+
+.tab-content {
+ border-left: 1px solid #ddd;
+ border-bottom: 1px solid #ddd;
+ border-right: 1px solid #ddd;
+
+ padding: 40px 0;
+}
+
+.video.hd .tab-content {
+ padding: 0;
+}
+
+@media (max-width: @screen-md-max) {
+ .video.sd .tab-content {
+ padding: 0;
+ }
+}
+
+.player-wrap {
+ margin-bottom: 60px;
+}
diff --git a/assets/css/_structure.less b/assets/css/_structure.less
index 71eea0f..970425d 100644
--- a/assets/css/_structure.less
+++ b/assets/css/_structure.less
@@ -22,6 +22,9 @@ body {
}
-.overview {
+body.overview {
@import "_overview.less";
}
+body.room {
+ @import "_room.less";
+}
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index de7d137..accedb9 100644
--- a/assets/js/lustiges-script.js
+++ b/assets/js/lustiges-script.js
@@ -152,10 +152,6 @@ $(function() {
})(mejs.i18n.locale.strings);
$('video').mediaelementplayer({
- mode: 'auto_plugin',
-
- // hack z-index so that the flash plugin get's the click on the fullscreen button
- usePluginFullScreen: true,
enableAutosize: true,
pluginPath: 'assets/js/lib/',