Merge pull request #72 from gerlofvanek/dev

ui: Fixes
2024-05-20_merge
Gerlof van Ek 9 months ago committed by GitHub
commit a85fbce4ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      basicswap/static/css/style.css
  2. 9
      basicswap/templates/offers.html
  3. 2
      basicswap/ui/page_settings.py

@ -148,3 +148,16 @@
0% { transform: rotate(0deg); } 0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); } 100% { transform: rotate(360deg); }
} }
.hover-container:hover #coin_to_button, .hover-container:hover #coin_to {
border-color: #3b82f6;
}
.hover-container:hover #coin_from_button, .hover-container:hover #coin_from {
border-color: #3b82f6;
}
#coin_to_button, #coin_from_button {
background-repeat: no-repeat;
background-position: center;
background-size: 20px 20px;
}

@ -723,7 +723,8 @@ const chart = new Chart(ctx, {
display: true, display: true,
title: { title: {
display: true, display: true,
text: 'Price (USD)' text: 'Price (USD)',
color: 'rgba(77, 132, 240, 1)'
} }
} }
}, },
@ -1017,7 +1018,7 @@ const chart = new Chart(ctx, {
</td> </td>
{% endif %} {% endif %}
<!-- OFFERS WHERE YOU WILL BE TAKER --> <!-- OFFERS WHERE YOU WILL BE TAKER -->
<!-- YOUR OFFERS / MAKER / BOOK --> <!-- YOUR OFFERS / MAKER / BOOK-->
{% if o[9] == true %} {% if o[9] == true %}
<td class="py-0 px-6 text-right text-sm mx-20"> <td class="py-0 px-6 text-right text-sm mx-20">
<div class="flex items-center justify-evenly monospace"> <div class="flex items-center justify-evenly monospace">
@ -1079,8 +1080,8 @@ const chart = new Chart(ctx, {
<td class="py-0 px-6 text-right text-sm mx-20"> <td class="py-0 px-6 text-right text-sm mx-20">
<div class="flex items-center justify-evenly monospace"> <div class="flex items-center justify-evenly monospace">
<div class="flex flex-col text-left mr-5 ml-5"> <div class="flex flex-col text-left mr-5 ml-5">
<div class="coinname bold w-32" data-coinname="{{ o[3] }}"> <div class="coinname bold w-32" data-coinname="{{ o[3] }}"><!-- todo id:4-->
{{ o[4]|truncate(9, true, '', 0) }} {{ o[5]|truncate(9, true, '', 0) }}
</div> </div>
<div class="text-gray-600 dark:text-gray-300">{{ o[3] }}</div> <div class="text-gray-600 dark:text-gray-300">{{ o[3] }}</div>
<div class="ratetype hidden"><span class="echange-rates" data-coinname="{{ o[3] }}"> {{ o[6]|truncate(6,true,'',0) }} {{ o[16] }}/{{ o[17] }}</span> <div class="ratetype hidden"><span class="echange-rates" data-coinname="{{ o[3] }}"> {{ o[6]|truncate(6,true,'',0) }} {{ o[16] }}/{{ o[17] }}</span>

@ -136,7 +136,7 @@ def page_settings(self, url_split, post_string):
coingecko_api_key = html.escape(bytes.fromhex(swap_client.settings.get('coingecko_api_key_enc', '')).decode('utf-8')) coingecko_api_key = html.escape(bytes.fromhex(swap_client.settings.get('coingecko_api_key_enc', '')).decode('utf-8'))
else: else:
coingecko_api_key = swap_client.settings.get('coingecko_api_key', '') coingecko_api_key = swap_client.settings.get('coingecko_api_key', '')
chart_settings = { chart_settings = {
'show_chart': swap_client.settings.get('show_chart', True), 'show_chart': swap_client.settings.get('show_chart', True),
'chart_api_key': chart_api_key, 'chart_api_key': chart_api_key,

Loading…
Cancel
Save