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.

Sign up for GitHub

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

fix standard theme, move to variables #1351

Merged
merged 2 commits into from
Nov 13, 2024
Merged

fix standard theme, move to variables #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f830cec
fix standard theme, move to variables
mira-miracoli Nov 13, 2024
f251a95
fix linting
mira-miracoli Nov 13, 2024
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
3 changes: 0 additions & 3 deletions group_vars/sn06/sn06.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ galaxy_config: "{{ galaxy_config_hash }}"

# Galaxy Subdomains
galaxy_themes_ansible_file_path: /scratch/workspace/usegalaxy-eu/playbooks/sn06/files/galaxy/subdomains
galaxy_themes_conf_path: files/galaxy/config/themes_conf.yml
galaxy_themes_default_welcome: https://galaxyproject.org/bare/eu/usegalaxy/main/
galaxy_themes_welcome_url_prefix: https://usegalaxy-eu.github.io/index-

Expand All @@ -356,8 +355,6 @@ galaxy_config_files:
dest: "{{ galaxy_config['galaxy']['job_resource_params_file'] }}"
- src: "{{ galaxy_config_file_src_dir }}/config/trs_servers_conf.yml"
dest: "{{ galaxy_config['galaxy']['trs_servers_config_file'] }}"
- src: "{{ galaxy_config_file_src_dir }}/config/themes_conf.yml"
dest: "{{ galaxy_config['galaxy']['themes_config_file'] }}"
# test? Unknown if this works.
- src: "{{ galaxy_config_file_src_dir }}/config/error_report.yml"
dest: "{{ galaxy_config_dir }}/error_report.yml"
Expand Down
57 changes: 30 additions & 27 deletions files/galaxy/config/themes_conf.yml → group_vars/sn06/themes_conf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
europe:
masthead:
color: "#003399"
---
# Ansible variables from ansible-galaxy v0.11.0
themes_conf:
europe:
masthead:
color: "#003399"

lightblue:
masthead:
color: "#384E77"
text:
color: white
hover: "#E6F9AF"
active: white
link:
color: transparent
hover: transparent
active: "#18314F"
lightblue:
masthead:
color: "#384E77"
text:
color: white
hover: "#E6F9AF"
active: white
link:
color: transparent
hover: transparent
active: "#18314F"

pride:
masthead:
pride:
masthead:
color: >
linear-gradient(120deg,
#3c476d 0px 200px,
Expand Down Expand Up @@ -45,14 +48,14 @@ pride:
hover: "#323a53"
active: "#6170a6"

smoky:
masthead:
color: "#0C0F0A"
text:
color: white
hover: "#FBFF12"
active: white
link:
color: transparent
hover: transparent
active: "#FF206E"
smoky:
masthead:
color: "#0C0F0A"
text:
color: white
hover: "#FBFF12"
active: white
link:
color: transparent
hover: transparent
active: "#FF206E"
2 changes: 1 addition & 1 deletion requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ roles:
version: 0.14.1
- name: galaxyproject.galaxy
src: https://github.com/galaxyproject/ansible-galaxy
version: 0.11.1
version: d494e2e1ac428aa4b764fb98f4a4f389a2518080
- name: galaxyproject.cvmfs
src: https://github.com/usegalaxy-eu/ansible-cvmfs
version: master
Expand Down
1 change: 1 addition & 0 deletions sn06.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
- "*.ep.interactivetool.eirene.usegalaxy.eu"
vars_files:
- group_vars/sn06/sn06.yml
- group_vars/sn06/themes_conf.yml
- group_vars/sn06/subdomains.yml
- group_vars/tiaas.yml # All of the training infrastructure
- group_vars/gxconfig.yml # The base galaxy configuration
Expand Down
Loading