Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
services
t3o sites
extensions.typo3.org
extensions.typo3.org
Commits
7dd6f9c4
Unverified
Commit
7dd6f9c4
authored
Mar 04, 2017
by
Sascha Marcel Schmidt
Browse files
Merge branch 'master' into develop
parents
4837c1dd
7c677b73
Pipeline
#69
passed with stages
in 1 minute and 44 seconds
Changes
10
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
html/typo3conf/AdditionalConfiguration.sample.php
View file @
7dd6f9c4
...
...
@@ -13,4 +13,14 @@
*/
$GLOBALS
[
'TYPO3_CONF_VARS'
][
'SYS'
][
'trustedHostsPattern'
]
=
'.*'
;
$GLOBALS
[
'TYPO3_CONF_VARS'
][
'BE'
][
'loginSecurityLevel'
]
=
'normal'
;
\ No newline at end of file
$GLOBALS
[
'TYPO3_CONF_VARS'
][
'BE'
][
'loginSecurityLevel'
]
=
'normal'
;
$GLOBALS
[
'TYPO3_CONF_VARS'
][
'FE'
][
'loginSecurityLevel'
]
=
'normal'
;
// set your own local environment credentials in here
//$GLOBALS['TYPO3_CONF_VARS']['DB'] = [
// 'database' => '',
// 'host' => '',
// 'password' => '',
// 'port' => 3306,
// 'username' => '',
//];
\ No newline at end of file
html/typo3conf/ext/ter_fe2/Configuration/TypoScript/Default/setup.txt
View file @
7dd6f9c4
...
...
@@ -114,7 +114,6 @@ page.includeJSFooterlibs.jqplot4 = EXT:ter_fe2/Resources/Public/Javascript/jqPlo
#[global]
## Default files
page.includeCSS.tx_terfe2 = EXT:ter_fe2/Resources/Public/Stylesheet/Default.css
page.includeJSFooterlibs.tx_terfe2 = EXT:ter_fe2/Resources/Public/Javascript/Default.js
# ======================================================================
...
...
html/typo3conf/ext/ter_layout/Configuration/TypoScript/Default/setup.txt
View file @
7dd6f9c4
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ter_layout/Configuration/TypoScript/Config.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ter_layout/Configuration/TypoScript/TempObjects.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ter_layout/Configuration/TypoScript/Page.ts">
\ No newline at end of file
plugin.tx_solr.cssFiles.results =
\ No newline at end of file
html/typo3conf/ext/ter_layout/Configuration/TypoScript/Page.ts
View file @
7dd6f9c4
...
...
@@ -15,18 +15,4 @@ page {
}
shortcutIcon
=
EXT
:
ter_layout
/
Resources
/
Public
/
Icons
/
favicon
.
ico
includeCSS
{
file
=
EXT
:
ter_layout
/
Resources
/
Public
/
Css
/
styles
.
css
file2
=
EXT
:
ter_layout
/
Resources
/
Public
/
Css
/
styles2
.
css
plugins
=
EXT
:
ter_layout
/
Resources
/
Public
/
Css
/
PluginStyles
.
css
}
10
=
FLUIDTEMPLATE
10
{
file
=
EXT
:
ter_layout
/
Resources
/
Private
/
Templates
/
Default
.
html
variables
{
content
<
styles
.
content
.
get
}
}
}
\ No newline at end of file
html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.css
deleted
100644 → 0
View file @
4837c1dd
.tx-solr
form
#tx-solr-search-form-pi-search
{
display
:
-webkit-box
;
display
:
-ms-flexbox
;
display
:
-webkit-flex
;
display
:
flex
}
.tx-solr
#inputText
{
background
:
url(../Images/buttons.png)
repeat-x
scroll
0
-94px
transparent
;
border
:
1px
solid
#DBDBDB
;
padding
:
4px
;
width
:
415px
;
margin-right
:
5px
}
.tx-solr
#submitButton
{
color
:
white
;
background
:
url(../Images/s-buttons.png)
left
top
no-repeat
transparent
;
padding
:
4px
6px
;
cursor
:
pointer
;
text-decoration
:
none
;
display
:
inline-block
;
vertical-align
:
middle
;
border
:
1px
solid
#e87c0c
}
/*# sourceMappingURL=PluginStyles.css.map */
html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.css.map
deleted
100644 → 0
View file @
4837c1dd
{
"version": 3,
"mappings": "AAOE,2CAAmC,CCNnC,OAAO,CAAE,WAAW,CACpB,OAAO,CAAE,WAAW,CACpB,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,IAAI,CDOb,mBAAW,CACT,UAAU,CAAE,8DAA8D,CAC1E,MAAM,CAAE,iBAAiB,CACzB,OAAO,CAAE,GAAG,CACZ,KAAK,CAAE,KAAK,CACZ,YAAY,CAAE,GAAG,CAGnB,sBAAc,CACZ,KAAK,CAAE,KAAK,CACZ,UAAU,CAAE,2DAA2D,CACvE,OAAO,CAAE,OAAO,CAChB,MAAM,CAAE,OAAO,CACf,eAAe,CAAE,IAAI,CACrB,OAAO,CAAE,YAAY,CACrB,cAAc,CAAE,MAAM,CACtB,MAAM,CAAE,iBAAiB",
"sources": ["PluginStyles.scss","_mixins.scss"],
"names": [],
"file": "PluginStyles.css"
}
\ No newline at end of file
html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.scss
deleted
100644 → 0
View file @
4837c1dd
@import
"mixins"
;
.tx-solr
{
/**
* Search form
*/
form
#tx-solr-search-form-pi-search
{
@include
displayFlex
;
}
#inputText
{
background
:
url(../Images/buttons.png)
repeat-x
scroll
0
-94px
transparent
;
border
:
1px
solid
#DBDBDB
;
padding
:
4px
;
width
:
415px
;
margin-right
:
5px
;
}
#submitButton
{
color
:
white
;
background
:
url(../Images/s-buttons.png)
left
top
no-repeat
transparent
;
padding
:
4px
6px
;
cursor
:
pointer
;
text-decoration
:
none
;
display
:
inline-block
;
vertical-align
:
middle
;
border
:
1px
solid
#e87c0c
;
}
}
\ No newline at end of file
html/typo3conf/ext/ter_layout/Resources/Public/Css/_mixins.scss
deleted
100644 → 0
View file @
4837c1dd
@mixin
displayFlex
{
display
:
-
webkit-box
;
/* OLD - iOS 6-, Safari 3.1-6, BB7 */
display
:
-
ms-flexbox
;
/* TWEENER - IE 10 */
display
:
-
webkit-flex
;
/* NEW - Safari 6.1+. iOS 7.1+, BB10 */
display
:
flex
;
/* NEW, Spec - Firefox, Chrome, Opera */
}
\ No newline at end of file
html/typo3conf/ext/ter_layout/Resources/Public/Css/styles.css
deleted
100644 → 0
View file @
4837c1dd
This diff is collapsed.
Click to expand it.
html/typo3conf/ext/ter_layout/Resources/Public/Css/styles2.css
deleted
100644 → 0
View file @
4837c1dd
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment