diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c16cfa3f..00536486 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: '3.6' + python-version: '3.10' - name: Install requirements run: pip install flake8 pycodestyle - name: Check syntax @@ -17,7 +17,7 @@ jobs: needs: lint strategy: matrix: - ckan-version: ["2.10", 2.9, 2.9-py2, 2.8, 2.7] + ckan-version: ["2.10", 2.9] fail-fast: false name: CKAN ${{ matrix.ckan-version }} @@ -51,13 +51,8 @@ jobs: pip install -e . # Replace default path to CKAN core config file with the one on the container sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini - - name: Setup extension (CKAN >= 2.9) - if: ${{ matrix.ckan-version != '2.7' && matrix.ckan-version != '2.8' }} + - name: Setup extension run: | ckan -c test.ini db init - - name: Setup extension (CKAN < 2.9) - if: ${{ matrix.ckan-version == '2.7' || matrix.ckan-version == '2.8' }} - run: | - paster --plugin=ckan db init -c test.ini - name: Run tests run: pytest --ckan-ini=test.ini --disable-warnings ckanext/geoview/tests diff --git a/ckanext/geoview/public/css/geo-resource-styles.css b/ckanext/geoview/public/css/geo-resource-styles.css index 678189ef..3f4ecbfd 100644 --- a/ckanext/geoview/public/css/geo-resource-styles.css +++ b/ckanext/geoview/public/css/geo-resource-styles.css @@ -1,4 +1,4 @@ -.label[data-format=wfs] { +.badge[data-format=wfs] { background-color: #7aae3d; } .format-label[data-format=wfs], @@ -11,7 +11,7 @@ height: 35px; } -.label[data-format=wms] { +.badge[data-format=wms] { background-color: #adc717; } .format-label[data-format=wms], @@ -24,7 +24,7 @@ height: 35px; } -.label[data-format=gml] { +.badge[data-format=gml] { background-color: #7aae3d; } .format-label[data-format=gml], @@ -37,7 +37,7 @@ height: 35px; } -.label[data-format=kml] { +.badge[data-format=kml] { background-color: #7aae3d; } .format-label[data-format=kml], @@ -50,7 +50,7 @@ height: 35px; } -.label[data-format=geojson] { +.badge[data-format=geojson] { background-color: #9855e0; } .format-label[data-format=geojson], @@ -63,7 +63,7 @@ height: 35px; } -.label[data-format=wmts] { +.badge[data-format=wmts] { background-color: #3333ff; } .format-label[data-format=wmts], @@ -76,7 +76,7 @@ height: 35px; } -.label[data-format=shp] { +.badge[data-format=shp] { background-color: #0080ff; } .format-label[data-format=shp], @@ -89,6 +89,6 @@ height: 35px; } -.label[data-format=arcgis_rest] { +.badge[data-format=arcgis_rest] { background-color: #5c3ee0; }