Skip to content

Commit d1e2c9c

Browse files
machalmachal
committed
$ grunt prettier
1 parent d16b886 commit d1e2c9c

21 files changed

+2199
-1046
lines changed

‎js/rekrea-footer.js

Lines changed: 1874 additions & 700 deletions
Large diffs are not rendered by default.

‎less/base/body.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ body {
1818
// Napr. http://e-slovensko.local/ajax/atrakce/1148-thermal-park-besenova/
1919

2020
@media @large-start {
21-
2221
body.ajax {
2322
background: #fff;
2423
padding: 0;

‎less/base/helpers.less

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Helpery
55
66
*/
77

8-
98
// Clearfix
109
// --------
1110
// For clearing floats like a boss h5bp.com/q
1211
.clearfix {
1312
*zoom: 1;
14-
&:before, &:after {
13+
&:before,
14+
&:after {
1515
display: table;
1616
content: "";
1717
// Fixes Opera/contenteditable bug:
@@ -63,12 +63,12 @@ Helpery
6363
}
6464
}
6565

66-
6766
.dumb_only {
6867
display: none !important;
6968
}
7069

71-
.center, .text-center {
70+
.center,
71+
.text-center {
7272
text-align: center;
7373
}
7474

@@ -126,7 +126,9 @@ Helpery
126126
color: #999;
127127
text-decoration: underline;
128128

129-
&:hover, &:focus, &:active {
129+
&:hover,
130+
&:focus,
131+
&:active {
130132
color: #666;
131133
}
132134
}
@@ -146,7 +148,6 @@ Helpery
146148
border: 0;
147149
}
148150

149-
150151
// Z old_layout.less
151152
// -----------------
152153

@@ -162,15 +163,15 @@ Helpery
162163
width: 48%;
163164
}
164165

165-
.clearBothZero, .clear_zero {
166+
.clearBothZero,
167+
.clear_zero {
166168
display: block;
167169
clear: both;
168170
font-size: 1px;
169171
line-height: 1px;
170172
height: 1px;
171173
}
172174

173-
174175
.marginBottom3 {
175176
margin-bottom: 3em;
176177
}
@@ -236,16 +237,17 @@ p.submit {
236237
}
237238

238239
.fontSmall {
239-
font-size: .5em;
240+
font-size: 0.5em;
240241
font-weight: normal;
241242
}
242243

243244
small.fontSmall {
244-
font-size: .6em;
245+
font-size: 0.6em;
245246
font-weight: normal;
246247
}
247248

248-
table.fontSmall td, table.fontSmall th {
249+
table.fontSmall td,
250+
table.fontSmall th {
249251
font-size: 1.4em;
250252
font-weight: normal;
251253
}
@@ -282,7 +284,6 @@ table.fontSmall td, table.fontSmall th {
282284
display: none;
283285
}
284286

285-
286287
// Nove helpery (verze 2012)
287288
// Presunout do noveho layoutu (if newlayout TODO)
288289

@@ -298,7 +299,6 @@ table.fontSmall td, table.fontSmall th {
298299
display: block;
299300
}
300301

301-
302302
// Presunuto z new_layout.less
303303
// ---------------------------
304304

@@ -380,7 +380,9 @@ table.fontSmall td, table.fontSmall th {
380380
display: block;
381381
}
382382

383-
.more_photos a:hover, .more_photos a:focus, .more_photos a:active {
383+
.more_photos a:hover,
384+
.more_photos a:focus,
385+
.more_photos a:active {
384386
background-color: #eee;
385387
cursor: pointer;
386388
}

‎less/base/reset.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ Reset
66
*/
77

88
body {
9-
margin:0;
10-
padding:0;
9+
margin: 0;
10+
padding: 0;
1111
}
1212

13-
a img, img {
13+
a img,
14+
img {
1415
border: 0;
1516
}
1617

17-
1818
form {
1919
margin: 0;
2020
padding: 0;

‎less/base/typo.less

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@ Typografie a linearni design
1212
// Typografie
1313
// ----------
1414

15-
body, input, textarea, option, select {
16-
font: @base-font-size/@base-line-height Arial, Helvetica, sans-serif;
15+
body,
16+
input,
17+
textarea,
18+
option,
19+
select {
20+
font: @base-font-size / @base-line-height Arial, Helvetica, sans-serif;
1721
}
1822

19-
h1,h2,h3,h4,h5,h6 {
23+
h1,
24+
h2,
25+
h3,
26+
h4,
27+
h5,
28+
h6 {
2029
font-family: Arial, Helvetica, sans-serif;
2130
}
2231

@@ -38,8 +47,11 @@ a {
3847
// Linearni design
3948
// ---------------
4049

41-
42-
p, ul, ol, table, blockquote {
50+
p,
51+
ul,
52+
ol,
53+
table,
54+
blockquote {
4355
padding: 0;
4456
margin: 0;
4557
margin-bottom: @base-line-height;
@@ -76,7 +88,7 @@ h2,
7688

7789
h3,
7890
.h3 {
79-
display: block;
91+
display: block;
8092
font-size: 14px;
8193
line-height: 18px;
8294
margin: 0 0 4px 0;
@@ -87,7 +99,7 @@ h3,
8799

88100
h4,
89101
.h4 {
90-
display: block;
102+
display: block;
91103
font-size: @base-font-size;
92104
line-height: @base-line-height;
93105
margin: 0;
@@ -96,12 +108,11 @@ h4,
96108
color: #666;
97109
}
98110

99-
100111
h2 small,
101112
h3 small {
102113
font-size: @base-font-size;
103114
line-height: @base-line-height;
104-
color: #999;
115+
color: #999;
105116
}
106117

107118
big {
@@ -121,7 +132,7 @@ ul ul,
121132
ul ol,
122133
ol ol,
123134
ol ul {
124-
margin-bottom: 0;
135+
margin-bottom: 0;
125136
}
126137

127138
ul {
@@ -134,7 +145,6 @@ ol li {
134145
}
135146

136147
@media @large-start {
137-
138148
h2 small.float_right {
139149
margin-top: 5px;
140150
}

‎less/index.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Promenne
32
@import "variables/variables";
43

‎less/layout/layout.less

Lines changed: 42 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ Nová (od 12/2015)
8080
.show_grid .container {
8181
background-position: -20px 0;
8282
}
83-
8483
}
8584

8685
/* --- Telo dokumentu - hlavni informace, jez se budou prenaset do Fancyboxu --- */
@@ -95,14 +94,13 @@ Nová (od 12/2015)
9594
color: #999;
9695
}
9796

98-
9997
/*
10098
## Řádka layoutu je `.row`
10199
*/
102100

103101
.row {
104-
margin-bottom: @base-line-height;
105-
.clearfix();
102+
margin-bottom: @base-line-height;
103+
.clearfix();
106104
}
107105

108106
/*
@@ -156,7 +154,7 @@ v .list_item neco podobneho) =jeden sloupec: 304x171 (?? TODO)
156154
.half_column {
157155
@media @large-start {
158156
float: left;
159-
width: (@column-width/2 - @gutter); // 145px
157+
width: (@column-width / 2 - @gutter); // 145px
160158
margin-right: @gutter;
161159
}
162160
}
@@ -166,41 +164,39 @@ v .list_item neco podobneho) =jeden sloupec: 304x171 (?? TODO)
166164
}
167165

168166
@media @large-start {
167+
.content.without_top_pad {
168+
padding-top: 0;
169+
margin-top: -1px;
170+
}
169171

170-
.content.without_top_pad {
171-
padding-top: 0;
172-
margin-top: -1px;
173-
}
174-
175-
// Radka layoutu
176-
.row {
177-
margin-bottom: 36px;
178-
}
179-
180-
// Centrovany sloupec
181-
.column,
182-
.half_column,
183-
.double_column {
184-
&.centered {
185-
margin-left: auto;
186-
margin-right: auto;
187-
float: none;
188-
}
189-
}
190-
191-
// Offsety
192-
.offset_half {
172+
// Radka layoutu
173+
.row {
174+
margin-bottom: 36px;
175+
}
176+
177+
// Centrovany sloupec
178+
.column,
179+
.half_column,
180+
.double_column {
181+
&.centered {
182+
margin-left: auto;
183+
margin-right: auto;
184+
float: none;
185+
}
186+
}
187+
188+
// Offsety
189+
.offset_half {
193190
margin-left: 145px+14px;
194191
}
195192

196193
.offset_one {
197194
margin-left: 304px+14px;
198195
}
199196

200-
.double_column.with_text img {
201-
max-width: 100%;
202-
}
203-
197+
.double_column.with_text img {
198+
max-width: 100%;
199+
}
204200
}
205201

206202
/* ================================================================================
@@ -214,24 +210,23 @@ v .list_item neco podobneho) =jeden sloupec: 304x171 (?? TODO)
214210
215211
*/
216212
@media @small-end {
213+
/* Nezobrazujeme cely Likebox, jen maly buttonek */
214+
#facebookLikeBox {
215+
display: none;
216+
}
217+
#facebookButton {
218+
display: block;
219+
text-align: center;
220+
}
217221

218-
/* Nezobrazujeme cely Likebox, jen maly buttonek */
219-
#facebookLikeBox
220-
{ display: none; }
221-
#facebookButton
222-
{ display: block; text-align: center; }
223-
224-
/* --- Layout uvnitr stranky --- */
225-
.column,
226-
.double_column {
227-
margin-right: 0;
228-
width: auto;
229-
}
230-
222+
/* --- Layout uvnitr stranky --- */
223+
.column,
224+
.double_column {
225+
margin-right: 0;
226+
width: auto;
227+
}
231228
} /* @media screen and (max-width: 640px) */
232229

233-
234-
235230
// Varianta .column - sloupec jako polozka rozcestniku (napr. e-slovensko.cz/atrakce/)
236231
// ------------------------------------------------------------------------------------
237232

@@ -277,7 +272,6 @@ v .list_item neco podobneho) =jeden sloupec: 304x171 (?? TODO)
277272
overflow: hidden;
278273
}
279274

280-
281275
.column.as_list_item .text h2 {
282276
margin-bottom: 0;
283277
}
@@ -290,7 +284,6 @@ v .list_item neco podobneho) =jeden sloupec: 304x171 (?? TODO)
290284
padding-top: 8px;
291285
}
292286

293-
294287
.column.as_list_item .text a {
295288
color: #fff;
296289
text-decoration: underline;
@@ -300,4 +293,3 @@ v .list_item neco podobneho) =jeden sloupec: 304x171 (?? TODO)
300293
margin-bottom: 4px;
301294
margin-top: 0;
302295
}
303-

0 commit comments

Comments
 (0)