Skip to content

Commit 85512b6

Browse files
committed
[TASK] sync subtheme felayout with theme_t3kit 2.4.0 felayout
1 parent 92bfed4 commit 85512b6

File tree

6 files changed

+52
-0
lines changed

6 files changed

+52
-0
lines changed

felayout/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ npm install
4040
- Run `grunt check` to check CSS (.stylelintrc) and JS (JS standard) files according code conventions.
4141
- Run `grunt compileCss` or `grunt cc` to compile all Front-End service files plus **CSS** styling for **t3kit** needs and copy it to `subtheme_t3kit_template/Resources/Public/css` folder.
4242
- Run `grunt compileLess` or `grunt cl` to compile all Front-End service files plus **LESS** styling for **t3kit** needs, copy it to it to `subtheme_t3kit_template/Resources/Public/less` folder.
43+
- Run `grunt production` or `grunt prod` to compile all Front-End service files for production. `compileCss` + `compileLess` + `uglifyJs`

felayout/dev/styles/customVariables.less

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Custom media queries breakpoints
2+
@screen-xs--custom: 520px;
3+
@screen-md--custom: 1090px;
4+
@screen-lg--custom: 1300px;
5+
16
// Primary color
27
@main-color: #f86230;
38

@@ -13,6 +18,7 @@
1318
@header-top-height: 50px;
1419
@header-top-bg-color: @main-body-bg;
1520
@header-top-color: fade(@main-text-color, 50%);
21+
@header-top-search-border-color: @border-color;
1622

1723
@header-middle-height: 110px;
1824
@header-middle-bg-color: @main-body-bg;
@@ -77,6 +83,19 @@
7783
@custom-screen-xl: 1366px;
7884
@custom-screen-xxl: 1920px;
7985

86+
// Bootstrap Carousel
87+
@carousel-indicator-bg: @main-body-bg;
88+
89+
// Logo Carousel
90+
@logo-carousel-control-color: lighten(@main-text-color, 10%);
91+
92+
// Quote
93+
@quote-footer-title-color: @main-text-color;
94+
95+
// Simple Lightbox
96+
@sl-overlay-background: darken(@main-text-color, 30%);
97+
@sl-navigation-color: @main-body-bg;
98+
8099
// =========================================================
81100
// BOOTSTRAP Variables ====================================
82101
// =========================================================

felayout/dev/styles/main.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
@import "../../../../theme_t3kit/felayout_t3kit/dev/styles/main/contentElements/heroImage.less";
6060
@import "../../../../theme_t3kit/felayout_t3kit/dev/styles/main/contentElements/bootstrapCarousel.less";
6161
@import "../../../../theme_t3kit/felayout_t3kit/dev/styles/main/contentElements/contactsCard.less";
62+
@import "../../../../theme_t3kit/felayout_t3kit/dev/styles/main/contentElements/contacts.less";
6263

6364
// ========================
6465
// appearance wrappers

felayout/grunt/aliases.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ check:
5151
#CSS
5252
- 'stylelint:less'
5353

54+
# ==================================
55+
# compileLess + compileCss + uglifyJs
56+
# ==================================
57+
production:
58+
- 'compileLess'
59+
- 'compileCss'
60+
- 'uglify'
61+
62+
# alias to production
63+
prod:
64+
- 'production'
65+
5466
# ==================================
5567
# Task helpers ====================
5668
# ==================================

felayout/grunt/uglify.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = {
2+
lessFolder: {
3+
files: [{
4+
expand: true,
5+
cwd: '<%= lessFolder %>',
6+
src: '**/*.js',
7+
dest: '<%= lessFolder %>'
8+
}]
9+
},
10+
cssFolder: {
11+
files: [{
12+
expand: true,
13+
cwd: '<%= cssFolder %>',
14+
src: '**/*.js',
15+
dest: '<%= cssFolder %>'
16+
}]
17+
}
18+
}

felayout/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"grunt-contrib-watch": "1.0.0",
2929
"grunt-import": "1.0.3",
3030
"grunt-newer": "1.3.0",
31+
"grunt-contrib-uglify": "3.1.0",
3132
"grunt-standard": "3.1.0",
3233
"grunt-stylelint": "0.9.0",
3334
"less-plugin-autoprefix": "1.5.1",

0 commit comments

Comments
 (0)