diff --git a/src/app/pages/home/countries-table.component.html b/src/app/pages/home/countries-table.component.html index eb8bb2154..c16100a0d 100644 --- a/src/app/pages/home/countries-table.component.html +++ b/src/app/pages/home/countries-table.component.html @@ -48,32 +48,76 @@ {{countryOverview.country}} - {{countryOverview.repositories.percentage | number}}% - -- + {{countryOverview.repositories.oa | number}} + -- - {{countryOverview.journals.percentage | number}}% - -- + {{countryOverview.journals.oa | number}} + -- - {{countryOverview.policies.percentage | number}}% - -- + {{countryOverview.policies.oa | number}} + -- - {{countryOverview.publications.percentage | number}}% -- + + + + {{countryOverview.publications.percentage | number}}% + +
+
+
+
+
+ +
- {{countryOverview.datasets.percentage | number}}% -- + + + + {{countryOverview.datasets.percentage | number}}% + +
+
+
+
+
+ +
- {{countryOverview.software.percentage | number}}% -- + + + + {{countryOverview.software.percentage | number}}% + +
+
+
+
+
+ +
- {{countryOverview.otherProducts.percentage | number}}% -- + + + + {{countryOverview.otherProducts.percentage | number}}% + +
+
+
+
+
+ +
@@ -93,20 +137,64 @@ -- - {{countryOverview.publications.oa | number}} -- + + + + {{countryOverview.publications.oa | number}} + +
+
+
+
+
+ +
- {{countryOverview.datasets.oa | number}} -- + + + + {{countryOverview.datasets.oa | number}} + +
+
+
+
+
+ +
- {{countryOverview.software.oa | number}} -- + + + + {{countryOverview.software.oa | number}} + +
+
+
+
+
+ +
- {{countryOverview.otherProducts.oa | number}} -- + + + + {{countryOverview.otherProducts.oa | number}} + +
+
+
+
+
+ +
diff --git a/src/assets/css/os-observatory-custom.css b/src/assets/css/os-observatory-custom.css index dff9c2e31..ca7be03d5 100644 --- a/src/assets/css/os-observatory-custom.css +++ b/src/assets/css/os-observatory-custom.css @@ -467,3 +467,142 @@ a.backToOriginalInfoBox, a.backToOriginalInfoBox:hover, a.backToOriginalInfoBox: /*.contentSectionContainer .md-card-content {*/ /*text-align: center;*/ /*}*/ + + +/*progress {*/ + /*border: none;*/ + /*width: 400px;*/ + /*height: 60px;*/ + /*background: crimson;*/ +/*}*/ + +/*progress {*/ + /*color: lightblue;*/ +/*}*/ + +/*progress::-webkit-progress-value {*/ + /*background: lightblue;*/ +/*}*/ + +/*progress::-moz-progress-bar {*/ + /*background: lightcolor;*/ +/*}*/ + +/*progress::-webkit-progress-value {*/ + /*background: red;*/ +/*}*/ + +/*progress::-webkit-progress-bar {*/ + /*background: blue;*/ +/*}*/ + +/*progress[value]::-webkit-progress-bar {*/ + /*background-color: #eee;*/ + /*border-radius: 2px;*/ + /*box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25) inset;*/ +/*}*/ + + +/*progress[value] {*/ + /*-webkit-appearance: none;*/ + /*appearance: none;*/ +/*}*/ + +/*progress[value]::-webkit-progress-bar {*/ + /*background-color: 'green';*/ +/*}*/ + +/*progress[value] {*/ + /*-moz-appearance: none;*/ + /*appearance: none;*/ + /*border: none; !* Firefox also renders a border *!*/ +/*}*/ + +/*progress[value]::-moz-appearance {*/ + /*background-color: 'green';*/ +/*}*/ + +.progress { + height: 20px; + /*margin-bottom: 20px;*/ + overflow: hidden; + background-color: #f5f5f5; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1); +} + +.progress { + height: 12px; + background-color: #e9ecee; + background-image: none; + box-shadow: none; + filter: none; +} + +.progress { + /*margin-bottom: 10px;*/ +} + +.progress { + margin-top: 3px; + width: 85px; + display: inline-block; +} + +.progress-bar { + + float: left; + width: 0; + height: 100%; + font-size: 12px; + line-height: 20px; + color: #fff; + text-align: center; + background-color: #337ab7; + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15); + -webkit-transition: width .6s ease; + -o-transition: width .6s ease; + transition: width .6s ease; + +} + +.progress-bar { + + box-shadow: none; + border-radius: 3px; + background-color: #0090D9; + background-image: none; + -webkit-transition: all 1000ms cubic-bezier(0.785, 0.135, 0.15, 0.86); + transition: all 1000ms cubic-bezier(0.785, 0.135, 0.15, 0.86); + transition-timing-function: cubic-bezier(0.785, 0.135, 0.15, 0.86); + -webkit-transition-timing-function: cubic-bezier(0.785, 0.135, 0.15, 0.86); + -moz-transition-timing-function: cubic-bezier(0.785, 0.135, 0.15, 0.86); + -ms-transition-timing-function: cubic-bezier(0.785, 0.135, 0.15, 0.86); + -o-transition-timing-function: cubic-bezier(0.785, 0.135, 0.15, 0.86); + transition-timing-function: cubic-bezier(0.785, 0.135, 0.15, 0.86); + float: left; + filter: none; + +} + +.progress-bar-publications { + background-color: #19647E; + background-image: none; +} + +.progress-bar-datasets { + background-color: #019A85; + background-image: none; +} + +.progress-bar-software { + background-color: #F88306; + background-image: none; +} + +.progress-bar-otherProducts { + background-color: #987CD6; + background-image: none; +}