Skip to content

Commit

Permalink
[TASK] Small changes and optimizations
Browse files Browse the repository at this point in the history
  • Loading branch information
gilbertsoft committed Nov 18, 2018
1 parent ed0a356 commit 03b98cf
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 41 deletions.
1 change: 1 addition & 0 deletions Configuration/TypoScript/Setup/aimeos.typoscript
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ page.includeJSFooterlibs.bootstrap_smoothscroll >

# from aimeos_dist/Configuration/TypoScript/constants.txt
#plugin.tx_aimeos.settings.client.html.basket.standard.url.target = {$tx_aimeos.basket.target}
plugin.tx_aimeos.settings.controller.frontend.customer.groupids = 1
plugin.tx_aimeos.settings.mshop.customer.manager.typo3.pid-default = 2
plugin.tx_aimeos.settings.mshop.price.taxflag = 0

Expand Down
78 changes: 39 additions & 39 deletions Configuration/TypoScript/constants.typoscript
Original file line number Diff line number Diff line change
Expand Up @@ -60,46 +60,46 @@ page {
##################
### EXTENSIONS ###
##################
gilbertsoft {
plugin {
gsfavicon {
path = EXT:zwergenfabrik/Resources/Public/Icons
path = EXT:gszwergenfabrik/Resources/Public/Icons/
}
}

plugin.bootstrap_package {
# view {
# layoutRootPath = EXT:zwergenfabrik/Resources/Private/Layouts/
# partialRootPath = EXT:zwergenfabrik/Resources/Private/Partials/
# templateRootPath = EXT:zwergenfabrik/Resources/Private/Templates/
# }
settings {
less {
brand-primary = #00883E
navbar-default-color = #00883E
navbar-default-link-color = #00883E
navbar-default-link-active-color = #00883E
btn-default-color = #00883E
# btn-font-weight = 400
# grid-gutter-width = 20px
navbar-default-bg = #CCE5A2
gray-dark = @brand-primary
font-size-h1 = 2em
font-size-h2 = 1.75em
font-size-h3 = 1.5em
font-size-h4 = 1.25em
font-size-h5 = 1em
font-size-h6 = 0.85em
# font-size-h1 = floor((@font-size-base * 1.7))
# font-size-h2 = floor((@font-size-base * 1.25))
font-family-sans-serif = @font-family-base
headings-font-family = @font-family-serif
# headings-font-weight = 400
# headings-line-height = 1.3
#font-family-base = 'Open Sans', sans-serif
font-family-base = 'Pangolin', cursive
font-family-serif = 'Love Ya Like A Sister', 'Pangolin', cursive
footer-bg = @brand-primary
footer-link-color = #fff
bootstrap_package {
#view {
# layoutRootPath = EXT:zwergenfabrik/Resources/Private/Layouts/
# partialRootPath = EXT:zwergenfabrik/Resources/Private/Partials/
# templateRootPath = EXT:zwergenfabrik/Resources/Private/Templates/
#}
settings {
less {
brand-primary = #00883E
navbar-default-color = #00883E
navbar-default-link-color = #00883E
navbar-default-link-active-color = #00883E
btn-default-color = #00883E
#btn-font-weight = 400
#grid-gutter-width = 20px
navbar-default-bg = #CCE5A2
gray-dark = @brand-primary
font-size-h1 = 2em
font-size-h2 = 1.75em
font-size-h3 = 1.5em
font-size-h4 = 1.25em
font-size-h5 = 1em
font-size-h6 = 0.85em
#font-size-h1 = floor((@font-size-base * 1.7))
#font-size-h2 = floor((@font-size-base * 1.25))
font-family-sans-serif = @font-family-base
headings-font-family = @font-family-serif
#headings-font-weight = 400
#headings-line-height = 1.3
#font-family-base = 'Open Sans', sans-serif
font-family-base = 'Pangolin', cursive
font-family-serif = 'Love Ya Like A Sister', 'Pangolin', cursive
footer-bg = @brand-primary
footer-link-color = #fff
}
}
}
}
Expand All @@ -121,9 +121,9 @@ plugin.bootstrap_package {
### REMOVE BOOTSTRAP LESS CONSTANTS ###
#######################################
#plugin.bootstrap_package.settings.less >
plugin.bootstrap_package.settings.less.google-webfont >
plugin.bootstrap_package.settings.less.google-webfont-weight >
#plugin.bootstrap_package.settings.overrideLessVariables >
google-webfont >
google-webfont-weight >


plugin.tx_felogin_pi1.storagePid = 2
Expand Down
2 changes: 1 addition & 1 deletion Configuration/TypoScript/setup.typoscript
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ window.cookieconsent.initialise({
}

includeJSFooterlibs {

bootstrap_smoothscroll >
}

includeJSFooter {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"gilbertsoft/gswarranty": "*",
"gilbertsoft/gscacheconfig": "*",
"gilbertsoft/gsprotectedconfig": "*",
"gilbertsoft/gsfavicon": "*",
"gilbertsoft/gsfavicon": "^3.0.0",
"dmitryd/typo3-realurl": "^2.3.1",
"bk2k/bootstrap-package": "^9.1.0",
"sjbr/static-info-tables": "^6.5.1",
Expand Down

0 comments on commit 03b98cf

Please sign in to comment.