summaryrefslogtreecommitdiff
path: root/yaksh/static
diff options
context:
space:
mode:
authorankitjavalkar2020-10-08 16:12:01 +0530
committerGitHub2020-10-08 16:12:01 +0530
commitaaf8f36bce5fff6c36bcbac3fa038ae99304b73f (patch)
treeb00c763f1ef38a3abf43f4f337d97f67ae04337a /yaksh/static
parentf61351f6a4e7a6150e66ca39f23ac14f9a60de96 (diff)
parent78eb6dc42e73551c2bb9972e53a2d7dd3b81e7d7 (diff)
downloadonline_test-aaf8f36bce5fff6c36bcbac3fa038ae99304b73f.tar.gz
online_test-aaf8f36bce5fff6c36bcbac3fa038ae99304b73f.tar.bz2
online_test-aaf8f36bce5fff6c36bcbac3fa038ae99304b73f.zip
Merge pull request #778 from ankitjavalkar/cruise-comments-under-video
[Rebased] Comments under video lesson
Diffstat (limited to 'yaksh/static')
-rw-r--r--yaksh/static/yaksh/css/custom.css49
-rw-r--r--yaksh/static/yaksh/js/show_toc.js18
2 files changed, 61 insertions, 6 deletions
diff --git a/yaksh/static/yaksh/css/custom.css b/yaksh/static/yaksh/css/custom.css
index 26efbed..edb9530 100644
--- a/yaksh/static/yaksh/css/custom.css
+++ b/yaksh/static/yaksh/css/custom.css
@@ -109,12 +109,49 @@ body, .dropdown-menu {
FORUM STYLE
----------------------------------------------------- */
-.brown-light {
- background: #f4a460;
- padding-left: 0.3em;
- padding-right: 0.3em;
- padding-top: 0.2em;
- padding-bottom: 0.2em;
+ #wrapper {
+ overflow-x: hidden;
+ }
+
+#sidebar-wrapper {
+ min-height: 100vh;
+ margin-left: -15rem;
+ -webkit-transition: margin .25s ease-out;
+ -moz-transition: margin .25s ease-out;
+ -o-transition: margin .25s ease-out;
+ transition: margin .25s ease-out;
+}
+
+#sidebar-wrapper .sidebar-heading {
+ padding: 0.875rem 1.25rem;
+ font-size: 1.2rem;
+}
+
+#sidebar-wrapper .list-group {
+ width: 15rem;
+}
+
+#page-content-wrapper {
+ min-width: 100vw;
+}
+
+#wrapper.toggled #sidebar-wrapper {
+ margin-left: 0;
+}
+
+@media (min-width: 768px) {
+ #sidebar-wrapper {
+ margin-left: 0;
+ }
+
+ #page-content-wrapper {
+ min-width: 0;
+ width: 100%;
+ }
+
+ #wrapper.toggled #sidebar-wrapper {
+ margin-left: -15rem;
+ }
}
.post_image, .comment_image {
diff --git a/yaksh/static/yaksh/js/show_toc.js b/yaksh/static/yaksh/js/show_toc.js
index b628eaa..7d9b68e 100644
--- a/yaksh/static/yaksh/js/show_toc.js
+++ b/yaksh/static/yaksh/js/show_toc.js
@@ -2,6 +2,24 @@ $(document).ready(function() {
$('#sidebarCollapse').on('click', function () {
$('#sidebar').toggleClass('active');
});
+
+ $(document).ready(() => {
+ $(function() {
+ tinymce.init({
+ selector: 'textarea#id_description',
+ setup : function(ed) {
+ ed.on('change', function(e) {
+ tinymce.triggerSave();
+ });
+ },
+ max_height: 400,
+ height: 400,
+ plugins: "image code link",
+ convert_urls: false
+ });
+ });
+ });
+
player = new Plyr('#player');
var totalSeconds;
store_video_time(contents_by_time);