diff --git a/module/report/css/annualdata.css b/module/report/css/annualdata.css index 284b58fd96..e685f987d5 100644 --- a/module/report/css/annualdata.css +++ b/module/report/css/annualdata.css @@ -83,22 +83,18 @@ section.active {border: 1px solid rgb(0, 166, 255);} .dataYearStat .canvas.left {width: 450px;} .dataYearStat .canvas.right {width: 810px; float: right;} - #stopPlaying {font-size: 18px; position: absolute; left: 0; bottom: 16px; - } - - #timeline li {display: inline-block; cursor: pointer; color: #444; padding: 0; margin: 0; position: relative; - } - #showImg {width: 272px; height: 255px; border: none; margin: 0; margin-left: 20px;} - #timeline li img { width: 200px; height: 200px;position: absolute; top: -300px; left: 0;} - - #timeline li::before{ content: ''; display: inline-block; width: 8px; height: 8px; border-radius: 4px; background: #fff; position: absolute; left: 50%; top: -8px; z-index: 2; - } - #timeline li::after{content: ''; display: block; width: 100%; height: 2px; border-radius: 1px; background: #fff; position: absolute; left: -50%; top: -5px;} - - #timeline .selecteded {color: #1a77a5;} - #timeline .selecteded::before {background: #1a77a5;} - - .scroll-shell { width: 330px; height: 89%; overflow: hidden; position: relative; - } - #timeline { padding-top: 15px; list-style: none; margin-left: 25px; width: 310px; height: 30px; overflow: auto; overflow-x: hidden; -} \ No newline at end of file +.scroll-canvas { width: 330px; height: 89%; overflow: hidden; position: relative;} +#stopPlaying {font-size: 18px; position: absolute; left: 0; bottom: 16px;} +#timeline { padding-top: 15px; list-style: none; margin-left: 25px; width: 310px; height: 30px; overflow: hidden;} +#timeline li {display: inline-block; cursor: pointer; padding: 0 1px; margin: 0; position: relative;} +#timeline li p {padding: 0;} +#showImg {width: 272px; height: 255px; border: none; margin: 0; margin-left: 20px;} +#timeline li img { width: 200px; height: 200px;position: absolute; top: -300px; left: 0;} +#timeline li::before { content: ''; display: inline-block; width: 8px; height: 8px; border-radius: 4px; background: #fff; position: absolute; left: 50%; top: -8px; z-index: 2;} +#timeline li::after {content: ''; display: block; width: 100%; height: 4px; border-radius: 1px; background: #fff; position: absolute; left: -50%; top: -6px;} +#timeline li:first-child::after {border-top-left-radius: 2px; border-bottom-left-radius: 2px;} +#timeline .active::before, +#timeline .active::after, +#timeline .selecteded::before, +#timeline .selecteded::after {background: #1a77a5;} +#timeline .selecteded {color: #1a77a5;} \ No newline at end of file diff --git a/module/report/view/annualdata.html.php b/module/report/view/annualdata.html.php index cffe87a767..1c1e0325b6 100644 --- a/module/report/view/annualdata.html.php +++ b/module/report/view/annualdata.html.php @@ -5,7 +5,6 @@ report->annualData;?> report->annualData;?> soFar, $year);?> -
)'>
) top no-repeat'> @@ -123,10 +122,10 @@

radar . $soFar;?>

-
@@ -245,7 +244,6 @@ $(function() { var contributionData = []; - if(contributionGroups) { for(var contributionKey in contributionGroups) { @@ -261,14 +259,12 @@ $(function() contributionData.push(contributionItem); } } - if(contributionData.length > 1) { - $('.scroll-shell').removeClass('hidden'); - - for(var k=0;k }) -