From e9e2e75bb034df159f9eacef36af5f1d08a310ea Mon Sep 17 00:00:00 2001 From: Timo Breumelhof Date: Thu, 11 Jul 2019 16:24:44 +0200 Subject: [PATCH 1/3] Removed inline CSS, add root css Calss (oc-view) --- OpenContent/View.ascx | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/OpenContent/View.ascx b/OpenContent/View.ascx index 1d8f3686..ffdf0b88 100644 --- a/OpenContent/View.ascx +++ b/OpenContent/View.ascx @@ -3,47 +3,9 @@ - -
+

Choose a template

@@ -480,4 +442,4 @@ }(jQuery, window.Sys)); - \ No newline at end of file + From 696be5bba012dc9b0a398d1ffda0bd1737691a7e Mon Sep 17 00:00:00 2001 From: Timo Breumelhof Date: Thu, 11 Jul 2019 16:33:47 +0200 Subject: [PATCH 2/3] CSS from View.ascx, with added root CSS class Added CSS root class to avoid influencing other User Controls --- OpenContent/module.css | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/OpenContent/module.css b/OpenContent/module.css index e594c20f..970a4851 100644 --- a/OpenContent/module.css +++ b/OpenContent/module.css @@ -39,3 +39,43 @@ margin-left: 1.5em; } +/* For Template Picker */ + +.oc-view .dnnFormItem input[type="checkbox"], .oc-view .dnnFormItem input[type="radio"] { + display: inline-block; + width: auto; + margin: 6px 5px 6px 5px; +} +.oc-view .octemplate { + float: left; + width: 160px; +} +.oc-view .octemplate a { + background-color: #3D3C3C; + display: block; + height: 2em; + padding: 0.3em 0.5em; + margin: 0.3em; + color: #ffffff; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + border-radius: 3px; +} +.oc-view .octemplate a.advanced { + background-color: #1DAFE5; +} +.oc-view .octemplate a.advanced:hover { + color: #3D3C3C; +} +.oc-view .octemplate a:visited { + color: #ffffff; +} +.oc-view .octemplate a:hover { + color: #1DAFE5; +} +.oc-view [v-cloak] { + display: none; +} + + From 72172b434d3477d69102df5f5b26c8320e9c97cf Mon Sep 17 00:00:00 2001 From: Timo Breumelhof Date: Thu, 11 Jul 2019 18:21:26 +0200 Subject: [PATCH 3/3] Added wrapper class --- OpenContent/module.css | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenContent/module.css b/OpenContent/module.css index 970a4851..18692b4b 100644 --- a/OpenContent/module.css +++ b/OpenContent/module.css @@ -1,12 +1,12 @@ -.aspNetDisabled, a.aspNetDisabled, .dnnDisabled, a.dnnDisabled { +.DnnModule-OpenContent .aspNetDisabled, .DnnModule-OpenContent a.aspNetDisabled, .DnnModule-OpenContent .dnnDisabled, a.dnnDisabled { color: #ccc !important; } -.dnnFormPopup { +.DnnModule-OpenContent .dnnFormPopup { z-index: 10000000; } -.dnnFormPopup .ui-dialog-titlebar { +.DnnModule-OpenContent .dnnFormPopup .ui-dialog-titlebar { position: relative; border-bottom: none; font-size: 14px; @@ -15,7 +15,7 @@ /*margin-bottom: 5px;*/ } -.easyimage { +.DnnModule-OpenContent .easyimage { background: transparent; border: none; outline: 0px; @@ -25,32 +25,33 @@ text-align: center; } -.easyimage img { +.DnnModule-OpenContent .easyimage img { display: block; height: auto; margin: 0 auto; max-width: 100%; } -.easyimage.easyimage-side { +.DnnModule-OpenContent .easyimage.easyimage-side { float: right; max-width: 50%; min-width: 10em; margin-left: 1.5em; } + /* For Template Picker */ -.oc-view .dnnFormItem input[type="checkbox"], .oc-view .dnnFormItem input[type="radio"] { +.DnnModule-OpenContent .oc-view .dnnFormItem input[type="checkbox"], .DnnModule-OpenContent .oc-view .dnnFormItem input[type="radio"] { display: inline-block; width: auto; margin: 6px 5px 6px 5px; } -.oc-view .octemplate { +.DnnModule-OpenContent .oc-view .octemplate { float: left; width: 160px; } -.oc-view .octemplate a { +.DnnModule-OpenContent .oc-view .octemplate a { background-color: #3D3C3C; display: block; height: 2em; @@ -62,20 +63,19 @@ text-overflow: ellipsis; border-radius: 3px; } -.oc-view .octemplate a.advanced { +.DnnModule-OpenContent .oc-view .octemplate a.advanced { background-color: #1DAFE5; } -.oc-view .octemplate a.advanced:hover { +.DnnModule-OpenContent .oc-view .octemplate a.advanced:hover { color: #3D3C3C; } -.oc-view .octemplate a:visited { +.DnnModule-OpenContent .oc-view .octemplate a:visited { color: #ffffff; } -.oc-view .octemplate a:hover { +.DnnModule-OpenContent .oc-view .octemplate a:hover { color: #1DAFE5; } -.oc-view [v-cloak] { + +.DnnModule-OpenContent .oc-view [v-cloak] { display: none; } - -