Small fixes removed unused setting

master
Mark Moffat 2019-12-27 14:07:38 +10:30
parent a5dcc7624b
commit 5adcdfb5c1
7 changed files with 10 additions and 27 deletions

View File

@ -62,11 +62,6 @@
"type": "string", "type": "string",
"default": "Menu" "default": "Menu"
}, },
"menuLocation": {
"type": "string",
"default": "side",
"enum": ["top", "side"]
},
"footerHtml": { "footerHtml": {
"type": "string", "type": "string",
"default": "<h4 class="text-center">Powered by expressCart</h4>" "default": "<h4 class="text-center">Powered by expressCart</h4>"

View File

@ -15,7 +15,6 @@
"productsPerRow": 3, "productsPerRow": 3,
"productsPerPage": 6, "productsPerPage": 6,
"menuTitle": "Menu", "menuTitle": "Menu",
"menuLocation": "side",
"footerHtml": "<h4 class="text-center">Powered by expressCart</h4>", "footerHtml": "<h4 class="text-center">Powered by expressCart</h4>",
"googleAnalytics": "", "googleAnalytics": "",
"customCss": ".footer{padding-top: 5px;}", "customCss": ".footer{padding-top: 5px;}",

View File

@ -6,6 +6,8 @@
@text-gray-color: #aaaaaa; @text-gray-color: #aaaaaa;
@separator-color: #eeeeee; @separator-color: #eeeeee;
@breadcrumb-bg: #f8f9fa; @breadcrumb-bg: #f8f9fa;
@product-title-font-size: 20px;
@product-price-font-size: 20px;
html { html {
position: relative; position: relative;
@ -137,7 +139,7 @@ input[type=number]::-webkit-outer-spin-button {
} }
.product-title{ .product-title{
font-size: 24px; font-size: @product-title-font-size;
margin-top: 0px; margin-top: 0px;
} }
@ -154,7 +156,7 @@ input[type=number]::-webkit-outer-spin-button {
.product-price{ .product-price{
padding-bottom: 10px; padding-bottom: 10px;
font-size: 20px; font-size: @product-price-font-size;
color: @text-gray-color; color: @text-gray-color;
} }
@ -280,15 +282,6 @@ input[type=number]::-webkit-outer-spin-button {
margin-top: 10px; margin-top: 10px;
} }
.searchMenuLocation-side{
padding-left: 25px;
padding-right: 25px;
}
.searchMenuLocation-top{
padding-left: 5px;
padding-right: 5px;
}
.breadcrumb{ .breadcrumb{
background-color: @breadcrumb-bg; background-color: @breadcrumb-bg;
margin-top: 10px; margin-top: 10px;

View File

@ -105,7 +105,7 @@ input[type=number]::-webkit-outer-spin-button {
height: 350px; height: 350px;
} }
.product-title { .product-title {
font-size: 24px; font-size: 20px;
margin-top: 0px; margin-top: 0px;
} }
.product-title-home { .product-title-home {

File diff suppressed because one or more lines are too long

View File

@ -20,7 +20,9 @@
<meta name="keywords" content="{{config.cartTitle}}"> <meta name="keywords" content="{{config.cartTitle}}">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha256-L/W5Wfqfa0sdBNIKN9cG6QA5F2qx4qICmU2VgLruv9Y=" crossorigin="anonymous" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha256-L/W5Wfqfa0sdBNIKN9cG6QA5F2qx4qICmU2VgLruv9Y=" crossorigin="anonymous" />
<link rel="stylesheet" href="/stylesheets/pushy{{config.env}}.css"> <link rel="stylesheet" href="/stylesheets/pushy{{config.env}}.css">
{{#if admin}}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/codemirror.min.css" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/codemirror.min.css" />
{{/if}}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tokenfield/0.12.0/css/bootstrap-tokenfield.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-tokenfield/0.12.0/css/bootstrap-tokenfield.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"> <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
@ -32,9 +34,11 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha256-WqU1JavFxSAMcLP2WIOI+GB2zWmShMI82mTpLDcqFUg=" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha256-WqU1JavFxSAMcLP2WIOI+GB2zWmShMI82mTpLDcqFUg=" crossorigin="anonymous"></script>
{{#if admin}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/codemirror.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/codemirror.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/mode/css/css.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/mode/css/css.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/mode/xml/xml.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.20.2/mode/xml/xml.min.js"></script>
{{/if}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
<script src="/javascripts/jquery.bootpag.min.js"></script> <script src="/javascripts/jquery.bootpag.min.js"></script>

View File

@ -96,14 +96,6 @@
<input type="text" class="form-control" name="menuTitle" value="{{config.menuTitle}}" placeholder="Menu"> <input type="text" class="form-control" name="menuTitle" value="{{config.menuTitle}}" placeholder="Menu">
<p class="help-block">{{ @root.__ "The heading text for your menu." }}</p> <p class="help-block">{{ @root.__ "The heading text for your menu." }}</p>
</div> </div>
<div class="form-group">
<label>{{ @root.__ "Menu location" }}: </label>
<select class="form-control" name="menuLocation">
<option {{selectState 'top' config.menuLocation}}>top</option>
<option {{selectState 'side' config.menuLocation}}>side</option>
</select>
<p class="help-block">{{ @root.__ "The location of your menu." }}</p>
</div>
<div class="form-group"> <div class="form-group">
<label>Footer HTML</label> <label>Footer HTML</label>
<textarea class="form-control codemirrorArea" rows="5" id="footerHtml" name="footerHtml">{{footerHtml}}</textarea> <textarea class="form-control codemirrorArea" rows="5" id="footerHtml" name="footerHtml">{{footerHtml}}</textarea>