fix sidebar & merge conflict

This commit is contained in:
jonathanlei
2022-08-25 13:09:29 -07:00
parent c597c78911
commit 1b9cd9927c
7 changed files with 4365 additions and 4364 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@@ -1351,7 +1351,6 @@
width: 100%; width: 100%;
} }
} }
.btn-arrow-out::after { .btn-arrow-out::after {
background-position: left 0px bottom 0px; background-position: left 0px bottom 0px;
content: "\00a0"; content: "\00a0";

View File

@@ -15523,9 +15523,8 @@ aside {
.top-banner { .top-banner {
height: 46px; height: 46px;
background: url(../img/backgrounds/bg-apex-banner.svg); background: url(../img/backgrounds/bg-apex-banner-2.png);
background-position: center; background-position: center;
background-color: #7919FF;
background-size: cover; background-size: cover;
padding: 2px 0; padding: 2px 0;
color: #fff; color: #fff;
@@ -15537,33 +15536,52 @@ aside {
@media (min-width: 768px) { @media (min-width: 768px) {
.top-banner { .top-banner {
padding: 5px 8px; padding: 5px 8px;
background: url(../img/backgrounds/bg-apex-banner-2-md.png);
background-position: center;
background-size: cover;
}
}
@media (min-width: 1200px) {
.top-banner {
background: url(../img/backgrounds/bg-apex-banner-2-lg.png);
background-position: center;
background-size: cover;
} }
} }
.top-banner .btn { .top-banner .btn {
margin-top: 4px; margin-left: 4px;
margin-left: 8px;
font-size: 12px; font-size: 12px;
color: #fff;
padding: 2px 4px;
border: 1px solid #fff;
border-radius: 2px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.top-banner .btn { .top-banner .btn {
margin-top: 2px; margin-top: 6px;
margin-left: 16px; margin-left: 16px;
font-size: 16px; font-size: 16px;
padding: 4px 8px;
border: 1.5px solid #fff;
border-radius: 4px;
} }
} }
.top-banner .btn-outline-secondary:not(:disabled):not(.disabled):hover {
color: #111112;
background-color: #fff;
}
.top-banner p { .top-banner p {
padding-top: 15px;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 20px;
text-align: center; text-align: center;
margin: auto; margin: auto;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.top-banner p { .top-banner p {
padding-top: 10px; padding-top: 7px;
font-size: 16px; font-size: 16px;
width: initial; width: initial;
line-height: 20px; line-height: 24px;
} }
} }
@@ -15607,13 +15625,13 @@ body {
} }
html.light .top-banner .btn-outline-secondary { html.light .top-banner .btn-outline-secondary {
color: #E0E0E1; color: #fff;
border-color: #E0E0E1; border-color: #fff;
} }
html.light .top-banner .btn-outline-secondary:not(:disabled):not(.disabled):hover { html.light .top-banner .btn-outline-secondary:not(:disabled):not(.disabled):hover {
color: #111112; color: #111112;
background-color: #E0E0E1; background-color: #fff;
border-color: #E0E0E1; border-color: #fff;
} }
.page-calculator #calculator-mobile-toggle.show { .page-calculator #calculator-mobile-toggle.show {

File diff suppressed because one or more lines are too long

View File

@@ -75,7 +75,7 @@
</head> </head>
<body class="xrp-ledger-dev-portal {% if currentpage.sidebar is undefined or currentpage.sidebar != "disabled" %}sidebar-primary {% endif %}lang-{{target.lang}} {% block bodyclasses %}{% endblock %}" data-spy="scroll" data-target=".page-toc" data-offset="0"> <body class="xrp-ledger-dev-portal" {% if currentpage.sidebar is undefined or currentpage.sidebar != "disabled" %}sidebar-primary {% endif %}lang-{{target.lang}} {% block bodyclasses %}{% endblock %}" data-spy="scroll" data-target=".page-toc" data-offset="0">
<!-- Google Tag Manager (noscript) --> <!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KCQZ3L8" <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KCQZ3L8"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>

View File

@@ -10,10 +10,10 @@
<div class="mx-auto text-lg-left"> <div class="mx-auto text-lg-left">
<div class="d-flex flex-column-reverse"> <div class="d-flex flex-column-reverse">
<p class="mb-0"> <p class="mb-0">
Use the developer tools to test, explore, and validate XRP Ledger {% trans %}Use the developer tools to test, explore, and validate XRP Ledger
API requests and behavior. API requests and behavior. {% endtrans %}
</p> </p>
<h3 class="eyebrow mb-3"> Dev Tools</h3> <h3 class="eyebrow mb-3"> {% trans %} Dev Tools {% endtrans %}</h3>
</div> </div>
</div> </div>
</section> </section>
@@ -65,7 +65,7 @@
"href": "https://xumm.community/tokens", "href": "https://xumm.community/tokens",
}, },
] %} ] %}
<h4> Explorers</h4> <h4> {% trans %} Explorers {% endtrans %}</h4>
<div class="row row-cols-1 row-cols-lg-3 card-deck"> <div class="row row-cols-1 row-cols-lg-3 card-deck">
{% for card in exploerers_tools%} {% for card in exploerers_tools%}
<a class="card" href="{{card.href}}" target="_blank" id="{{card.id}}"> <a class="card" href="{{card.href}}" target="_blank" id="{{card.id}}">
@@ -79,7 +79,7 @@
</div> </div>
</div> </div>
<div class="tab-pane" id="api-access" role="tabpanel" aria-labelledby="api-access-tab"> <div class="tab-pane" id="api-access" role="tabpanel" aria-labelledby="api-access-tab">
<h4> API Access</h4> <h4> {% trans %} API Access {% endtrans %}</h4>
{% set api_access_tools = [ {% set api_access_tools = [
{ {
"id": "websocket", "id": "websocket",
@@ -130,7 +130,7 @@
</div> </div>
</div> </div>
<div class="tab-pane" id="other" role="tabpanel" aria-labelledby="other-tab"> <div class="tab-pane" id="other" role="tabpanel" aria-labelledby="other-tab">
<h4> Other</h4> <h4> {% trans %} Other {% endtrans %}</h4>
{% set other = [ {% set other = [
{ {
"id": "domain", "id": "domain",