Skip to content

Commit 192942a

Browse files
committed
LESS: Changing few lines after updating grunt-contrib-less to v2…
It does not allow Javascript within declarations now
1 parent 0fb8ecf commit 192942a

File tree

9 files changed

+24
-32
lines changed

9 files changed

+24
-32
lines changed

Gruntfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = function(grunt) {
99
"css/style.css": "less/index.less"
1010
},
1111
options: {
12+
inlineJavaScript: true,
1213
sourceMap: true,
1314
sourceMapFilename: "css/style.css.map",
1415
sourceMapURL: "rekrea.css.map",

css/style.css

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -890,8 +890,8 @@ table.fontSmall th {
890890
}
891891
.unveil {
892892
opacity: 0;
893-
-webkit-transition: opacity .5s ease-in;
894-
transition: opacity .5s ease-in;
893+
-webkit-transition: opacity 0.5s ease-in;
894+
transition: opacity 0.5s ease-in;
895895
}
896896
.more_info {
897897
color: #666;
@@ -999,7 +999,7 @@ Nová (od 12/2015)
999999
}
10001000
.container.ajax {
10011001
-webkit-box-shadow: none;
1002-
box-shadow: none;
1002+
box-shadow: none;
10031003
margin: 0;
10041004
}
10051005
.content {
@@ -2083,14 +2083,9 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
20832083
width: 18px;
20842084
height: 2px;
20852085
background-color: black;
2086-
-webkit-border-radius: 1px;
2087-
-webkit-background-clip: padding-box;
2088-
-moz-border-radius: 1px;
2089-
-moz-background-clip: padding;
20902086
border-radius: 1px;
2091-
background-clip: padding-box;
20922087
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
2093-
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
2088+
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
20942089
}
20952090
.pine-trigger .icon-bar:before,
20962091
.pine-trigger .icon-bar:after {
@@ -2131,11 +2126,9 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
21312126
}
21322127
.fx-hover-fade .pine-level-2,
21332128
.fx-hover-fade .pine-level-3 {
2134-
-webkit-opacity: 0;
2135-
-moz-opacity: 0;
21362129
opacity: 0;
2137-
-webkit-transition: visibility 0s .1s, opacity .1s ease-in-out;
2138-
transition: visibility 0s .1s, opacity .1s ease-in-out;
2130+
-webkit-transition: visibility 0s 0.1s, opacity 0.1s ease-in-out;
2131+
transition: visibility 0s 0.1s, opacity 0.1s ease-in-out;
21392132
}
21402133
.fx-hover-fade .pine-level-2 > li > a,
21412134
.fx-hover-fade .pine-level-3 > li > a,
@@ -2150,8 +2143,6 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
21502143
}
21512144
.fx-hover-fade .pine-level-open > .pine-level-2,
21522145
.fx-hover-fade .pine-level-open > .pine-level-3 {
2153-
-webkit-opacity: 1;
2154-
-moz-opacity: 1;
21552146
opacity: 1;
21562147
-webkit-transition: opacity 0.1s ease-in-out;
21572148
transition: opacity 0.1s ease-in-out;
@@ -2305,7 +2296,7 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
23052296
}
23062297
.container .site-nav a {
23072298
-webkit-box-sizing: border-box;
2308-
box-sizing: border-box;
2299+
box-sizing: border-box;
23092300
display: block;
23102301
padding: 12px 12px 11px;
23112302
color: #fff;

css/style.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

less/components/site_nav.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
8989
.site-nav__main .pine-level-1 {
9090
margin: 0;
9191
padding: 0;
92-
92+
9393
@media @large-start {
9494
display: flex;
9595
}
@@ -98,7 +98,7 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
9898
.site-nav__main .pine-level-1 > li {
9999
text-align: center;
100100
@media @large-start {
101-
flex: 1;
101+
flex: 1;
102102
}
103103
}
104104

@@ -166,7 +166,7 @@ Na velkých displejích vedle sebe, na malých většina schovaná do ikonek.
166166

167167
// Položka navigace obecně
168168
.container .site-nav a {
169-
.box-sizing(border-box);
169+
box-sizing:border-box;
170170
display: block;
171171
padding: 12px 12px 11px;
172172
color: #fff;

less/layout/layout.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Nová (od 12/2015)
4343
background-image: none !important; /* DEPRECATED if newlayout */
4444

4545
&.ajax {
46-
.box-shadow(none);
46+
box-shadow: none;
4747
margin: 0;
4848
}
4949
}

less/lib/pine/core/base.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
left: 0;
9292
overflow: hidden;
9393
width: 100%;
94-
.transition(max-height .1s ease-in-out);
94+
transition: max-height .1s ease-in-out;
9595
}
9696

9797
.js &.pine-visible {

less/lib/pine/modules/fx/hover-fade.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
.pine-level-2,
1111
.pine-level-3 {
12-
.opacity(0);
13-
.transition(~"visibility 0s .1s, opacity .1s ease-in-out");
12+
opacity: 0;
13+
transition: visibility 0s .1s, opacity .1s ease-in-out;
1414

1515
// Removed default indentation
1616
> li > a,
@@ -24,17 +24,17 @@
2424
// Animation on 1st level
2525
.pine-level-1 > li > a,
2626
.pine-level-1 > li > strong {
27-
.transition(~"background .1s");
27+
transition: background .1s;
2828
}
2929

3030
// Animation on 2nd, 3rd level
3131
.pine-level-open > .pine-level-2,
3232
.pine-level-open > .pine-level-3 {
33-
.opacity(1);
34-
.transition(opacity .1s ease-in-out);
33+
opacity: 1;
34+
transition: opacity .1s ease-in-out;
3535
}
3636

3737
.noanim {
38-
.transition(~"none !important");
38+
transition: none !important;
3939
}
4040
}

less/lib/pine/modules/fx/right-to-left.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
.js & ul ul {
2828
visibility: hidden;
29-
.transition(~"visibility 0s .2s");
29+
transition: visibility 0s .2s;
3030
}
3131

3232
// No 2nd, 3rd level indentation
@@ -48,7 +48,7 @@
4848
}
4949

5050
.pine-level-1 > .pine-level-open > ul {
51-
.transition(~"visibility 0s 0s");
51+
transition: visibility 0s 0s;
5252
}
5353
}
5454

less/lib/pine/modules/trigger.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
width: 18px;
3232
height: 2px;
3333
background-color: black;
34-
.border-radius(1px);
35-
.box-shadow(0 1px 0 rgba(255,255,255,.5));
34+
border-radius: 1px;
35+
box-shadow: 0 1px 0 rgba(255,255,255,.5);
3636
}
3737

3838
&:before, &:after {

0 commit comments

Comments
 (0)