Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
c905bd6d
Commit
c905bd6d
authored
Feb 13, 2019
by
Ruslan Karimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#2299. Арт Проект. Правки по кейсу Юнармии
parent
eead658b
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
28 additions
and
0 deletions
+28
-0
frontend/assets/AppAsset.php
frontend/assets/AppAsset.php
+2
-0
frontend/views/layouts/head.php
frontend/views/layouts/head.php
+1
-0
frontend/web/css/jquery.fancybox.min.css
frontend/web/css/jquery.fancybox.min.css
+1
-0
frontend/web/images/img_army/army_img_2.jpg
frontend/web/images/img_army/army_img_2.jpg
+0
-0
frontend/web/images/img_army/army_img_2.png
frontend/web/images/img_army/army_img_2.png
+0
-0
frontend/web/images/img_army/army_img_3.jpg
frontend/web/images/img_army/army_img_3.jpg
+0
-0
frontend/web/images/img_army/army_img_3.png
frontend/web/images/img_army/army_img_3.png
+0
-0
frontend/web/js/jquery.fancybox.min.js
frontend/web/js/jquery.fancybox.min.js
+13
-0
frontend/web/js/jquery.matchHeight-min.js
frontend/web/js/jquery.matchHeight-min.js
+11
-0
No files found.
frontend/assets/AppAsset.php
View file @
c905bd6d
...
...
@@ -37,6 +37,8 @@ class AppAsset extends AssetBundle
'/js/jquery.form.js'
,
'/js/connect-form.js'
,
'/js/prism.js'
,
'js/jquery.fancybox.min.js'
,
'js/jquery.matchHeight-min.js'
,
'/js/custom.js'
,
'/js/add_06.06.16.js'
,
'/js/modernizr.js'
,
...
...
frontend/views/layouts/head.php
View file @
c905bd6d
...
...
@@ -57,5 +57,6 @@ endif;?>
<?php
$this
->
registerCssFile
(
'/css/style_30.11.2018.css'
);
?>
<?php
$this
->
registerCssFile
(
'/css/style_crypto.css'
);
?>
<?php
$this
->
registerCssFile
(
'/css/style_build.css'
);
?>
<?php
$this
->
registerCssFile
(
'/css/jquery.fancybox.min.css'
);
?>
<?php
Yii
::
$app
->
view
->
registerAssetFiles
(
'/'
)
?>
frontend/web/css/jquery.fancybox.min.css
0 → 100644
View file @
c905bd6d
This diff is collapsed.
Click to expand it.
frontend/web/images/img_army/army_img_2.jpg
deleted
100644 → 0
View file @
eead658b
36.8 KB
frontend/web/images/img_army/army_img_2.png
0 → 100644
View file @
c905bd6d
54.2 KB
frontend/web/images/img_army/army_img_3.jpg
deleted
100644 → 0
View file @
eead658b
41.4 KB
frontend/web/images/img_army/army_img_3.png
0 → 100644
View file @
c905bd6d
67 KB
frontend/web/js/jquery.fancybox.min.js
0 → 100644
View file @
c905bd6d
This diff is collapsed.
Click to expand it.
frontend/web/js/jquery.matchHeight-min.js
0 → 100644
View file @
c905bd6d
/**
* jquery.matchHeight-min.js master
* http://brm.io/jquery-match-height/
* License: MIT
*/
(
function
(
c
){
var
n
=-
1
,
f
=-
1
,
g
=
function
(
a
){
return
parseFloat
(
a
)
||
0
},
r
=
function
(
a
){
var
b
=
null
,
d
=
[];
c
(
a
).
each
(
function
(){
var
a
=
c
(
this
),
k
=
a
.
offset
().
top
-
g
(
a
.
css
(
"
margin-top
"
)),
l
=
0
<
d
.
length
?
d
[
d
.
length
-
1
]:
null
;
null
===
l
?
d
.
push
(
a
):
1
>=
Math
.
floor
(
Math
.
abs
(
b
-
k
))?
d
[
d
.
length
-
1
]
=
l
.
add
(
a
):
d
.
push
(
a
);
b
=
k
});
return
d
},
p
=
function
(
a
){
var
b
=
{
byRow
:
!
0
,
property
:
"
height
"
,
target
:
null
,
remove
:
!
1
};
if
(
"
object
"
===
typeof
a
)
return
c
.
extend
(
b
,
a
);
"
boolean
"
===
typeof
a
?
b
.
byRow
=
a
:
"
remove
"
===
a
&&
(
b
.
remove
=!
0
);
return
b
},
b
=
c
.
fn
.
matchHeight
=
function
(
a
){
a
=
p
(
a
);
if
(
a
.
remove
){
var
e
=
this
;
this
.
css
(
a
.
property
,
""
);
c
.
each
(
b
.
_groups
,
function
(
a
,
b
){
b
.
elements
=
b
.
elements
.
not
(
e
)});
return
this
}
if
(
1
>=
this
.
length
&&!
a
.
target
)
return
this
;
b
.
_groups
.
push
({
elements
:
this
,
options
:
a
});
b
.
_apply
(
this
,
a
);
return
this
};
b
.
_groups
=
[];
b
.
_throttle
=
80
;
b
.
_maintainScroll
=!
1
;
b
.
_beforeUpdate
=
null
;
b
.
_afterUpdate
=
null
;
b
.
_apply
=
function
(
a
,
e
){
var
d
=
p
(
e
),
h
=
c
(
a
),
k
=
[
h
],
l
=
c
(
window
).
scrollTop
(),
f
=
c
(
"
html
"
).
outerHeight
(
!
0
),
m
=
h
.
parents
().
filter
(
"
:hidden
"
);
m
.
each
(
function
(){
var
a
=
c
(
this
);
a
.
data
(
"
style-cache
"
,
a
.
attr
(
"
style
"
))});
m
.
css
(
"
display
"
,
"
block
"
);
d
.
byRow
&&!
d
.
target
&&
(
h
.
each
(
function
(){
var
a
=
c
(
this
),
b
=
a
.
css
(
"
display
"
);
"
inline-block
"
!==
b
&&
"
inline-flex
"
!==
b
&&
(
b
=
"
block
"
);
a
.
data
(
"
style-cache
"
,
a
.
attr
(
"
style
"
));
a
.
css
({
display
:
b
,
"
padding-top
"
:
"
0
"
,
"
padding-bottom
"
:
"
0
"
,
"
margin-top
"
:
"
0
"
,
"
margin-bottom
"
:
"
0
"
,
"
border-top-width
"
:
"
0
"
,
"
border-bottom-width
"
:
"
0
"
,
height
:
"
100px
"
})}),
k
=
r
(
h
),
h
.
each
(
function
(){
var
a
=
c
(
this
);
a
.
attr
(
"
style
"
,
a
.
data
(
"
style-cache
"
)
||
""
)}));
c
.
each
(
k
,
function
(
a
,
b
){
var
e
=
c
(
b
),
f
=
0
;
if
(
d
.
target
)
f
=
d
.
target
.
outerHeight
(
!
1
);
else
{
if
(
d
.
byRow
&&
1
>=
e
.
length
){
e
.
css
(
d
.
property
,
""
);
return
}
e
.
each
(
function
(){
var
a
=
c
(
this
),
b
=
a
.
css
(
"
display
"
);
"
inline-block
"
!==
b
&&
"
inline-flex
"
!==
b
&&
(
b
=
"
block
"
);
b
=
{
display
:
b
};
b
[
d
.
property
]
=
""
;
a
.
css
(
b
);
a
.
outerHeight
(
!
1
)
>
f
&&
(
f
=
a
.
outerHeight
(
!
1
));
a
.
css
(
"
display
"
,
""
)})}
e
.
each
(
function
(){
var
a
=
c
(
this
),
b
=
0
;
d
.
target
&&
a
.
is
(
d
.
target
)
||
(
"
border-box
"
!==
a
.
css
(
"
box-sizing
"
)
&&
(
b
+=
g
(
a
.
css
(
"
border-top-width
"
))
+
g
(
a
.
css
(
"
border-bottom-width
"
)),
b
+=
g
(
a
.
css
(
"
padding-top
"
))
+
g
(
a
.
css
(
"
padding-bottom
"
))),
a
.
css
(
d
.
property
,
f
-
b
+
"
px
"
))})});
m
.
each
(
function
(){
var
a
=
c
(
this
);
a
.
attr
(
"
style
"
,
a
.
data
(
"
style-cache
"
)
||
null
)});
b
.
_maintainScroll
&&
c
(
window
).
scrollTop
(
l
/
f
*
c
(
"
html
"
).
outerHeight
(
!
0
));
return
this
};
b
.
_applyDataApi
=
function
(){
var
a
=
{};
c
(
"
[maxheight], [data-mh]
"
).
each
(
function
(){
var
b
=
c
(
this
),
d
=
b
.
attr
(
"
data-mh
"
)
||
b
.
attr
(
"
maxheight
"
);
a
[
d
]
=
d
in
a
?
a
[
d
].
add
(
b
):
b
});
c
.
each
(
a
,
function
(){
this
.
matchHeight
(
!
0
)})};
var
q
=
function
(
a
){
b
.
_beforeUpdate
&&
b
.
_beforeUpdate
(
a
,
b
.
_groups
);
c
.
each
(
b
.
_groups
,
function
(){
b
.
_apply
(
this
.
elements
,
this
.
options
)});
b
.
_afterUpdate
&&
b
.
_afterUpdate
(
a
,
b
.
_groups
)};
b
.
_update
=
function
(
a
,
e
){
if
(
e
&&
"
resize
"
===
e
.
type
){
var
d
=
c
(
window
).
width
();
if
(
d
===
n
)
return
;
n
=
d
}
a
?
-
1
===
f
&&
(
f
=
setTimeout
(
function
(){
q
(
e
);
f
=-
1
},
b
.
_throttle
)):
q
(
e
)};
c
(
b
.
_applyDataApi
);
c
(
window
).
bind
(
"
load
"
,
function
(
a
){
b
.
_update
(
!
1
,
a
)});
c
(
window
).
bind
(
"
resize orientationchange
"
,
function
(
a
){
b
.
_update
(
!
0
,
a
)})})(
jQuery
);
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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