From bae5e615dde781e4c72b2e7ab551fa2d9f28953b Mon Sep 17 00:00:00 2001 From: Jacques Dafflon Date: Mon, 30 Mar 2015 17:25:04 +0200 Subject: [PATCH] vc_vidyo: moving generic css out of Vidyo plugin --- vc_vidyo/indico_vc_vidyo/plugin.py | 4 +- .../indico_vc_vidyo/static/css/vc_vidyo.scss | 60 ------------------- .../templates/create_button.html | 6 -- 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 vc_vidyo/indico_vc_vidyo/static/css/vc_vidyo.scss delete mode 100644 vc_vidyo/indico_vc_vidyo/templates/create_button.html diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py index 9b38a6c..ae40950 100644 --- a/vc_vidyo/indico_vc_vidyo/plugin.py +++ b/vc_vidyo/indico_vc_vidyo/plugin.py @@ -28,7 +28,7 @@ from indico.core.plugins import IndicoPlugin, url_for_plugin, IndicoPluginBluepr from indico.core import signals from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError from indico.modules.vc import VCPluginSettingsFormBase, VCPluginMixin -from indico.modules.vc.views import WPVCManageEvent, WPVCEventPage +from indico.modules.vc.views import WPVCEventPage from indico.util.user import retrieve_principal, principal_to_tuple from indico.web.forms.fields import IndicoPasswordField from indico.web.forms.widgets import CKEditorWidget @@ -82,7 +82,6 @@ class VidyoPlugin(VCPluginMixin, IndicoPlugin): def init(self): super(VidyoPlugin, self).init() self.connect(signals.indico_help, self._extend_indico_help) - self.inject_css('vc_vidyo_css', WPVCManageEvent) self.inject_js('vc_vidyo_js', WPTPLConferenceDisplay) self.inject_js('vc_vidyo_js', WPVCEventPage) @@ -302,7 +301,6 @@ class VidyoPlugin(VCPluginMixin, IndicoPlugin): return IndicoPluginBlueprint('vc_vidyo', __name__) def register_assets(self): - self.register_css_bundle('vc_vidyo_css', 'css/vc_vidyo.scss') self.register_js_bundle('vc_vidyo_js', 'js/vc_vidyo.js') def add_cli_command(self, manager): diff --git a/vc_vidyo/indico_vc_vidyo/static/css/vc_vidyo.scss b/vc_vidyo/indico_vc_vidyo/static/css/vc_vidyo.scss deleted file mode 100644 index 4fe5c84..0000000 --- a/vc_vidyo/indico_vc_vidyo/static/css/vc_vidyo.scss +++ /dev/null @@ -1,60 +0,0 @@ -@import "compass/css3/transition"; - -$dropdown-transition-step: 0.05s; -$dropdown-transition: $dropdown-transition-step ease-out; - -%dropdown-visible { - visibility: visible; - opacity: 1.0; - @include transition(visibility $dropdown-transition, - opacity $dropdown-transition, - height $dropdown-transition, - padding $dropdown-transition); -} - -%dropdown-hidden { - visibility: hidden; - opacity: 0.0; - height: 0 !important; - padding: 0 !important; - @include transition(visibility $dropdown-transition, - opacity $dropdown-transition, - height $dropdown-transition, - padding $dropdown-transition); -} - -.form-block > .i-linking { - width: 400px; - > label { - width: 28%; - padding: 0.7em 0; - } - > .i-linking-dropdown, - > span.static-text { - display: inline-block !important; - width: 65% !important; - } - > .i-linking-dropdown > select { width: 100%; } - - > input:checked + label { - + .i-linking-dropdown, - + span { - @extend %dropdown-visible; - } - } - - > input:not(:checked) + label { - + .i-linking-dropdown, - + span { - @extend %dropdown-hidden; - } - } -} - -.i-button.js-create-room { - line-height: 2em; - img { - vertical-align: middle; - width: 2em; - } -} diff --git a/vc_vidyo/indico_vc_vidyo/templates/create_button.html b/vc_vidyo/indico_vc_vidyo/templates/create_button.html deleted file mode 100644 index 485f51f..0000000 --- a/vc_vidyo/indico_vc_vidyo/templates/create_button.html +++ /dev/null @@ -1,6 +0,0 @@ - - - {% trans %}Create new Vidyo room{% endtrans %} -