Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
N
NAP-wordpress
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marwa Sfari
NAP-wordpress
Commits
a699e6f3
Commit
a699e6f3
authored
Aug 30, 2017
by
imac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix/Update]JIRA && Add Loading
parent
5a729d76
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
147 additions
and
101 deletions
+147
-101
main.css
wp-content/themes/nap/assets/css/main.css
+24
-3
responsive.css
wp-content/themes/nap/assets/css/responsive.css
+4
-1
main.js
wp-content/themes/nap/assets/js/main.js
+79
-74
footer.php
wp-content/themes/nap/footer.php
+13
-1
header.php
wp-content/themes/nap/header.php
+27
-22
No files found.
wp-content/themes/nap/assets/css/main.css
View file @
a699e6f3
...
@@ -1434,6 +1434,7 @@ label.chevron.bottom::first-letter {
...
@@ -1434,6 +1434,7 @@ label.chevron.bottom::first-letter {
font-size
:
9px
;
font-size
:
9px
;
line-height
:
12px
;
line-height
:
12px
;
margin-top
:
4px
;
margin-top
:
4px
;
padding
:
0
2px
;
}
}
.product-info
{
.product-info
{
width
:
56.5%
;
width
:
56.5%
;
...
@@ -2588,6 +2589,7 @@ div.wpcf7-mail-sent-ok{
...
@@ -2588,6 +2589,7 @@ div.wpcf7-mail-sent-ok{
/* --------------*/
/* ---------->>> Loading <<<-----------*/
/* --------------*/
/* --------------*/
/* ---------->>> Loading <<<-----------*/
/* --------------*/
#loading-container-subpage
,
#loading-container
{
#loading-container
{
background-color
:
#fff
;
background-color
:
#fff
;
width
:
100%
;
width
:
100%
;
...
@@ -2599,12 +2601,14 @@ div.wpcf7-mail-sent-ok{
...
@@ -2599,12 +2601,14 @@ div.wpcf7-mail-sent-ok{
transition
:
all
.2s
ease
;
transition
:
all
.2s
ease
;
z-index
:
9999999999999999
;
z-index
:
9999999999999999
;
}
}
#loading-container-subpage
{
display
:
none
;
}
#loading-center-absolute
{
#loading-center-absolute
{
/* background: url(../img/logo-loader.png) no-repeat center center;*/
/* background: url(../img/logo-loader.png) no-repeat center center;*/
position
:
absolute
;
position
:
absolute
;
width
:
100%
;
width
:
100%
;
height
:
200
px
;
height
:
38
px
;
/*opacity: 0.3;*/
/*opacity: 0.3;*/
background-size
:
contain
;
background-size
:
contain
;
max-width
:
200px
;
max-width
:
200px
;
...
@@ -2617,5 +2621,22 @@ div.wpcf7-mail-sent-ok{
...
@@ -2617,5 +2621,22 @@ div.wpcf7-mail-sent-ok{
-webkit-transform
:
translateY
(
-50%
);
-webkit-transform
:
translateY
(
-50%
);
-moz-transform
:
translateY
(
-50%
);
-moz-transform
:
translateY
(
-50%
);
-o-transform
:
translateY
(
-50%
);
-o-transform
:
translateY
(
-50%
);
}
.load-4
.ring-1
{
animation
:
loadingD
1.5s
.3s
cubic-bezier
(
.17
,
.37
,
.43
,
.67
)
infinite
;}
.load-4
p
{
padding-top
:
10px
;
}
}
.ring-1
{
width
:
10px
;
height
:
10px
;
margin
:
0
auto
;
padding
:
10px
;
border
:
7px
dashed
#182566
;
border-radius
:
100%
;
}
@keyframes
loadingD
{
0
{
transform
:
rotate
(
0deg
);}
50
%
{
transform
:
rotate
(
180deg
);}
100
%
{
transform
:
rotate
(
360deg
);}
}
\ No newline at end of file
wp-content/themes/nap/assets/css/responsive.css
View file @
a699e6f3
...
@@ -782,7 +782,7 @@
...
@@ -782,7 +782,7 @@
margin-top
:
0px
;
margin-top
:
0px
;
}
}
.pa_format
ul
li
{
.pa_format
ul
li
{
max-width
:
60px
;
/*max-width: 60px;*/
margin
:
0
10px
;
margin
:
0
10px
;
}
}
/* Page CMS */
/* Page CMS */
...
@@ -955,6 +955,9 @@
...
@@ -955,6 +955,9 @@
.panel
.product-list
article
{
.panel
.product-list
article
{
width
:
145px
;
width
:
145px
;
}
}
.phototheque-content
.panel
.product-list
{
padding
:
0px
;
}
.panel
.product-list
article
figure
{
.panel
.product-list
article
figure
{
height
:
145px
;
height
:
145px
;
width
:
145px
;
width
:
145px
;
...
...
wp-content/themes/nap/assets/js/main.js
View file @
a699e6f3
...
@@ -47,8 +47,8 @@ $(function(){
...
@@ -47,8 +47,8 @@ $(function(){
},
330
)
},
330
)
nav
.
stop
().
slideToggle
();
nav
.
stop
().
slideToggle
();
});
});
}
}
$
.
fn
.
loadPageContent
=
function
(){
$
.
fn
.
loadPageContent
=
function
(){
if
(
$
(
'body'
).
find
(
'header'
).
length
>
1
){
if
(
$
(
'body'
).
find
(
'header'
).
length
>
1
){
$
(
'body'
).
find
(
'header'
).
last
().
parent
().
remove
();
$
(
'body'
).
find
(
'header'
).
last
().
parent
().
remove
();
...
@@ -96,17 +96,23 @@ $(function(){
...
@@ -96,17 +96,23 @@ $(function(){
$
(
'.gallery-wrapper'
).
removeClass
(
'hidden-elem'
).
addClass
(
'animated visible-elem fadeInUp'
);
$
(
'.gallery-wrapper'
).
removeClass
(
'hidden-elem'
).
addClass
(
'animated visible-elem fadeInUp'
);
},
0
)
},
0
)
}
}
function
appendLoading
()
{
$
(
'.load-page'
).
append
(
$
(
'#loading-container-subpage'
).
clone
());
$
(
'#loading-container-subpage'
).
show
();
}
//load content page on left Panel
//load content page on left Panel
$
(
document
).
find
(
'.to-slide'
).
on
(
'click'
,
'a'
,
function
(
e
){
$
(
document
).
find
(
'.to-slide'
).
on
(
'click'
,
'a'
,
function
(
e
){
$
(
'html'
).
css
(
'overflow'
,
'hidden'
);
$
(
'html'
).
css
(
'overflow'
,
'hidden'
);
appendLoading
();
e
.
preventDefault
();
e
.
preventDefault
();
var
link
=
$
(
this
).
attr
(
"href"
),
var
link
=
$
(
this
).
attr
(
"href"
),
windowWidth
=
$
(
window
).
width
();
windowWidth
=
$
(
window
).
width
();
$
(
'.load-page'
).
parent
().
addClass
(
'active'
);
$
(
'.load-page'
).
parent
().
addClass
(
'active'
);
history
.
pushState
(
null
,
null
,
link
);
history
.
pushState
(
null
,
null
,
link
);
$
(
'.load-page'
).
load
(
link
,
function
(){
$
(
'.load-page'
).
load
(
link
,
function
(){
console
.
log
(
'load page'
);
$
.
fn
.
loadPageContent
();
$
.
fn
.
loadPageContent
();
$
(
'#loading-container-subpage'
).
hide
();
});
});
if
(
windowWidth
<
860
){
if
(
windowWidth
<
860
){
$
(
".c-hamburger"
).
trigger
(
"click"
);
$
(
".c-hamburger"
).
trigger
(
"click"
);
...
@@ -135,14 +141,13 @@ $(function(){
...
@@ -135,14 +141,13 @@ $(function(){
}).
on
(
'click'
,
'.scrolled'
,
function
(){
}).
on
(
'click'
,
'.scrolled'
,
function
(){
$
(
this
).
removeClass
(
'scrolled'
);
$
(
this
).
removeClass
(
'scrolled'
);
$
(
"html, body"
).
animate
({
scrollTop
:
0
},
"slow"
);
$
(
"html, body"
).
animate
({
scrollTop
:
0
},
"slow"
);
setTimeout
(
function
(){
$
(
'.footer-home-content'
).
find
(
'.nav-content'
).
remove
();
$
(
'.footer-home-content'
).
find
(
'.nav-content'
).
remove
();
//$('.home-footer-nav .nav-wrapper').css('top','initial');
$
(
'.home-down-wrapper'
).
css
(
'top'
,
'initial'
);
$
(
'.home-down-wrapper'
).
css
(
'top'
,
'initial'
);
$
(
'.footer-home-content'
).
removeClass
(
'fixed'
);
$
(
'.footer-home-content'
).
removeClass
(
'fixed'
);
$
(
'.main'
).
height
(
$
(
window
).
innerHeight
());
$
(
'.main'
).
height
(
$
(
window
).
innerHeight
());
},
600
)
return
false
;
return
false
;
});
});
//Get file name of uploaded file
//Get file name of uploaded file
$
(
'#file-p'
).
on
(
'change'
,
function
(
e
){
$
(
'#file-p'
).
on
(
'change'
,
function
(
e
){
...
@@ -371,11 +376,11 @@ $(function(){
...
@@ -371,11 +376,11 @@ $(function(){
}
}
},
},
});
});
$
(
document
).
on
(
'click'
,
'.moveDown'
,
function
(){
$
(
document
).
on
(
'click'
,
'.moveDown'
,
function
(){
$
.
fn
.
fullpage
.
moveSectionDown
();
$
.
fn
.
fullpage
.
moveSectionDown
();
});
});
}
}
$
.
fn
.
getMenuBg
=
function
(){
$
.
fn
.
getMenuBg
=
function
(){
var
imgSrc
=
$
(
'header .nav-content > ul'
).
find
(
' > li.current'
).
data
(
'img'
),
var
imgSrc
=
$
(
'header .nav-content > ul'
).
find
(
' > li.current'
).
data
(
'img'
),
windowWidth
=
$
(
window
).
width
(),
windowWidth
=
$
(
window
).
width
(),
navwWidth
=
$
(
'.nav-wrapper'
).
width
(),
navwWidth
=
$
(
'.nav-wrapper'
).
width
(),
...
@@ -390,8 +395,8 @@ $(function(){
...
@@ -390,8 +395,8 @@ $(function(){
if
(
windowWidth
>
860
){
if
(
windowWidth
>
860
){
tlBg
.
to
(
'.container-bg'
,
1.2
,{
width
:
navwWidth
},
0.4
);
tlBg
.
to
(
'.container-bg'
,
1.2
,{
width
:
navwWidth
},
0.4
);
}
}
}
}
$
.
fn
.
appendMap
=
function
(){
$
.
fn
.
appendMap
=
function
(){
var
$this
=
$
(
this
);
var
$this
=
$
(
this
);
if
(
!
(
this
.
find
(
'.map'
).
length
)){
if
(
!
(
this
.
find
(
'.map'
).
length
)){
this
.
append
(
$
(
'.map'
));
this
.
append
(
$
(
'.map'
));
...
@@ -399,8 +404,8 @@ $(function(){
...
@@ -399,8 +404,8 @@ $(function(){
setTimeout
(
function
(){
setTimeout
(
function
(){
initMap
();
initMap
();
},
330
)
},
330
)
}
}
$
.
fn
.
appendMobileMenu
=
function
(){
$
.
fn
.
appendMobileMenu
=
function
(){
var
$this
=
$
(
this
);
var
$this
=
$
(
this
);
setTimeout
(
function
(){
setTimeout
(
function
(){
if
(
!
(
$this
.
find
(
'li.current'
).
length
)){
if
(
!
(
$this
.
find
(
'li.current'
).
length
)){
...
@@ -411,7 +416,7 @@ $(function(){
...
@@ -411,7 +416,7 @@ $(function(){
$
(
'.right-container'
).
css
(
'padding-top'
,
$this
.
parent
().
outerHeight
());
$
(
'.right-container'
).
css
(
'padding-top'
,
$this
.
parent
().
outerHeight
());
},
2000
)
},
2000
)
}
}
//Responsive function
//Responsive function
$
.
fn
.
responsive
=
function
(){
$
.
fn
.
responsive
=
function
(){
var
footerHeight
=
$
(
'footer'
).
height
(),
var
footerHeight
=
$
(
'footer'
).
height
(),
...
...
wp-content/themes/nap/footer.php
View file @
a699e6f3
</div>
</div>
<div
class=
"right-panel-wrapper abs-full fixed transition"
>
<div
class=
"right-panel-wrapper abs-full fixed transition"
>
<div
id=
"load-page"
class=
"load-page transition"
></div>
<div
id=
"load-page"
class=
"load-page transition"
></div>
</div>
<footer
class=
"blue-bg"
>
<footer
class=
"blue-bg"
>
<?php
wp_footer
();
?>
<?php
wp_footer
();
?>
<div
class=
"footer font-small animated fadeInUp"
>
<div
class=
"footer font-small animated fadeInUp"
>
...
@@ -66,6 +65,19 @@
...
@@ -66,6 +65,19 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
id=
"loading-container-subpage"
>
<div
class=
"loading-wrapper"
>
<div
class=
"loading"
>
<div
id=
"loading-center-absolute"
>
<div
class=
"load-4"
>
<div
class=
"ring-1"
></div>
<p
class=
"center"
>
Loading . . .
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<script
src=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/js/jQuery-v1-11.min.js'
)
?>
"
></script>
<script
src=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/js/jQuery-v1-11.min.js'
)
?>
"
></script>
<script
src=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/js/jquery-ui.min.js'
)
?>
"
></script>
<script
src=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/js/jquery-ui.min.js'
)
?>
"
></script>
<script
src=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/js/vendors/TweenMax.min.js'
)
?>
"
></script>
<script
src=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/js/vendors/TweenMax.min.js'
)
?>
"
></script>
...
...
wp-content/themes/nap/header.php
View file @
a699e6f3
<!DOCTYPE html>
<!DOCTYPE html>
<html
<?php
language_attributes
();
?>
class=
"no-js no-svg"
>
<html
<?php
language_attributes
();
?>
class=
"no-js no-svg"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/normalize.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/normalize.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/fonts/stylesheet.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/fonts/stylesheet.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/slick-theme.css'
)
?>
?v=432"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/slick-theme.css'
)
?>
?v=432"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/slick.css'
)
?>
?v=432"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/slick.css'
)
?>
?v=432"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/animate.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/animate.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/animsition.min.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/animsition.min.css'
)
?>
"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/main.css'
)
?>
?v=454"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/main.css'
)
?>
?v=454"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/responsive.css'
)
?>
?v=432"
rel=
"stylesheet"
type=
"text/css"
>
<link
href=
"
<?php
echo
home_url
(
'wp-content/themes/nap/assets/css/responsive.css'
)
?>
?v=432"
rel=
"stylesheet"
type=
"text/css"
>
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<link
rel=
"icon"
type=
"image/png"
href=
"images/favicon.png"
/>
<link
rel=
"icon"
type=
"image/png"
href=
"images/favicon.png"
/>
<head>
<head>
<meta
charset=
"
<?php
bloginfo
(
'charset'
);
?>
"
>
<meta
charset=
"
<?php
bloginfo
(
'charset'
);
?>
"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1 ,user-scalable = no"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1 ,user-scalable = no"
>
<?php
wp_head
();
?>
<?php
wp_head
();
?>
</head>
</head>
<div
id=
"loading-container"
>
<div
id=
"loading-container"
>
<div
class=
"loading-wrapper"
>
<div
class=
"loading-wrapper"
>
<div
class=
"loading"
>
<div
class=
"loading"
>
<div
id=
"loading-center-absolute"
></div>
<div
id=
"loading-center-absolute"
>
<div
class=
"load-4"
>
<div
class=
"ring-1"
></div>
<p
class=
"center"
>
Loading . . .
</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"main"
>
</div>
</div>
<div
class=
"main"
>
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