occheung
/
web2019
forked from M-Labs/web2019
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix left/right -> start/end, and other styles issues and adjustments 

Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
Egor Savkin 2023-07-11 13:50:32 +08:00
parent 76dc20c798
commit a377ef9ab3
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
static/css/order-hardware.css
View File

@ -18,6 +18,7 @@
#accordion_categories .accordion-item { #accordion_categories .accordion-item {
background-color: inherit; background-color: inherit;
border: none; border: none;
--bs-accordion-border-width: 0;
} }
.accordion-button:focus { .accordion-button:focus {
@ -45,7 +46,7 @@
padding: .75rem 2rem; padding: .75rem 2rem;
} }
#accordion_categories .accordion .accordion-body { #accordion_categories .accordion-body {
padding: 0; padding: 0;
} }

2
static/js/shop.bundle.js
View File

File diff suppressed because one or more lines are too long

8
static/js/shop.jsx
View File

@ -369,8 +369,8 @@ class Layout extends React.PureComponent {
</form> </form>
<div className="d-flex flex-column flex-sm-row justify-content-end"> <div className="d-flex flex-column flex-sm-row justify-content-end">
<a type="button" onClick={onClickCloseRFQFeedback} class="btn btn-sm btn-outline-primary m-0 mb-2 mb-sm-0 mr-sm-2">Close</a> <a type="button" onClick={onClickCloseRFQFeedback} class="btn btn-sm btn-outline-primary m-0 mb-2 mb-sm-0 me-sm-2">Close</a>
<a type="button" onClick={this.handleClickLoad} class={`btn btn-sm btn-primary m-0 ml-sm-2 ${this.state.error ? 'disabled':''}`}>Load configuration</a> <a type="button" onClick={this.handleClickLoad} class={`btn btn-sm btn-primary m-0 ms-sm-2 ${this.state.error ? 'disabled':''}`}>Load configuration</a>
</div> </div>
</div> </div>
) : null} ) : null}
@ -1256,12 +1256,12 @@ class OrderForm extends React.PureComponent {
<div className="d-flex flex-column flex-sm-row justify-content-between"> <div className="d-flex flex-column flex-sm-row justify-content-between">
<input <input
className="btn btn-outline-primary w-100 m-0 mb-2 mb-sm-0 mr-sm-2" className="btn btn-outline-primary w-100 m-0 mb-2 mb-sm-0 me-sm-2"
style={{'cursor': 'pointer', 'fontWeight': '700'}} style={{'cursor': 'pointer', 'fontWeight': '700'}}
value="Show JSON" value="Show JSON"
onClick={onClickShow} /> onClick={onClickShow} />
<input className="btn btn-primary w-100 m-0 ml-sm-2" type="submit" value={`${isProcessing ? 'Processing ...' : 'Request quote'}`} /> <input className="btn btn-primary w-100 m-0 ms-sm-2" type="submit" value={`${isProcessing ? 'Processing ...' : 'Request quote'}`} />
</div> </div>
{/*This will open an email window. Send the email to make your request.*/} {/*This will open an email window. Send the email to make your request.*/}
</form> </form>

8
static/js/shop.min.js vendored
View File

@ -326,11 +326,11 @@ var Layout = /*#__PURE__*/function (_React$PureComponent) {
}, /*#__PURE__*/_react["default"].createElement("a", { }, /*#__PURE__*/_react["default"].createElement("a", {
type: "button", type: "button",
onClick: onClickCloseRFQFeedback, onClick: onClickCloseRFQFeedback,
"class": "btn btn-sm btn-outline-primary m-0 mb-2 mb-sm-0 mr-sm-2" "class": "btn btn-sm btn-outline-primary m-0 mb-2 mb-sm-0 me-sm-2"
}, "Close"), /*#__PURE__*/_react["default"].createElement("a", { }, "Close"), /*#__PURE__*/_react["default"].createElement("a", {
type: "button", type: "button",
onClick: this.handleClickLoad, onClick: this.handleClickLoad,
"class": "btn btn-sm btn-primary m-0 ml-sm-2 ".concat(this.state.error ? 'disabled' : '') "class": "btn btn-sm btn-primary m-0 ms-sm-2 ".concat(this.state.error ? 'disabled' : '')
}, "Load configuration"))) : null, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", { }, "Load configuration"))) : null, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
onClick: onClickCloseRFQFeedback onClick: onClickCloseRFQFeedback
}, /*#__PURE__*/_react["default"].createElement("img", { }, /*#__PURE__*/_react["default"].createElement("img", {
@ -1131,7 +1131,7 @@ var OrderForm = /*#__PURE__*/function (_React$PureComponent9) {
}), /*#__PURE__*/_react["default"].createElement("div", { }), /*#__PURE__*/_react["default"].createElement("div", {
className: "d-flex flex-column flex-sm-row justify-content-between" className: "d-flex flex-column flex-sm-row justify-content-between"
}, /*#__PURE__*/_react["default"].createElement("input", { }, /*#__PURE__*/_react["default"].createElement("input", {
className: "btn btn-outline-primary w-100 m-0 mb-2 mb-sm-0 mr-sm-2", className: "btn btn-outline-primary w-100 m-0 mb-2 mb-sm-0 me-sm-2",
style: { style: {
'cursor': 'pointer', 'cursor': 'pointer',
'fontWeight': '700' 'fontWeight': '700'
@ -1139,7 +1139,7 @@ var OrderForm = /*#__PURE__*/function (_React$PureComponent9) {
value: "Show JSON", value: "Show JSON",
onClick: onClickShow onClick: onClickShow
}), /*#__PURE__*/_react["default"].createElement("input", { }), /*#__PURE__*/_react["default"].createElement("input", {
className: "btn btn-primary w-100 m-0 ml-sm-2", className: "btn btn-primary w-100 m-0 ms-sm-2",
type: "submit", type: "submit",
value: "".concat(isProcessing ? 'Processing ...' : 'Request quote') value: "".concat(isProcessing ? 'Processing ...' : 'Request quote')
})))); }))));

16
templates/404.html
View File

@ -58,17 +58,17 @@
<nav class="navbar navbar-expand-lg navbar-light bg-th-1 justify-content-center justify-content-between pt-3 pb-3" role="navigation"> <nav class="navbar navbar-expand-lg navbar-light bg-th-1 justify-content-center justify-content-between pt-3 pb-3" role="navigation">
<a class="navbar-brand logo mr-0" href="/"> <a class="navbar-brand logo me-0" href="/">
<img src="{{ get_url(path='images/logo@2x.png') }}" height="40" alt="logo"> <img src="{{ get_url(path='images/logo@2x.png') }}" height="40" alt="logo">
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-0 ml-md-auto text-right text-lg-left pt-2 pb-2 pt-md-0 pb-md-0"> <ul class="navbar-nav ms-0 ms-md-auto text-end text-lg-start pt-2 pb-2 pt-md-0 pb-md-0">
{% set section = get_section(path='_index.md') %} {% set section = get_section(path='_index.md') %}
{% for section in section.subsections %} {% for section in section.subsections %}
@ -79,11 +79,11 @@
{% if subsection.pages|length > 0 and subsection.title != 'Other' %} {% if subsection.pages|length > 0 and subsection.title != 'Other' %}
<li class="nav-item ml-0 ml-md-4 dropdown"> <li class="nav-item ms-0 ms-md-4 dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ subsection.title }} {{ subsection.title }}
</a> </a>
<div class="dropdown-menu shadow-none shadow-lg text-right text-lg-left" aria-labelledby="navbarDropdown"> <div class="dropdown-menu shadow-none shadow-lg text-end text-lg-start" aria-labelledby="navbarDropdown">
{% for page in subsection.pages %} {% for page in subsection.pages %}
<a class="dropdown-item pt-2 pb-2 pt-sm-3 pb-sm-3" href="{{ page.permalink }}">{{ page.title }}</a> <a class="dropdown-item pt-2 pb-2 pt-sm-3 pb-sm-3" href="{{ page.permalink }}">{{ page.title }}</a>
{% endfor %} {% endfor %}
@ -92,7 +92,7 @@
{% elif subsection.title != 'Other' %} {% elif subsection.title != 'Other' %}
<li class="nav-item ml-0 ml-md-4"> <li class="nav-item ms-0 ms-md-4">
<a class="nav-link" href="{{ subsection.permalink }}">{{ subsection.title }}</a> <a class="nav-link" href="{{ subsection.permalink }}">{{ subsection.title }}</a>
</li> </li>
@ -144,7 +144,7 @@
<!-- FOOTER --> <!-- FOOTER -->
<footer class="container text-center text-md-left"> <footer class="container text-center text-md-start">
<p class="pt-5 pb-2 text-center"> <p class="pt-5 pb-2 text-center">

16
templates/_base.html
View File

@ -55,17 +55,17 @@
<nav class="navbar navbar-expand-lg navbar-light bg-th-1 justify-content-center justify-content-between pt-md-3 pb-md-3" role="navigation"> <nav class="navbar navbar-expand-lg navbar-light bg-th-1 justify-content-center justify-content-between pt-md-3 pb-md-3" role="navigation">
<a class="navbar-brand logo mr-0" href="/"> <a class="navbar-brand logo me-0" href="/">
<img src="{{ get_url(path='images/logo@2x.png') }}" height="40" alt="logo"> <img src="{{ get_url(path='images/logo@2x.png') }}" height="40" alt="logo">
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent"> <div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-0 ml-md-auto text-left text-lg-left pt-2 pb-2 pt-md-0 pb-md-0"> <ul class="navbar-nav ms-0 ms-md-auto text-start text-lg-start pt-2 pb-2 pt-md-0 pb-md-0">
{% set section = get_section(path='_index.md') %} {% set section = get_section(path='_index.md') %}
{% for section in section.subsections %} {% for section in section.subsections %}
@ -76,14 +76,14 @@
{% if subsection.pages|length > 0 and subsection.title != 'Other' %} {% if subsection.pages|length > 0 and subsection.title != 'Other' %}
<li class="nav-item ml-0 ml-md-4 dropdown {% if root_current_path == root_section_path %}active{% endif %}"> <li class="nav-item ms-0 ms-md-4 dropdown {% if root_current_path == root_section_path %}active{% endif %}">
<a class="nav-link dropdown-toggle {% if current_path == subsection.path %}active{% endif %}" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle {% if current_path == subsection.path %}active{% endif %}" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ subsection.title }} {{ subsection.title }}
</a> </a>
<div class="dropdown-menu shadow-none shadow-lg text-left text-lg-left" aria-labelledby="navbarDropdown"> <div class="dropdown-menu shadow-none shadow-lg text-start text-lg-start" aria-labelledby="navbarDropdown">
{% for tmp_page in subsection.pages %} {% for tmp_page in subsection.pages %}
{% if tmp_page.extra.menu_item and tmp_page.extra.menu_item == "th1" %} {% if tmp_page.extra.menu_item and tmp_page.extra.menu_item == "th1" %}
<a class="dropdown-item pt-2 pb-2 mx-4 mt-2 mb-2 mt-sm-3 mb-sm-3 w-auto btn btn-primary btn-inversed {% if current_path == tmp_page.path %}active{% endif %}" href="{{ tmp_page.permalink }}"> <a class="dropdown-item pt-2 pb-2 mx-4 mt-2 mb-2 mt-sm-3 mb-sm-3 w-auto btn btn-primary btn-inversed {% if current_path == tmp_page.path %}active{% endif %} rounded-1" href="{{ tmp_page.permalink }}">
<center>{{ tmp_page.title }}</center> <center>{{ tmp_page.title }}</center>
</a> </a>
{% else %} {% else %}
@ -95,7 +95,7 @@
{% elif subsection.title != 'Other' %} {% elif subsection.title != 'Other' %}
<li class="nav-item ml-0 ml-md-4 {% if current_path == subsection.path %}active{% endif %}"> <li class="nav-item ms-0 ms-md-4 {% if current_path == subsection.path %}active{% endif %}">
<a class="nav-link" href="{{ subsection.permalink }}">{{ subsection.title }}</a> <a class="nav-link" href="{{ subsection.permalink }}">{{ subsection.title }}</a>
</li> </li>
@ -147,7 +147,7 @@
<!-- FOOTER --> <!-- FOOTER -->
{% block footer %} {% block footer %}
<footer class="container text-center text-md-left"> <footer class="container text-center text-md-start">
{% block footer_contact %} {% block footer_contact %}