From b73ef1677abb874c086863adb39aa51f8bde6069 Mon Sep 17 00:00:00 2001 From: Cody Date: Sat, 23 Nov 2019 15:44:48 -0800 Subject: [PATCH 01/23] Word Breaks in Journal Links + Comments Resizing --- DNN Platform/Modules/Journal/module.css | 28 ++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index f0a19943efa..d9fd744eb6a 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -117,7 +117,7 @@ border-bottom-left-radius: 3px; margin-bottom: 0px; } .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} -.journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;} +.journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} .journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel{display:block;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} @@ -160,10 +160,10 @@ border-bottom-left-radius: 3px; border-bottom:1px solid #fff; /*CSS3*/ - -moz-border-radius-topright: 3px; - -moz-border-radius-topleft: 3px; - -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; + -moz-border-radius-topright: 3px; + -moz-border-radius-topleft: 3px; + -webkit-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } .DnnModule .securityMenu ul{ position:absolute; top:-5px; right:2px; @@ -173,11 +173,11 @@ border-bottom-left-radius: 3px; background:#fff; -webkit-border-radius: 3px 0px 3px 3px; - border-radius: 3px 0px 3px 3px; + border-radius: 3px 0px 3px 3px; -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); } .securityMenu ul li{list-style:none; margin-bottom: 4px;} @@ -207,8 +207,8 @@ div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.pro } .journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;padding:5px;border:1px #ccc solid;} - .journalrow div.journalitem .jlink a{font-weight:bold;display:block} - +.journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} +.journalrow div.journalitem .jlink div{max-width: 67%;word-break:break-word;} div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;} .journalrow .juser{ cursor: pointer;} @@ -258,12 +258,12 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} /*CSS3*/ -moz-border-radius-bottomright: 3px; -moz-border-radius-bottomleft: 3px; - -webkit-border-radius: 0px 0px 3px 3px; - border-radius: 0px 0px 3px 3px; + -webkit-border-radius: 0px 0px 3px 3px; + border-radius: 0px 0px 3px 3px; -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); } ul.ui-autocomplete li{display:block;clear:both;overflow:hidden} ul.ui-autocomplete li a{ From 27f7a34b6f4e26d1e2bc1b72b2727842ab8f9905 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 24 Nov 2019 10:15:19 -0800 Subject: [PATCH 02/23] Update module.css --- DNN Platform/Modules/Journal/module.css | 233 +++++++++++++++++++++++- 1 file changed, 230 insertions(+), 3 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index d9fd744eb6a..d7d455efae3 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "utf-8"; /* CSS Document */ @@ -77,6 +77,233 @@ border-bottom-left-radius: 3px; +.journalTools #journalOptionArea .jpa{display:none;} +.journalTools #journalOptionArea #linkArea #imagePreviewer{width:150px; float:left;margin-right:12px;} +.journalTools #journalOptionArea #linkArea #imagePreviewer #image{width:140px; height:100px; overflow:hidden;} +.journalTools #journalOptionArea #linkArea #imagePreviewer #imgPrev,.journalTools #journalOptionArea #linkArea #imagePreviewer #imgNext{cursor:pointer;} +.journalTools #btnShare,.jcmt li.cmtbtn a{display: inline-block;display:none;outline: none;cursor: pointer;text-align: center;text-decoration: none; + padding: .7em 1.5em .77em;text-shadow: 0 1px 1px rgba(0,0,0,.3);-webkit-border-radius: .3em; -moz-border-radius: .3em;border-radius:.3em;-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2); + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2); box-shadow: 0 1px 2px rgba(0,0,0,.2); color: #fef4e9;cursor:pointer;float:left;background: #005cb2; + background: -webkit-gradient(linear, left top, left bottom, from(#298fd0), to(#005cb2)); + background: -moz-linear-gradient(top, #298fd0, #005cb2); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#298fd0', endColorstr='#005cb2');} + + .journalTools #btnShare:hover,.jcmt li.cmtbtn a:hover {text-decoration: none;background: #003465; + background: -webkit-gradient(linear, left top, left bottom, from(#156292), to(#003465)); + background: -moz-linear-gradient(top, #156292, #003465); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#156292', endColorstr='#003465');} + + .journalTools #btnShare:active,.jcmt li.cmtbtn a:active {position: relative;top: 1px;color: #fff; + background: -webkit-gradient(linear, left top, left bottom, from(#005cb2), to(#298fd0)); + background: -moz-linear-gradient(top, #005cb2, #298fd0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005cb2', endColorstr='#298fd0');} + +.journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} +.journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} + + +.journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} +.journalrow div.author{overflow:hidden;float:left;} +.journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px #ccc solid;padding:4px;} +.journalrow div.journalitem{margin-left:65px;overflow: hidden;word-break: break-all;} + +.journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} +.journalrow div.journalitem .authorname{padding-right:6px;} +.journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} + +/*.journalrow div.journalitem ul.jcmt li{border-bottom: solid 1px #fff;}*/ + .journalrow div.journalitem ul.jcmt { + margin-left: 0px; + margin-bottom: 0px; + } +.journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} +.journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} +.journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel{display:block;} +.journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} +.journalrow div.journalitem ul.jcmt li img{ float: left; + left: 0; + padding: 4px; + position: relative; + top: 0;} +.journalrow div.journalitem ul.jcmt li p{padding:4px 0px 4px 5px; margin:3px 0px 5px 42px;} +.journalrow div.journalitem ul.jcmt li p a{padding-right:6px;} +.journalrow div.journalitem ul.jcmt li p abbr{border-style: none; + display: block; + margin-bottom: 3px; + margin-top: 4px; + padding-left: 5px; + padding-top: 4px;} +.journalrow div.journalitem .journalfooter abbr {border-style:none;} +.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;padding:5px;border:1px #ccc solid;} +.journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} +.journalrow div.journalitem .jlink div{max-width: 67%;word-break:break-word;} +.journalrow div.journalitem .likes{padding:2px;} +.jcmt .cmteditor{max-width:445px;display:none;resize:none;outline:none;} +.jcmt .cmteditarea{margin: 2px 4px 4px 2px;} +.jcmt .cmteditarea .editorPlaceholder{height:18px;font-size:11px;line-height:18px;} +div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;word-break:break-word;} +.journalrow .juser{ cursor: pointer;} +/* Visibility and Security */ +.securityMenu{ + position: absolute; + right:-7px; + display:none; + min-width:200px; height:300px; + margin-top: 24px; + background-color:#fff; + z-index:1000; +} +.securityMenu .handle{ + z-index:1000; + position:absolute; right:2px; top:-28px; + width:26px; height:22px; + border:1px solid #ccc; + border-bottom:1px solid #fff; + + /*CSS3*/ + -moz-border-radius-topright: 3px; + -moz-border-radius-topleft: 3px; + -webkit-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; +} +.DnnModule .securityMenu ul{ + position:absolute; top:-5px; right:2px; + padding:15px; + border:1px solid #ccc; + list-style:none; + background:#fff; + + -webkit-border-radius: 3px 0px 3px 3px; + border-radius: 3px 0px 3px 3px; + + -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + +} +.securityMenu ul li{list-style:none; margin-bottom: 4px;} + +.journalitem p{ + margin-bottom: 5px; + word-break: break-word; +} + +/* File Upload */ +.progress_bar_wrapper{ width: 500px;overflow: hidden;} +.progress-bar div{ background-image: url('Images/progress.gif');position:relative;padding:0 !important;} + +#tbar-attach-Area input:not([type=file]){cursor:pointer; left: 0;top: 0;width: 150px;position:absolute; opacity:0; display:inline;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} + +.journalTools #journalOptionArea div span.browser-upload-btn{position:relative; font-weight: bold; padding-left:0px; cursor:pointer;display: block; } + .browser-upload-btn:hover{cursor:pointer;} +div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.filePreviewArea {padding:0;margin:0} +div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.progress_bar_wrapper{padding:0;margin:0;} + +.journalTools #journalOptionArea #itemUpload .filePreviewArea img { + background: none repeat scroll 0 0 #FFFFFF; + border: 1px solid #E0EFF7; + border-radius: 3px 3px 3px 3px; + margin: 0 0 12px 12px; + padding: 6px; +} + +div#journalOptionArea > div.fileUploadArea { + background: #eff8ff; /* blue */ +} + +div#journalOptionArea div.journal_onlineFileShare, +div#journalOptionArea div.journal_localFileShare { + width: 50%; + float: left; + padding: 0; +} + +div#journalOptionArea div.journal_onlineFileShare { + border-right: 1px solid #cce8ff; + margin-right: 25px; +} +div#journalOptionArea div.journal_localFileShare { + width: 40%; +} + +div#journalOptionArea div.journal_onlineFileShare div { + margin: 0; + padding: 0; +} +div#journalOptionArea div.journal_onlineFileShare a.dnnSecondaryAction { + display: inline-block; + margin: 15px 0 0 15px; +} + +div#journalOptionArea div.journal_localFileShare .dnnInputFileWrapper { + display: inline-block; + margin: 15px 0 0 0; +} +/* Search Suggest */ +ul.ui-autocomplete, +ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} + ul.ui-autocomplete{ + display:none; + position:absolute;top:46px;left:0; + width:auto; + border:1px solid #ccc; background:#fff; + z-index:5; + + /*CSS3*/ + -moz-border-radius-bottomright: 3px; + -moz-border-radius-bottomleft: 3px; + -webkit-border-radius: 0px 0px 3px 3px; + border-radius: 0px 0px 3px 3px; + + -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + } + ul.ui-autocomplete li{display:block;clear:both;overflow:hidden} + ul.ui-autocomplete li a{ + display:block; + padding:10px; + border-bottom:1px #e8e8e8 solid; + clear:both;overflow:hidden + } + ul.ui-autocomplete li a:hover, ul.ui-autocomplete li a.ui-state-focus{ + background:#FEFDDE; + cursor:pointer + } + ul.ui-autocomplete .ui-menu-item a img{ width: 24px;height: 24px;} + ul.ui-autocomplete .ui-menu-item a span.dn{ font-weight: bold;color: #000;margin: 0 4px;} + ul.ui-autocomplete .ui-menu-item a span.un{ color: #ccc;margin: 0 4px;} +.ui-helper-hidden-accessible { display:none; } +} +#journalEditor #tbar > span{display:block;height:16px;width:24px;float:right;background-image:url('images/journal-tools.png'); border:1px solid transparent} +.securityMenu > ul > li > span {display: inline-block; margin-right: 3px;} +#journalEditor #tbar span#tbar-photo{background-position:0 0;} +#journalEditor #tbar span#tbar-attach{background-position:-24px 0;} +#journalEditor #tbar span#tbar-perm{background-position:-81px 0;} +#journalEditor #tbar span#tbar-photo:hover,#journalEditor #tbar span#tbar-photo.selected{background-position:0 -16px;} +#journalEditor #tbar span#tbar-attach:hover,#journalEditor #tbar span#tbar-attach.selected{background-position:-24px -16px;} +#journalEditor #tbar span#tbar-attach:hover{background-position:-24px -16px;} +#journalEditor #tbar span#tbar-perm:hover{background-position:-81px -16px;} +.journalTools #journalOptionArea{background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; + -webkit-border-bottom-right-radius: 3px; +-webkit-border-bottom-left-radius: 3px; +-moz-border-radius-bottomright: 3px; +-moz-border-radius-bottomleft: 3px; +border-bottom-right-radius: 3px; +border-bottom-left-radius: 3px; + top: -10px; + position:relative; + width: 96%; +} + +.journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} +.journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} + +.journalTools #journalOptionArea #itemUpload{margin:0;padding:0;} + + + .journalTools #journalOptionArea .jpa{display:none;} .journalTools #journalOptionArea #linkArea #imagePreviewer{width:150px; float:left;margin-right:12px;} .journalTools #journalOptionArea #linkArea #imagePreviewer #image{width:140px; height:100px; overflow:hidden;} @@ -172,8 +399,8 @@ border-bottom-left-radius: 3px; list-style:none; background:#fff; - -webkit-border-radius: 3px 0px 3px 3px; - border-radius: 3px 0px 3px 3px; + -webkit-border-radius: 3px 0px 3px 3px; + border-radius: 3px 0px 3px 3px; -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); From 7a9e0c9d44a4df120e5a521af6fe9c3d37f5aa51 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 24 Nov 2019 11:28:08 -0800 Subject: [PATCH 03/23] Update module.css --- DNN Platform/Modules/Journal/module.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index d7d455efae3..6794d467c0e 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -101,12 +101,11 @@ border-bottom-left-radius: 3px; .journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} .journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} - .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} .journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px #ccc solid;padding:4px;} -.journalrow div.journalitem{margin-left:65px;overflow: hidden;word-break: break-all;} +.journalrow div.journalitem{margin-left:65px;overflow: hidden;word-break: break-all;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} .journalrow div.journalitem .authorname{padding-right:6px;} .journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} @@ -137,7 +136,7 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem .journalfooter abbr {border-style:none;} .journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;padding:5px;border:1px #ccc solid;} .journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} -.journalrow div.journalitem .jlink div{max-width: 67%;word-break:break-word;} +.journalrow div.journalitem .jlink div{max-width: 100%;word-break:break-word;} .journalrow div.journalitem .likes{padding:2px;} .jcmt .cmteditor{max-width:445px;display:none;resize:none;outline:none;} .jcmt .cmteditarea{margin: 2px 4px 4px 2px;} @@ -174,8 +173,8 @@ div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:n list-style:none; background:#fff; - -webkit-border-radius: 3px 0px 3px 3px; - border-radius: 3px 0px 3px 3px; + -webkit-border-radius: 3px 0px 3px 3px; + border-radius: 3px 0px 3px 3px; -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); From d10ec124d7c360997d9e3255d7a21b1606fde7bd Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Dec 2019 12:03:54 -0800 Subject: [PATCH 04/23] Comment, Option Area and Author Image Styles #journalEditor, .jcmt .cmteditarea { width: 100%;} .journalTools #journalOptionArea {width: 100%;} .journalrow div.journalitem .jlink img {border: 0px; height: auto; max-width:100%;} Removed Borders from images --- DNN Platform/Modules/Journal/module.css | 34 +++++-------------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 6794d467c0e..71bcf49fa41 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -1,11 +1,9 @@ @charset "utf-8"; /* CSS Document */ - - #journalEditor, .jcmt .cmteditarea { display:inline-block; - width:96%; + width:100%; position:relative; background: #fff url('Images/input-bg.png') left top no-repeat; margin:10px 0 0; @@ -38,7 +36,6 @@ #journalEditor #journalPlaceholder,.jcmt .cmteditarea .editorPlaceholder{font-size:14px;color:#999;height:24px;line-height:24px;padding-left:7px;} #journalEditor #journalContent{font-family:Arial, Helvetica; float:left; display:none;height:1px;margin-bottom:4px;padding: 2px 4px 6px 4px;font-size:14px; border: none; -webkit-box-shadow: none; box-shadow: none; line-height:1.3em;width:99%;resize:none;} - #journalEditor .journalPlaceholder {width:100%;} #journalEditor .dnnClear{height:0;} @@ -58,7 +55,7 @@ #journalEditor #tbar span#tbar-attach:hover,#journalEditor #tbar span#tbar-attach.selected{background-position:-24px -16px;} #journalEditor #tbar span#tbar-attach:hover{background-position:-24px -16px;} #journalEditor #tbar span#tbar-perm:hover{background-position:-81px -16px;} -.journalTools #journalOptionArea{background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; +.journalTools #journalOptionArea{width:100%;background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; -webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-left-radius: 3px; -moz-border-radius-bottomright: 3px; @@ -69,14 +66,9 @@ border-bottom-left-radius: 3px; position:relative; width: 96%; } - .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} .journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} - .journalTools #journalOptionArea #itemUpload{margin:0;padding:0;} - - - .journalTools #journalOptionArea .jpa{display:none;} .journalTools #journalOptionArea #linkArea #imagePreviewer{width:150px; float:left;margin-right:12px;} .journalTools #journalOptionArea #linkArea #imagePreviewer #image{width:140px; height:100px; overflow:hidden;} @@ -103,18 +95,14 @@ border-bottom-left-radius: 3px; .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} -.journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px #ccc solid;padding:4px;} - -.journalrow div.journalitem{margin-left:65px;overflow: hidden;word-break: break-all;} +.journalrow div.author img{width:32px;max-width:100%;height:auto;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.journalrow div.journalitem{margin-left:50px;overflow: hidden;word-break: break-all;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} .journalrow div.journalitem .authorname{padding-right:6px;} .journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} /*.journalrow div.journalitem ul.jcmt li{border-bottom: solid 1px #fff;}*/ - .journalrow div.journalitem ul.jcmt { - margin-left: 0px; - margin-bottom: 0px; - } +.journalrow div.journalitem ul.jcmt {margin-left: 0px;margin-bottom: 0px;} .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} @@ -134,7 +122,7 @@ border-bottom-left-radius: 3px; padding-left: 5px; padding-top: 4px;} .journalrow div.journalitem .journalfooter abbr {border-style:none;} -.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;padding:5px;border:1px #ccc solid;} +.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} .journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} .journalrow div.journalitem .jlink div{max-width: 100%;word-break:break-word;} .journalrow div.journalitem .likes{padding:2px;} @@ -187,7 +175,6 @@ div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:n margin-bottom: 5px; word-break: break-word; } - /* File Upload */ .progress_bar_wrapper{ width: 500px;overflow: hidden;} .progress-bar div{ background-image: url('Images/progress.gif');position:relative;padding:0 !important;} @@ -195,7 +182,7 @@ div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:n #tbar-attach-Area input:not([type=file]){cursor:pointer; left: 0;top: 0;width: 150px;position:absolute; opacity:0; display:inline;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .journalTools #journalOptionArea div span.browser-upload-btn{position:relative; font-weight: bold; padding-left:0px; cursor:pointer;display: block; } - .browser-upload-btn:hover{cursor:pointer;} + .browser-upload-btn:hover{cursor:pointer;} div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.filePreviewArea {padding:0;margin:0} div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.progress_bar_wrapper{padding:0;margin:0;} @@ -298,11 +285,7 @@ border-bottom-left-radius: 3px; .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} .journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} - .journalTools #journalOptionArea #itemUpload{margin:0;padding:0;} - - - .journalTools #journalOptionArea .jpa{display:none;} .journalTools #journalOptionArea #linkArea #imagePreviewer{width:150px; float:left;margin-right:12px;} .journalTools #journalOptionArea #linkArea #imagePreviewer #image{width:140px; height:100px; overflow:hidden;} @@ -327,7 +310,6 @@ border-bottom-left-radius: 3px; .journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} .journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} - .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} .journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px #ccc solid;padding:4px;} @@ -367,7 +349,6 @@ border-bottom-left-radius: 3px; .jcmt .cmteditor{max-width:445px;display:none;resize:none;outline:none;} .jcmt .cmteditarea{margin: 2px 4px 4px 2px;} .jcmt .cmteditarea .editorPlaceholder{height:18px;font-size:11px;line-height:18px;} - /* Visibility and Security */ .securityMenu{ position: absolute; @@ -412,7 +393,6 @@ border-bottom-left-radius: 3px; margin-bottom: 5px; word-break: break-word; } - /* File Upload */ .progress_bar_wrapper{ width: 500px;overflow: hidden;} .progress-bar div{ background-image: url('Images/progress.gif');position:relative;padding:0 !important;} From 7ea9f255d134b3ba879730b75d991374768c8012 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Dec 2019 12:05:48 -0800 Subject: [PATCH 05/23] Journal Options Area 100% --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 71bcf49fa41..db298fe15f8 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -280,7 +280,7 @@ border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; top: -10px; position:relative; - width: 96%; + width: 100%; } .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} From a80c9f7d8cff086f6fc38cdbbad39232d950f89f Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Dec 2019 12:07:38 -0800 Subject: [PATCH 06/23] Option Area 100% --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index db298fe15f8..b522b23fe9b 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -64,7 +64,7 @@ border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; top: -10px; position:relative; - width: 96%; + width: 100%; } .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} .journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} From 37209c863dde13e9f01d969bf1146f29631348b2 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Dec 2019 12:11:34 -0800 Subject: [PATCH 07/23] Adjusted Image Margins and Borders --- DNN Platform/Modules/Journal/module.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index b522b23fe9b..86c1f1e76c5 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -312,8 +312,8 @@ border-bottom-left-radius: 3px; .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} -.journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;border:1px #ccc solid;padding:4px;} -.journalrow div.journalitem{margin-left:65px;overflow: hidden;word-break: break-all;} +.journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;} +.journalrow div.journalitem{margin-left:44px;overflow: hidden;word-break: break-all;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} .journalrow div.journalitem .authorname{padding-right:6px;} @@ -412,7 +412,7 @@ div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.pro padding: 6px; } -.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;padding:5px;border:1px #ccc solid;} +.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} .journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} .journalrow div.journalitem .jlink div{max-width: 67%;word-break:break-word;} div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;} From 0c7e70815507c07eb3a93fed3f1898b0cb05cd06 Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Dec 2019 13:18:27 -0800 Subject: [PATCH 08/23] jlink item 100% width --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 86c1f1e76c5..126c28ef8ca 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -414,7 +414,7 @@ div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.pro .journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} .journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} -.journalrow div.journalitem .jlink div{max-width: 67%;word-break:break-word;} +.journalrow div.journalitem .jlink div{max-width: 100%;word-break:break-word;} div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;} .journalrow .juser{ cursor: pointer;} From d681f68e8c03d8a0cd7eb78130755044ead5ff1e Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 6 Dec 2019 14:05:59 -0800 Subject: [PATCH 09/23] Journal Editor 100% Width --- DNN Platform/Modules/Journal/module.css | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 126c28ef8ca..7433fb789ff 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -23,6 +23,7 @@ .journalTools ul.jacmenu{display:none; position: absolute;z-index: 4; list-style-type:none;border:solid 1px #dcdcdc;background-color:#f5f5f5;} .journalTools ul.jacmenu li{padding:2px;list-style-type:none;border-bottom:1px solid #dcdcdc;background-color:#f3f3f3;} +#journalEditor {width:100%;} #journalEditor #journalContent{overflow:auto;outline:none;} #journalEditor #journalContent span{padding:0 2px 0 2px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;} #journalEditor #journalContent .juser, .journalrow .juser{color:#000;border:1px solid #ccd5e4; background-color:#eff2f7;} @@ -272,15 +273,15 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} #journalEditor #tbar span#tbar-attach:hover{background-position:-24px -16px;} #journalEditor #tbar span#tbar-perm:hover{background-position:-81px -16px;} .journalTools #journalOptionArea{background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; - -webkit-border-bottom-right-radius: 3px; --webkit-border-bottom-left-radius: 3px; --moz-border-radius-bottomright: 3px; --moz-border-radius-bottomleft: 3px; -border-bottom-right-radius: 3px; -border-bottom-left-radius: 3px; - top: -10px; - position:relative; - width: 100%; + -webkit-border-bottom-right-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomright: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; + top: -10px; + position:relative; + width: 100%; } .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} From b948e2ea078a92b89f74df07f57acae695c07f7f Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 16:12:03 -0800 Subject: [PATCH 10/23] display to visibility for close icon --- DNN Platform/Modules/Journal/module.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 7433fb789ff..e612219d226 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -29,7 +29,7 @@ #journalEditor #journalContent .juser, .journalrow .juser{color:#000;border:1px solid #ccd5e4; background-color:#eff2f7;} #journalEditor #journalContent .jtag, .journalrow .jtag{border:1px solid #ccc; background-color:#f5f5f5} -#journalEditor #journalClose, #linkClose, .miniclose, .minidel{float:right;display:none;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} +#journalEditor #journalClose, #linkClose, .miniclose, .minidel{float:right;visibility:hidden;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} #journalEditor .minidel{position:absolute;right:0px;} #journalEditor #journalClose{position:absolute; right:6px; top:6px;} @@ -107,7 +107,7 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel{display:block;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel{visibility:visible;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} .journalrow div.journalitem ul.jcmt li img{ float: left; left: 0; From 86540f27aeaea8f60d4b66c974a61695d5e38db4 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 16:40:21 -0800 Subject: [PATCH 11/23] Added hover visibility for #linkClose div:hover #linkClose visibility: visible --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index e612219d226..86a89aaad45 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -107,7 +107,7 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel{visibility:visible;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, div:hover #linkClose{visibility:visible;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} .journalrow div.journalitem ul.jcmt li img{ float: left; left: 0; From cc7bcf81e88ddf291bdd2fc310fca7dea4c8bfb0 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 16:50:12 -0800 Subject: [PATCH 12/23] JournalClose visible hover --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 86a89aaad45..815191c0d81 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -107,7 +107,7 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, div:hover #linkClose{visibility:visible;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, div:hover #linkClose,div:hover #journalEditor #journalClose{visibility:visible;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} .journalrow div.journalitem ul.jcmt li img{ float: left; left: 0; From 4d4cc1868eebe0e52b488eda1d52db9829534f27 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 17:14:18 -0800 Subject: [PATCH 13/23] Update to hover CSS for hover close --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 815191c0d81..5840901ecd1 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -107,7 +107,7 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, div:hover #linkClose,div:hover #journalEditor #journalClose{visibility:visible;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, .journalTools #journalOptionArea:hover #linkClose, #journalEditor:hover #journalClose{visibility:visible;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} .journalrow div.journalitem ul.jcmt li img{ float: left; left: 0; From 32e2b63f965960ce2a9a5cb1059644ea57f01e11 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 21:19:54 -0800 Subject: [PATCH 14/23] Comment Text Area 100% Width --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 5840901ecd1..500d37ed9b7 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -127,7 +127,7 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} .journalrow div.journalitem .jlink div{max-width: 100%;word-break:break-word;} .journalrow div.journalitem .likes{padding:2px;} -.jcmt .cmteditor{max-width:445px;display:none;resize:none;outline:none;} +.jcmt .cmteditor{max-width:100%;display:none;resize:none;outline:none;} .jcmt .cmteditarea{margin: 2px 4px 4px 2px;} .jcmt .cmteditarea .editorPlaceholder{height:18px;font-size:11px;line-height:18px;} div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;word-break:break-word;} From 513a7de11eb1b21e0a1b6c7a0137ad5a995c6263 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 22:34:42 -0800 Subject: [PATCH 15/23] CSS Housecleaning re-applied all changes from original latest branch release in VS Code and pasted to github as an issue doubled CSS size... --- DNN Platform/Modules/Journal/module.css | 273 +++--------------------- 1 file changed, 26 insertions(+), 247 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 500d37ed9b7..542e1da6519 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -1,5 +1,7 @@ @charset "utf-8"; /* CSS Document */ + + #journalEditor, .jcmt .cmteditarea { display:inline-block; @@ -19,16 +21,13 @@ overflow:visible; zoom:1; } - .jcmt .cmteditarea{z-index:0;} .journalTools ul.jacmenu{display:none; position: absolute;z-index: 4; list-style-type:none;border:solid 1px #dcdcdc;background-color:#f5f5f5;} .journalTools ul.jacmenu li{padding:2px;list-style-type:none;border-bottom:1px solid #dcdcdc;background-color:#f3f3f3;} -#journalEditor {width:100%;} #journalEditor #journalContent{overflow:auto;outline:none;} #journalEditor #journalContent span{padding:0 2px 0 2px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;} #journalEditor #journalContent .juser, .journalrow .juser{color:#000;border:1px solid #ccd5e4; background-color:#eff2f7;} #journalEditor #journalContent .jtag, .journalrow .jtag{border:1px solid #ccc; background-color:#f5f5f5} - #journalEditor #journalClose, #linkClose, .miniclose, .minidel{float:right;visibility:hidden;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} #journalEditor .minidel{position:absolute;right:0px;} #journalEditor #journalClose{position:absolute; right:6px; top:6px;} @@ -37,6 +36,7 @@ #journalEditor #journalPlaceholder,.jcmt .cmteditarea .editorPlaceholder{font-size:14px;color:#999;height:24px;line-height:24px;padding-left:7px;} #journalEditor #journalContent{font-family:Arial, Helvetica; float:left; display:none;height:1px;margin-bottom:4px;padding: 2px 4px 6px 4px;font-size:14px; border: none; -webkit-box-shadow: none; box-shadow: none; line-height:1.3em;width:99%;resize:none;} + #journalEditor .journalPlaceholder {width:100%;} #journalEditor .dnnClear{height:0;} @@ -56,7 +56,7 @@ #journalEditor #tbar span#tbar-attach:hover,#journalEditor #tbar span#tbar-attach.selected{background-position:-24px -16px;} #journalEditor #tbar span#tbar-attach:hover{background-position:-24px -16px;} #journalEditor #tbar span#tbar-perm:hover{background-position:-81px -16px;} -.journalTools #journalOptionArea{width:100%;background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; +.journalTools #journalOptionArea{background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; -webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-left-radius: 3px; -moz-border-radius-bottomright: 3px; @@ -67,222 +67,6 @@ border-bottom-left-radius: 3px; position:relative; width: 100%; } -.journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} -.journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} -.journalTools #journalOptionArea #itemUpload{margin:0;padding:0;} -.journalTools #journalOptionArea .jpa{display:none;} -.journalTools #journalOptionArea #linkArea #imagePreviewer{width:150px; float:left;margin-right:12px;} -.journalTools #journalOptionArea #linkArea #imagePreviewer #image{width:140px; height:100px; overflow:hidden;} -.journalTools #journalOptionArea #linkArea #imagePreviewer #imgPrev,.journalTools #journalOptionArea #linkArea #imagePreviewer #imgNext{cursor:pointer;} -.journalTools #btnShare,.jcmt li.cmtbtn a{display: inline-block;display:none;outline: none;cursor: pointer;text-align: center;text-decoration: none; - padding: .7em 1.5em .77em;text-shadow: 0 1px 1px rgba(0,0,0,.3);-webkit-border-radius: .3em; -moz-border-radius: .3em;border-radius:.3em;-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2); - -moz-box-shadow: 0 1px 2px rgba(0,0,0,.2); box-shadow: 0 1px 2px rgba(0,0,0,.2); color: #fef4e9;cursor:pointer;float:left;background: #005cb2; - background: -webkit-gradient(linear, left top, left bottom, from(#298fd0), to(#005cb2)); - background: -moz-linear-gradient(top, #298fd0, #005cb2); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#298fd0', endColorstr='#005cb2');} - - .journalTools #btnShare:hover,.jcmt li.cmtbtn a:hover {text-decoration: none;background: #003465; - background: -webkit-gradient(linear, left top, left bottom, from(#156292), to(#003465)); - background: -moz-linear-gradient(top, #156292, #003465); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#156292', endColorstr='#003465');} - - .journalTools #btnShare:active,.jcmt li.cmtbtn a:active {position: relative;top: 1px;color: #fff; - background: -webkit-gradient(linear, left top, left bottom, from(#005cb2), to(#298fd0)); - background: -moz-linear-gradient(top, #005cb2, #298fd0); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005cb2', endColorstr='#298fd0');} - -.journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} -.journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} - -.journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} -.journalrow div.author{overflow:hidden;float:left;} -.journalrow div.author img{width:32px;max-width:100%;height:auto;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.journalrow div.journalitem{margin-left:50px;overflow: hidden;word-break: break-all;} -.journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} -.journalrow div.journalitem .authorname{padding-right:6px;} -.journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} - -/*.journalrow div.journalitem ul.jcmt li{border-bottom: solid 1px #fff;}*/ -.journalrow div.journalitem ul.jcmt {margin-left: 0px;margin-bottom: 0px;} -.journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} -.journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} -.journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, .journalTools #journalOptionArea:hover #linkClose, #journalEditor:hover #journalClose{visibility:visible;} -.journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} -.journalrow div.journalitem ul.jcmt li img{ float: left; - left: 0; - padding: 4px; - position: relative; - top: 0;} -.journalrow div.journalitem ul.jcmt li p{padding:4px 0px 4px 5px; margin:3px 0px 5px 42px;} -.journalrow div.journalitem ul.jcmt li p a{padding-right:6px;} -.journalrow div.journalitem ul.jcmt li p abbr{border-style: none; - display: block; - margin-bottom: 3px; - margin-top: 4px; - padding-left: 5px; - padding-top: 4px;} -.journalrow div.journalitem .journalfooter abbr {border-style:none;} -.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} -.journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} -.journalrow div.journalitem .jlink div{max-width: 100%;word-break:break-word;} -.journalrow div.journalitem .likes{padding:2px;} -.jcmt .cmteditor{max-width:100%;display:none;resize:none;outline:none;} -.jcmt .cmteditarea{margin: 2px 4px 4px 2px;} -.jcmt .cmteditarea .editorPlaceholder{height:18px;font-size:11px;line-height:18px;} -div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;word-break:break-word;} -.journalrow .juser{ cursor: pointer;} -/* Visibility and Security */ -.securityMenu{ - position: absolute; - right:-7px; - display:none; - min-width:200px; height:300px; - margin-top: 24px; - background-color:#fff; - z-index:1000; -} -.securityMenu .handle{ - z-index:1000; - position:absolute; right:2px; top:-28px; - width:26px; height:22px; - border:1px solid #ccc; - border-bottom:1px solid #fff; - - /*CSS3*/ - -moz-border-radius-topright: 3px; - -moz-border-radius-topleft: 3px; - -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; -} -.DnnModule .securityMenu ul{ - position:absolute; top:-5px; right:2px; - padding:15px; - border:1px solid #ccc; - list-style:none; - background:#fff; - - -webkit-border-radius: 3px 0px 3px 3px; - border-radius: 3px 0px 3px 3px; - - -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -} -.securityMenu ul li{list-style:none; margin-bottom: 4px;} - -.journalitem p{ - margin-bottom: 5px; - word-break: break-word; -} -/* File Upload */ -.progress_bar_wrapper{ width: 500px;overflow: hidden;} -.progress-bar div{ background-image: url('Images/progress.gif');position:relative;padding:0 !important;} - -#tbar-attach-Area input:not([type=file]){cursor:pointer; left: 0;top: 0;width: 150px;position:absolute; opacity:0; display:inline;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} - -.journalTools #journalOptionArea div span.browser-upload-btn{position:relative; font-weight: bold; padding-left:0px; cursor:pointer;display: block; } - .browser-upload-btn:hover{cursor:pointer;} -div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.filePreviewArea {padding:0;margin:0} -div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.progress_bar_wrapper{padding:0;margin:0;} - -.journalTools #journalOptionArea #itemUpload .filePreviewArea img { - background: none repeat scroll 0 0 #FFFFFF; - border: 1px solid #E0EFF7; - border-radius: 3px 3px 3px 3px; - margin: 0 0 12px 12px; - padding: 6px; -} - -div#journalOptionArea > div.fileUploadArea { - background: #eff8ff; /* blue */ -} - -div#journalOptionArea div.journal_onlineFileShare, -div#journalOptionArea div.journal_localFileShare { - width: 50%; - float: left; - padding: 0; -} - -div#journalOptionArea div.journal_onlineFileShare { - border-right: 1px solid #cce8ff; - margin-right: 25px; -} -div#journalOptionArea div.journal_localFileShare { - width: 40%; -} - -div#journalOptionArea div.journal_onlineFileShare div { - margin: 0; - padding: 0; -} -div#journalOptionArea div.journal_onlineFileShare a.dnnSecondaryAction { - display: inline-block; - margin: 15px 0 0 15px; -} - -div#journalOptionArea div.journal_localFileShare .dnnInputFileWrapper { - display: inline-block; - margin: 15px 0 0 0; -} -/* Search Suggest */ -ul.ui-autocomplete, -ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} - ul.ui-autocomplete{ - display:none; - position:absolute;top:46px;left:0; - width:auto; - border:1px solid #ccc; background:#fff; - z-index:5; - - /*CSS3*/ - -moz-border-radius-bottomright: 3px; - -moz-border-radius-bottomleft: 3px; - -webkit-border-radius: 0px 0px 3px 3px; - border-radius: 0px 0px 3px 3px; - - -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - } - ul.ui-autocomplete li{display:block;clear:both;overflow:hidden} - ul.ui-autocomplete li a{ - display:block; - padding:10px; - border-bottom:1px #e8e8e8 solid; - clear:both;overflow:hidden - } - ul.ui-autocomplete li a:hover, ul.ui-autocomplete li a.ui-state-focus{ - background:#FEFDDE; - cursor:pointer - } - ul.ui-autocomplete .ui-menu-item a img{ width: 24px;height: 24px;} - ul.ui-autocomplete .ui-menu-item a span.dn{ font-weight: bold;color: #000;margin: 0 4px;} - ul.ui-autocomplete .ui-menu-item a span.un{ color: #ccc;margin: 0 4px;} -.ui-helper-hidden-accessible { display:none; } -} -#journalEditor #tbar > span{display:block;height:16px;width:24px;float:right;background-image:url('images/journal-tools.png'); border:1px solid transparent} -.securityMenu > ul > li > span {display: inline-block; margin-right: 3px;} -#journalEditor #tbar span#tbar-photo{background-position:0 0;} -#journalEditor #tbar span#tbar-attach{background-position:-24px 0;} -#journalEditor #tbar span#tbar-perm{background-position:-81px 0;} -#journalEditor #tbar span#tbar-photo:hover,#journalEditor #tbar span#tbar-photo.selected{background-position:0 -16px;} -#journalEditor #tbar span#tbar-attach:hover,#journalEditor #tbar span#tbar-attach.selected{background-position:-24px -16px;} -#journalEditor #tbar span#tbar-attach:hover{background-position:-24px -16px;} -#journalEditor #tbar span#tbar-perm:hover{background-position:-81px -16px;} -.journalTools #journalOptionArea{background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; - -webkit-border-bottom-right-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - -moz-border-radius-bottomright: 3px; - -moz-border-radius-bottomleft: 3px; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; - top: -10px; - position:relative; - width: 100%; -} .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} .journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} @@ -313,9 +97,9 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} -.journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#fff;} +.journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .journalrow div.journalitem{margin-left:44px;overflow: hidden;word-break: break-all;} - +.journalitem p{margin-bottom: 5px;word-break: break-word;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} .journalrow div.journalitem .authorname{padding-right:6px;} .journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} @@ -328,7 +112,7 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel{display:block;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, .journalTools #journalOptionArea:hover #linkClose, #journalEditor:hover #journalClose{visibility:visible;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} .journalrow div.journalitem ul.jcmt li img{ float: left; left: 0; @@ -344,12 +128,12 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} padding-left: 5px; padding-top: 4px;} .journalrow div.journalitem .journalfooter abbr {border-style:none;} -.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;} -.journalrow div.journalitem .jlink div{max-width:450px;} +.journalrow div.journalitem .jlink a{font-weight:bold;display:block} +.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} +.journalrow div.journalitem .jlink div{max-width:100%;} .journalrow div.journalitem .likes{padding:2px;} -.jcmt .cmteditor{max-width:445px;display:none;resize:none;outline:none;} -.jcmt .cmteditarea{margin: 2px 4px 4px 2px;} -.jcmt .cmteditarea .editorPlaceholder{height:18px;font-size:11px;line-height:18px;} +.jcmt .cmteditor{max-width:100%;display:none;resize:none;outline:none;} +.jcmt .cmteditarea{margin: 2px 4px 4px 2px;z-index:0;} /* Visibility and Security */ .securityMenu{ position: absolute; @@ -368,10 +152,10 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} border-bottom:1px solid #fff; /*CSS3*/ - -moz-border-radius-topright: 3px; - -moz-border-radius-topleft: 3px; - -webkit-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; + -moz-border-radius-topright: 3px; + -moz-border-radius-topleft: 3px; + -webkit-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; } .DnnModule .securityMenu ul{ position:absolute; top:-5px; right:2px; @@ -380,20 +164,16 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} list-style:none; background:#fff; - -webkit-border-radius: 3px 0px 3px 3px; - border-radius: 3px 0px 3px 3px; + -webkit-border-radius: 3px 0px 3px 3px; + border-radius: 3px 0px 3px 3px; -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); } .securityMenu ul li{list-style:none; margin-bottom: 4px;} -.journalitem p{ - margin-bottom: 5px; - word-break: break-word; -} /* File Upload */ .progress_bar_wrapper{ width: 500px;overflow: hidden;} .progress-bar div{ background-image: url('Images/progress.gif');position:relative;padding:0 !important;} @@ -413,9 +193,8 @@ div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.pro padding: 6px; } -.journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} -.journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} -.journalrow div.journalitem .jlink div{max-width: 100%;word-break:break-word;} + + div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;} .journalrow .juser{ cursor: pointer;} @@ -465,12 +244,12 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} /*CSS3*/ -moz-border-radius-bottomright: 3px; -moz-border-radius-bottomleft: 3px; - -webkit-border-radius: 0px 0px 3px 3px; - border-radius: 0px 0px 3px 3px; + -webkit-border-radius: 0px 0px 3px 3px; + border-radius: 0px 0px 3px 3px; -webkit-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + -moz-box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, .5); } ul.ui-autocomplete li{display:block;clear:both;overflow:hidden} ul.ui-autocomplete li a{ From 4feb1ed61d85930e8495bcef399391c567e109c7 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 8 Dec 2019 22:48:07 -0800 Subject: [PATCH 16/23] Cleaned up whitespace --- DNN Platform/Modules/Journal/module.css | 56 +++++++------------------ 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 542e1da6519..61d77a3c33d 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -1,7 +1,6 @@ @charset "utf-8"; /* CSS Document */ - #journalEditor, .jcmt .cmteditarea { display:inline-block; @@ -23,7 +22,6 @@ } .journalTools ul.jacmenu{display:none; position: absolute;z-index: 4; list-style-type:none;border:solid 1px #dcdcdc;background-color:#f5f5f5;} .journalTools ul.jacmenu li{padding:2px;list-style-type:none;border-bottom:1px solid #dcdcdc;background-color:#f3f3f3;} - #journalEditor #journalContent{overflow:auto;outline:none;} #journalEditor #journalContent span{padding:0 2px 0 2px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;} #journalEditor #journalContent .juser, .journalrow .juser{color:#000;border:1px solid #ccd5e4; background-color:#eff2f7;} @@ -31,15 +29,10 @@ #journalEditor #journalClose, #linkClose, .miniclose, .minidel{float:right;visibility:hidden;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} #journalEditor .minidel{position:absolute;right:0px;} #journalEditor #journalClose{position:absolute; right:6px; top:6px;} - -#journalEditor #journalClose{position:absolute;right:2px;} #journalEditor #journalPlaceholder,.jcmt .cmteditarea .editorPlaceholder{font-size:14px;color:#999;height:24px;line-height:24px;padding-left:7px;} #journalEditor #journalContent{font-family:Arial, Helvetica; float:left; display:none;height:1px;margin-bottom:4px;padding: 2px 4px 6px 4px;font-size:14px; border: none; -webkit-box-shadow: none; box-shadow: none; line-height:1.3em;width:99%;resize:none;} - - #journalEditor .journalPlaceholder {width:100%;} #journalEditor .dnnClear{height:0;} - #journalEditor #tbar{ position:absolute; right:6px; bottom: 5px; @@ -57,17 +50,16 @@ #journalEditor #tbar span#tbar-attach:hover{background-position:-24px -16px;} #journalEditor #tbar span#tbar-perm:hover{background-position:-81px -16px;} .journalTools #journalOptionArea{background-color:#f5f5f5;display:none; border: 1px solid #bbb; border-top:0px none transparent; - -webkit-border-bottom-right-radius: 3px; --webkit-border-bottom-left-radius: 3px; --moz-border-radius-bottomright: 3px; --moz-border-radius-bottomleft: 3px; -border-bottom-right-radius: 3px; -border-bottom-left-radius: 3px; - top: -10px; - position:relative; - width: 100%; + -webkit-border-bottom-right-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-bottomright: 3px; + -moz-border-radius-bottomleft: 3px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; + top: -10px; + position:relative; + width: 100%; } - .journalTools #journalOptionArea div{font-size:12px;padding:6px;padding-top:12px;padding-bottom:12px;} .journalTools #journalOptionArea div span{font-weight:bold;color:#333;padding-right:12px;padding-left:12px;} .journalTools #journalOptionArea #itemUpload{margin:0;padding:0;} @@ -82,7 +74,7 @@ border-bottom-left-radius: 3px; background: -moz-linear-gradient(top, #298fd0, #005cb2); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#298fd0', endColorstr='#005cb2');} - .journalTools #btnShare:hover,.jcmt li.cmtbtn a:hover {text-decoration: none;background: #003465; + .journalTools #btnShare:hover,.jcmt li.cmtbtn a:hover {text-decoration: none;background: #003465; background: -webkit-gradient(linear, left top, left bottom, from(#156292), to(#003465)); background: -moz-linear-gradient(top, #156292, #003465); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#156292', endColorstr='#003465');} @@ -90,11 +82,9 @@ border-bottom-left-radius: 3px; .journalTools #btnShare:active,.jcmt li.cmtbtn a:active {position: relative;top: 1px;color: #fff; background: -webkit-gradient(linear, left top, left bottom, from(#005cb2), to(#298fd0)); background: -moz-linear-gradient(top, #005cb2, #298fd0); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005cb2', endColorstr='#298fd0');} - + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#005cb2', endColorstr='#298fd0');} .journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} .journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} - .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} .journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} @@ -103,7 +93,6 @@ border-bottom-left-radius: 3px; .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} .journalrow div.journalitem .authorname{padding-right:6px;} .journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} - /*.journalrow div.journalitem ul.jcmt li{border-bottom: solid 1px #fff;}*/ .journalrow div.journalitem ul.jcmt { margin-left: 0px; @@ -173,43 +162,33 @@ border-bottom-left-radius: 3px; } .securityMenu ul li{list-style:none; margin-bottom: 4px;} - /* File Upload */ .progress_bar_wrapper{ width: 500px;overflow: hidden;} .progress-bar div{ background-image: url('Images/progress.gif');position:relative;padding:0 !important;} - #tbar-attach-Area input:not([type=file]){cursor:pointer; left: 0;top: 0;width: 150px;position:absolute; opacity:0; display:inline;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} - .journalTools #journalOptionArea div span.browser-upload-btn{position:relative; font-weight: bold; padding-left:0px; cursor:pointer;display: block; } .browser-upload-btn:hover{cursor:pointer;} div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.filePreviewArea {padding:0;margin:0} div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.progress_bar_wrapper{padding:0;margin:0;} - .journalTools #journalOptionArea #itemUpload .filePreviewArea img { background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #E0EFF7; border-radius: 3px 3px 3px 3px; margin: 0 0 12px 12px; padding: 6px; -} - - - +} div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;} .journalrow .juser{ cursor: pointer;} - div#journalOptionArea > div.fileUploadArea { background: #eff8ff; /* blue */ } - div#journalOptionArea div.journal_onlineFileShare, div#journalOptionArea div.journal_localFileShare { width: 50%; float: left; padding: 0; } - div#journalOptionArea div.journal_onlineFileShare { border-right: 1px solid #cce8ff; margin-right: 25px; @@ -217,7 +196,6 @@ div#journalOptionArea div.journal_onlineFileShare { div#journalOptionArea div.journal_localFileShare { width: 40%; } - div#journalOptionArea div.journal_onlineFileShare div { margin: 0; padding: 0; @@ -226,7 +204,6 @@ div#journalOptionArea div.journal_onlineFileShare a.dnnSecondaryAction { display: inline-block; margin: 15px 0 0 15px; } - div#journalOptionArea div.journal_localFileShare .dnnInputFileWrapper { display: inline-block; margin: 15px 0 0 0; @@ -240,7 +217,6 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} width:auto; border:1px solid #ccc; background:#fff; z-index:5; - /*CSS3*/ -moz-border-radius-bottomright: 3px; -moz-border-radius-bottomleft: 3px; @@ -262,7 +238,7 @@ ul.ui-autocomplete li{margin:0;padding:0;list-style:none;} background:#FEFDDE; cursor:pointer } - ul.ui-autocomplete .ui-menu-item a img{ width: 24px;height: 24px;} - ul.ui-autocomplete .ui-menu-item a span.dn{ font-weight: bold;color: #000;margin: 0 4px;} - ul.ui-autocomplete .ui-menu-item a span.un{ color: #ccc;margin: 0 4px;} -.ui-helper-hidden-accessible { display:none; } + ul.ui-autocomplete .ui-menu-item a img{width:24px;height:24px;} + ul.ui-autocomplete .ui-menu-item a span.dn{font-weight:bold;color: #000;margin: 0 4px;} + ul.ui-autocomplete .ui-menu-item a span.un{color: #ccc;margin: 0 4px;} +.ui-helper-hidden-accessible{display:none;} From b32ce509efe7aa9888adf6d2328f382a4c54b25f Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 09:54:47 -0800 Subject: [PATCH 17/23] Separated Journal Close Separated Journal Close to allow Javascript function event to handle Display:none as originally intended. --- DNN Platform/Modules/Journal/module.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 61d77a3c33d..d9837969114 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -26,7 +26,8 @@ #journalEditor #journalContent span{padding:0 2px 0 2px;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;} #journalEditor #journalContent .juser, .journalrow .juser{color:#000;border:1px solid #ccd5e4; background-color:#eff2f7;} #journalEditor #journalContent .jtag, .journalrow .jtag{border:1px solid #ccc; background-color:#f5f5f5} -#journalEditor #journalClose, #linkClose, .miniclose, .minidel{float:right;visibility:hidden;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} +#journalEditor #journalClose{float:right;display:none;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} +#linkClose, .miniclose, .minidel{float:right;visibility:hidden;width:18px !important; height:18px !important; cursor:pointer; background-image:url('images/mini_del.gif'); background-repeat:no-repeat;} #journalEditor .minidel{position:absolute;right:0px;} #journalEditor #journalClose{position:absolute; right:6px; top:6px;} #journalEditor #journalPlaceholder,.jcmt .cmteditarea .editorPlaceholder{font-size:14px;color:#999;height:24px;line-height:24px;padding-left:7px;} From f1e2351eed6e738c0aabff63fefcb96000e76ff3 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 10:02:59 -0800 Subject: [PATCH 18/23] Removed #journalEditor:hover #journalClose 105 #journalEditor:hover #journalClose visibility does not need to be set as it is handled by a javascript event function that changes display:none. --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index d9837969114..faf113521ad 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -102,7 +102,7 @@ .journalrow div.journalitem ul.jcmt, .journalrow div.journalitem ul.jcmt li{list-style-type:none;} .journalrow div.journalitem ul.jcmt li textarea{border:solid 0px #ccc;font-family:tahoma,verdana,arial,sans-serif;font-size:12px;padding:0px;height:20px;margin-left:0px;margin-right:0px;width:100%;max-width:100%;word-break:break-word;} .journalrow div.journalitem ul.jcmt li .miniclose{margin:2px;} -.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, .journalTools #journalOptionArea:hover #linkClose, #journalEditor:hover #journalClose{visibility:visible;} +.journalrow div.journalitem ul.jcmt li:hover .miniclose, .journalrow:hover .minidel, .journalTools #journalOptionArea:hover #linkClose{visibility:visible;} .journalrow div.journalitem ul.jcmt li.cmtbtn a{display:none;} .journalrow div.journalitem ul.jcmt li img{ float: left; left: 0; From 80c3c2d428710bf3968ee132f633b42e05f036ce Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 11:06:41 -0800 Subject: [PATCH 19/23] Comment Area 99% Max-Width --- DNN Platform/Modules/Journal/module.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index faf113521ad..fc666399561 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -178,7 +178,7 @@ div.journalTools div#journalOptionArea div.fileUploadArea div#itemUpload div.pro margin: 0 0 12px 12px; padding: 6px; } -div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;} +div#journalItems div.journalrow div.journalitem ul.jcmt li.cmteditarea{display:none;overflow:auto;max-width:99%;} .journalrow .juser{ cursor: pointer;} div#journalOptionArea > div.fileUploadArea { From 85a0842677fab5b6299f3b7f0f711d94e2a10583 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 11:48:47 -0800 Subject: [PATCH 20/23] display: inline-flex support for journal items. --- DNN Platform/Modules/Journal/module.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index fc666399561..1c408780e79 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -87,6 +87,9 @@ .journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} .journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} +.journalrow div.journalitem ul.jcmt li p a{display: inline-flex;} +.journalrow div.journalitem .jlink a{display: inline-flex;} +.journalrow div.journalitem .authorname{display: inline-flex;} .journalrow div.author{overflow:hidden;float:left;} .journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .journalrow div.journalitem{margin-left:44px;overflow: hidden;word-break: break-all;} From ae179167f480893b54fc45756396da7cdba45b66 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 12:31:18 -0800 Subject: [PATCH 21/23] comment author flex added missing word-breaks --- DNN Platform/Modules/Journal/module.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 1c408780e79..e40cbc9e6a2 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -87,15 +87,12 @@ .journalTools #btnShare.disabled,.jcmt li.cmtbtn a.disabled{background:#cdcdcd;color:#999;cursor:text;} .journalTools ul.jacmenu li.liselected{background-color:#ffffcc;} .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} -.journalrow div.journalitem ul.jcmt li p a{display: inline-flex;} -.journalrow div.journalitem .jlink a{display: inline-flex;} -.journalrow div.journalitem .authorname{display: inline-flex;} .journalrow div.author{overflow:hidden;float:left;} .journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .journalrow div.journalitem{margin-left:44px;overflow: hidden;word-break: break-all;} .journalitem p{margin-bottom: 5px;word-break: break-word;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} -.journalrow div.journalitem .authorname{padding-right:6px;} +.journalrow div.journalitem .authorname{padding-right:6px;display:flex;} .journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} /*.journalrow div.journalitem ul.jcmt li{border-bottom: solid 1px #fff;}*/ .journalrow div.journalitem ul.jcmt { @@ -113,7 +110,7 @@ position: relative; top: 0;} .journalrow div.journalitem ul.jcmt li p{padding:4px 0px 4px 5px; margin:3px 0px 5px 42px;} -.journalrow div.journalitem ul.jcmt li p a{padding-right:6px;} +.journalrow div.journalitem ul.jcmt li p a{padding-right:6px;display:flex;} .journalrow div.journalitem ul.jcmt li p abbr{border-style: none; display: block; margin-bottom: 3px; @@ -121,9 +118,9 @@ padding-left: 5px; padding-top: 4px;} .journalrow div.journalitem .journalfooter abbr {border-style:none;} -.journalrow div.journalitem .jlink a{font-weight:bold;display:block} +.journalrow div.journalitem .jlink a{font-weight:bold;display:block;word-break:break-word;} .journalrow div.journalitem .jlink img{float:left; margin-right:12px;max-width:150px;width:100%;height:auto;padding:5px;} -.journalrow div.journalitem .jlink div{max-width:100%;} +.journalrow div.journalitem .jlink div{max-width:100%;word-break:break-word;} .journalrow div.journalitem .likes{padding:2px;} .jcmt .cmteditor{max-width:100%;display:none;resize:none;outline:none;} .jcmt .cmteditarea{margin: 2px 4px 4px 2px;z-index:0;} From 103492b60d433d3af353a6a301af27d6f08daf07 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 12:49:00 -0800 Subject: [PATCH 22/23] Responsive Link Image 25% available screen. --- DNN Platform/Modules/Journal/module.css | 1 + 1 file changed, 1 insertion(+) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index e40cbc9e6a2..8cae957ad24 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -89,6 +89,7 @@ .journalrow {border-bottom:1px solid #e4e1e1;margin-bottom:20px;padding-bottom:10px;} .journalrow div.author{overflow:hidden;float:left;} .journalrow div.author img{width:32px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.journalrow div.journalitem .jlink img {max-width: 25%;width: auto;} .journalrow div.journalitem{margin-left:44px;overflow: hidden;word-break: break-all;} .journalitem p{margin-bottom: 5px;word-break: break-word;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} From ca9fabdbd4be51687418a784077511f99f833983 Mon Sep 17 00:00:00 2001 From: Cody Date: Sun, 15 Dec 2019 13:15:15 -0800 Subject: [PATCH 23/23] changed flex to inline-flex for comment areas --- DNN Platform/Modules/Journal/module.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DNN Platform/Modules/Journal/module.css b/DNN Platform/Modules/Journal/module.css index 8cae957ad24..7009b2ca58d 100644 --- a/DNN Platform/Modules/Journal/module.css +++ b/DNN Platform/Modules/Journal/module.css @@ -93,7 +93,7 @@ .journalrow div.journalitem{margin-left:44px;overflow: hidden;word-break: break-all;} .journalitem p{margin-bottom: 5px;word-break: break-word;} .journalrow div.journalitem p.journalfooter span{padding:0px 4px 0px 4px; font-weight:bold;} -.journalrow div.journalitem .authorname{padding-right:6px;display:flex;} +.journalrow div.journalitem .authorname{padding-right:6px;display:inline-flex;} .journalrow div.journalitem ul.jcmt,.journalrow div.journalitem .likes{width:100%;padding:0px;font-size:11px;} /*.journalrow div.journalitem ul.jcmt li{border-bottom: solid 1px #fff;}*/ .journalrow div.journalitem ul.jcmt { @@ -111,7 +111,7 @@ position: relative; top: 0;} .journalrow div.journalitem ul.jcmt li p{padding:4px 0px 4px 5px; margin:3px 0px 5px 42px;} -.journalrow div.journalitem ul.jcmt li p a{padding-right:6px;display:flex;} +.journalrow div.journalitem ul.jcmt li p a{padding-right:6px;display:inline-flex;} .journalrow div.journalitem ul.jcmt li p abbr{border-style: none; display: block; margin-bottom: 3px;