Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes jinja template conditional; removes redundant css #216

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ clean: ## Clean workspace and containers
CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) down -v --remove-orphans

lint: ## Lint the code (python 3 only)
docker compose -f $(COMPOSE_FILE) run --rm ckan flake8 ckanext --count --show-source --statistics --exclude ckan
CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm ckan flake8 ckanext --count --show-source --statistics --exclude ckan

test: ## Run extension tests
CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm ckan ./test.sh
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2851,18 +2851,13 @@ body .usa-menu-btn {
border-radius: 0;
width: 100%;
}
.control-custom input {
border-radius: 0;
width: 100%;
}
}

/* CKAN DEBUG PANEL SCROLL FIX */
#flDebug .flDebugPanelContent {
overflow: scroll;
}


.search-helper {
font-style: italic;
}
4 changes: 0 additions & 4 deletions ckanext/datagovtheme/public/css/datagovtheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -2248,10 +2248,6 @@ margin-top: 0px;
border-radius: 0;
width: 100%;
}
.control-custom input {
border-radius: 0;
width: 100%;
}
}

.faded.disclaimer {
Expand Down
2 changes: 1 addition & 1 deletion ckanext/datagovtheme/templates/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<button class="usa-nav__close">
<img src="/images/close.svg" alt="Close" />
</button>
{% if request.endpoint.startswith('report.') %}
{% if request and request.endpoint and request.endpoint.startswith('report.') %}
{% set current_is_report = 'usa-current' %}
{% set current_is_dataset = '' %}
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name="ckanext-datagovtheme",
version="0.2.39",
version="0.2.40",
description="CKAN Extension to manage data.gov theme",
long_description=long_description,
classifiers=[
Expand Down
Loading