diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index b7ab454..e69d6c3 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -3245,7 +3245,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl width: 2px; margin-left: -1px; content: ''; - background-color: #ccd1d9 + background-color: #0095eb } .VivaTimeline dl dt { @@ -3277,10 +3277,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl width: 22px; height: 22px; margin-left: -11px; - background-color: #4fc1e9; - border: 4px solid #f5f7fa; + background-color: #fff; + border: 4px solid #0095eb; border-radius: 50%; - behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 50%; -moz-border-radius: 50% } @@ -3290,9 +3289,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl top: 31px; left: 50%; display: inline-block; - width: 100px; + width: fit-content; padding: 10px 20px; - color: #4fc1e9 + color: #000 } .VivaTimeline dl dd .events { @@ -3300,11 +3299,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl width: 47%; padding: 10px 0 0; margin-top: 31px; - background-color: #CCC; - border-radius: 4px; - behavior: url("/assets/ie_support/PIE2/PIE.htc"); - -webkit-border-radius: 4px; - -moz-border-radius: 4px + padding: 20px; + border: solid 1px #dfdfdf; + border-radius: 5px; } .VivaTimeline dl dd .events:before { @@ -3334,8 +3331,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .VivaTimeline dl dd .events .events-body { overflow: hidden; zoom: 1; - background-color: #EEE; - padding: 10px; } .VivaTimeline dl dd .events .events-body .row{ display:none; @@ -3348,6 +3343,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .VivaTimeline dl dd .events .events-footer { text-align:center; + display: none; } .VivaTimeline dl dd .events .events-footer ol { list-style: none; @@ -3378,8 +3374,21 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl } .VivaTimeline dl dd.pos-right .events:before { - left: -12px; - border-color: transparent #CCC transparent transparent +content: ""; + position: absolute; + top: 32px; + left: 1px; + width: 0; + height: 0; + border-width: 8px; + border-color: #fff #fff transparent transparent; + border-style: solid; + -webkit-transform: rotate(-135deg) translateY(-50%); + transform: rotate(-135deg) translateY(-50%); + -webkit-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 3px -3px 1px -2px rgba(0, 0, 0, .2); + box-shadow: 3px -3px 1px -2px rgba(0, 0, 0, .2); } .VivaTimeline dl dd.pos-left .time { @@ -3392,8 +3401,25 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl } .VivaTimeline dl dd.pos-left .events:before { - right: -12px; - border-color: transparent transparent transparent #CCC + content: ""; + position: absolute; + top: 32px; + left: 1px; + width: 0; + height: 0; + border-width: 8px; + border-color: #fff #fff transparent transparent; + border-style: solid; + -webkit-transform: rotate(-135deg) translateY(-50%); + transform: rotate(-135deg) translateY(-50%); + -webkit-box-sizing: border-box; + box-sizing: border-box; + -webkit-box-shadow: 3px -3px 1px -2px rgba(0, 0, 0, .2); + box-shadow: 3px -3px 1px -2px rgba(0, 0, 0, .2); + left: inherit; + right: 1px; + -webkit-transform: rotate(45deg) translateY(-50%); + transform: rotate(45deg) translateY(-50%); } .VivaTimeline .carousel-indicators{ @@ -3424,8 +3450,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl margin-right: 4%; } .VivaTimeline dl dd.pos-left .events:before { - left: -12px; - border-color: transparent #CCC transparent transparent + left: 0; + right: inherit; + transform: rotate(-135deg) translateY(-50%); } .VivaTimeline dl dd.pos-right .time { padding: 10px 0; diff --git a/modules/announcement/annc_index10.html.erb b/modules/announcement/annc_index10.html.erb index 30c0a2f..faa058a 100644 --- a/modules/announcement/annc_index10.html.erb +++ b/modules/announcement/annc_index10.html.erb @@ -1,13 +1,13 @@
-

{{page-title}}

+

{{page-title}}

-
{{date-head}}
+
@@ -20,7 +20,7 @@
-
+
{{subtitle}}
@@ -175,6 +175,13 @@ return this; } })(jQuery, window, document); + + $('.events-body .events-object').each(function () { + if ($(this).attr('src') === '/assets/announcement-default.jpg') { + $(this).closest('.events-object-wrapper').hide(); + } +}); +