Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
NewSite v3.0
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sergey Serov
NewSite v3.0
Commits
363542b8
Commit
363542b8
authored
Oct 04, 2019
by
Sergey Serov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First page
parent
87adab3e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
212 additions
and
31 deletions
+212
-31
package-lock.json
package-lock.json
+34
-13
App.vue
src/App.vue
+69
-6
Main.vue
src/components/Main.vue
+109
-12
Earth.png
src/imgMain/pict/Earth.png
+0
-0
Background.png
src/source/Background.png
+0
-0
No files found.
package-lock.json
View file @
363542b8
...
@@ -2845,7 +2845,8 @@
...
@@ -2845,7 +2845,8 @@
"version"
:
"4.6.0"
,
"version"
:
"4.6.0"
,
"resolved"
:
"https://registry.npmjs.org/co/-/co-4.6.0.tgz"
,
"resolved"
:
"https://registry.npmjs.org/co/-/co-4.6.0.tgz"
,
"integrity"
:
"sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
,
"integrity"
:
"sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"coa"
:
{
"coa"
:
{
"version"
:
"2.0.2"
,
"version"
:
"2.0.2"
,
...
@@ -5374,7 +5375,8 @@
...
@@ -5374,7 +5375,8 @@
"ansi-regex"
:
{
"ansi-regex"
:
{
"version"
:
"2.1.1"
,
"version"
:
"2.1.1"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"aproba"
:
{
"aproba"
:
{
"version"
:
"1.2.0"
,
"version"
:
"1.2.0"
,
...
@@ -5395,12 +5397,14 @@
...
@@ -5395,12 +5397,14 @@
"balanced-match"
:
{
"balanced-match"
:
{
"version"
:
"1.0.0"
,
"version"
:
"1.0.0"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"brace-expansion"
:
{
"brace-expansion"
:
{
"version"
:
"1.1.11"
,
"version"
:
"1.1.11"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"balanced-match"
:
"^1.0.0"
,
"balanced-match"
:
"^1.0.0"
,
"concat-map"
:
"0.0.1"
"concat-map"
:
"0.0.1"
...
@@ -5415,17 +5419,20 @@
...
@@ -5415,17 +5419,20 @@
"code-point-at"
:
{
"code-point-at"
:
{
"version"
:
"1.1.0"
,
"version"
:
"1.1.0"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"concat-map"
:
{
"concat-map"
:
{
"version"
:
"0.0.1"
,
"version"
:
"0.0.1"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"console-control-strings"
:
{
"console-control-strings"
:
{
"version"
:
"1.1.0"
,
"version"
:
"1.1.0"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"core-util-is"
:
{
"core-util-is"
:
{
"version"
:
"1.0.2"
,
"version"
:
"1.0.2"
,
...
@@ -5542,7 +5549,8 @@
...
@@ -5542,7 +5549,8 @@
"inherits"
:
{
"inherits"
:
{
"version"
:
"2.0.3"
,
"version"
:
"2.0.3"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"ini"
:
{
"ini"
:
{
"version"
:
"1.3.5"
,
"version"
:
"1.3.5"
,
...
@@ -5554,6 +5562,7 @@
...
@@ -5554,6 +5562,7 @@
"version"
:
"1.0.0"
,
"version"
:
"1.0.0"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"number-is-nan"
:
"^1.0.0"
"number-is-nan"
:
"^1.0.0"
}
}
...
@@ -5568,6 +5577,7 @@
...
@@ -5568,6 +5577,7 @@
"version"
:
"3.0.4"
,
"version"
:
"3.0.4"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"brace-expansion"
:
"^1.1.7"
"brace-expansion"
:
"^1.1.7"
}
}
...
@@ -5575,12 +5585,14 @@
...
@@ -5575,12 +5585,14 @@
"minimist"
:
{
"minimist"
:
{
"version"
:
"0.0.8"
,
"version"
:
"0.0.8"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"minipass"
:
{
"minipass"
:
{
"version"
:
"2.3.5"
,
"version"
:
"2.3.5"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"safe-buffer"
:
"^5.1.2"
,
"safe-buffer"
:
"^5.1.2"
,
"yallist"
:
"^3.0.0"
"yallist"
:
"^3.0.0"
...
@@ -5599,6 +5611,7 @@
...
@@ -5599,6 +5611,7 @@
"version"
:
"0.5.1"
,
"version"
:
"0.5.1"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"minimist"
:
"0.0.8"
"minimist"
:
"0.0.8"
}
}
...
@@ -5679,7 +5692,8 @@
...
@@ -5679,7 +5692,8 @@
"number-is-nan"
:
{
"number-is-nan"
:
{
"version"
:
"1.0.1"
,
"version"
:
"1.0.1"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"object-assign"
:
{
"object-assign"
:
{
"version"
:
"4.1.1"
,
"version"
:
"4.1.1"
,
...
@@ -5691,6 +5705,7 @@
...
@@ -5691,6 +5705,7 @@
"version"
:
"1.4.0"
,
"version"
:
"1.4.0"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"wrappy"
:
"1"
"wrappy"
:
"1"
}
}
...
@@ -5776,7 +5791,8 @@
...
@@ -5776,7 +5791,8 @@
"safe-buffer"
:
{
"safe-buffer"
:
{
"version"
:
"5.1.2"
,
"version"
:
"5.1.2"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"safer-buffer"
:
{
"safer-buffer"
:
{
"version"
:
"2.1.2"
,
"version"
:
"2.1.2"
,
...
@@ -5812,6 +5828,7 @@
...
@@ -5812,6 +5828,7 @@
"version"
:
"1.0.2"
,
"version"
:
"1.0.2"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"code-point-at"
:
"^1.0.0"
,
"code-point-at"
:
"^1.0.0"
,
"is-fullwidth-code-point"
:
"^1.0.0"
,
"is-fullwidth-code-point"
:
"^1.0.0"
,
...
@@ -5831,6 +5848,7 @@
...
@@ -5831,6 +5848,7 @@
"version"
:
"3.0.1"
,
"version"
:
"3.0.1"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"requires"
:
{
"ansi-regex"
:
"^2.0.0"
"ansi-regex"
:
"^2.0.0"
}
}
...
@@ -5874,12 +5892,14 @@
...
@@ -5874,12 +5892,14 @@
"wrappy"
:
{
"wrappy"
:
{
"version"
:
"1.0.2"
,
"version"
:
"1.0.2"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"yallist"
:
{
"yallist"
:
{
"version"
:
"3.0.3"
,
"version"
:
"3.0.3"
,
"bundled"
:
true
,
"bundled"
:
true
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
}
}
}
}
},
},
...
@@ -9727,7 +9747,8 @@
...
@@ -9727,7 +9747,8 @@
"version"
:
"4.0.8"
,
"version"
:
"4.0.8"
,
"resolved"
:
"https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"
,
"resolved"
:
"https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"
,
"integrity"
:
"sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
,
"integrity"
:
"sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
,
"dev"
:
true
"dev"
:
true
,
"optional"
:
true
},
},
"rx-lite-aggregates"
:
{
"rx-lite-aggregates"
:
{
"version"
:
"4.0.8"
,
"version"
:
"4.0.8"
,
...
...
src/App.vue
View file @
363542b8
...
@@ -3,11 +3,11 @@
...
@@ -3,11 +3,11 @@
<nav
class=
"container-fluid"
id=
"navigator"
>
<nav
class=
"container-fluid"
id=
"navigator"
>
<div
class=
"row"
>
<div
class=
"row"
>
<transition
name=
"fade"
>
<transition
name=
"fade"
>
<div
v-if=
"!mobile"
id=
"logotip_div"
class=
"WidthNavigation
col-md-3
"
>
<div
v-if=
"!mobile"
id=
"logotip_div"
class=
"WidthNavigation"
>
<img
id=
"logotip"
src=
"./source/Logo.png"
/>
<img
id=
"logotip"
src=
"./source/Logo.png"
/>
</div>
</div>
</transition>
</transition>
<div
class=
"WidthNavigation TitlesNavigation
col-md-8
"
>
<div
class=
"WidthNavigation TitlesNavigation"
>
<router-link
class=
"navig"
to=
"/"
exact
><span>
Главная
</span></router-link>
<router-link
class=
"navig"
to=
"/"
exact
><span>
Главная
</span></router-link>
<router-link
class=
"navig"
to=
"/product"
><span>
Оборудование
</span></router-link>
<router-link
class=
"navig"
to=
"/product"
><span>
Оборудование
</span></router-link>
<router-link
class=
"navig"
to=
"/files"
><span>
Услуги
</span></router-link>
<router-link
class=
"navig"
to=
"/files"
><span>
Услуги
</span></router-link>
...
@@ -35,6 +35,8 @@ body{
...
@@ -35,6 +35,8 @@ body{
-webkit-user-select
:
none
;
-webkit-user-select
:
none
;
font-family
:
Arial
,
Helvetica
,
sans-serif
;
font-family
:
Arial
,
Helvetica
,
sans-serif
;
position
:
relative
;
position
:
relative
;
background-image
:
url('./source/Background.png')
;
background-size
:
cover
;
}
}
@font-face
{
@font-face
{
font-family
:
"Europe"
;
font-family
:
"Europe"
;
...
@@ -100,6 +102,71 @@ a.navig:hover span{
...
@@ -100,6 +102,71 @@ a.navig:hover span{
text-align
:
right
;
text-align
:
right
;
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
/* .Меню {
position: absolute;
left: 0px;
top: 0px;
width: 1920px;
height: 4334px;
z-index: 6;
}
.Контакты {
font-size: 30px;
font-family: "Noah";
color: rgb(255, 255, 255);
font-weight: bold;
text-align: center;
-moz-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-webkit-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-ms-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
position: absolute;
left: 1424.35px;
top: 64.89px;
z-index: 5;
}
.Оборудование {
font-size: 30px;
font-family: "Noah";
color: rgb(255, 255, 255);
font-weight: bold;
text-align: center;
-moz-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-webkit-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-ms-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
position: absolute;
left: 1201.532px;
top: 64.253px;
z-index: 4;
}
.Услуги {
font-size: 30px;
font-family: "Noah";
color: rgb(255, 255, 255);
font-weight: bold;
text-align: center;
-moz-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-webkit-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-ms-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
position: absolute;
left: 1082.665px;
top: 64.753px;
z-index: 3;
}
.Главная {
font-size: 30px;
font-family: "Noah";
color: rgb(0, 146, 202);
font-weight: bold;
text-align: center;
-moz-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-webkit-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
-ms-transform: matrix( 0.9608273770496,0,0,0.9608273770496,0,0);
position: absolute;
left: 942.966px;
top: 64.887px;
z-index: 2;
} */
.router-link-exact-active
span
{
.router-link-exact-active
span
{
color
:
#00aeff
;
color
:
#00aeff
;
}
}
...
@@ -114,10 +181,6 @@ img#logotip{
...
@@ -114,10 +181,6 @@ img#logotip{
width
:
33vw
;
width
:
33vw
;
pointer-events
:
none
;
pointer-events
:
none
;
}
}
body
{
background-image
:
url('./source/Background.jpg')
;
background-size
:
cover
;
}
...
...
src/components/Main.vue
View file @
363542b8
<
template
>
<
template
>
<div
id=
"main"
>
<div
id=
"main"
>
<div
id=
"block_title"
>
<div
id=
"block_title"
>
<p
id=
"title"
>
{{
Title
}}
</p>
<div
class=
"title_img"
>
<img
class=
"img_on_main"
src=
"../imgMain/pict/Earth.png"
/>
</div>
<div
class=
"title"
>
<span
id=
"title"
>
{{
Title
}}
</span>
</div>
</div>
<div
class=
"strelka"
>
<div
id=
"arrow"
>
<div
id=
"arrowleft"
></div>
<div
id=
"arrowright"
></div>
</div>
</div>
<div
id=
"strelka"
>
<span>
∨
</span>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -17,25 +26,113 @@
...
@@ -17,25 +26,113 @@
color
:
#2c3e50
;
color
:
#2c3e50
;
/* height: 100vh; */
/* height: 100vh; */
}
}
#main
div
{
#main
{
width
:
100%
;
width
:
100%
;
/* background-image: url('../source/Bacground.png') */
/* background-image: url('../source/Bacground.png') */
}
}
#main
#block_title
{
#main
#block_title
{
width
:
42vw
;
/* width: 43vw; */
margin
:
0
auto
;
margin
:
0
auto
;
margin-top
:
3%
;
padding-top
:
6%
;
margin-right
:
12%
;
/* margin-right: 13%; */
display
:
table-cell
;
}
}
#main
#title
{
#main
#block_title
div
{
width
:
95%
;
display
:
inline-block
;
margin
:
0
auto
;
vertical-align
:
middle
;
font-size
:
7.5em
;
}
#main
#block_title
div
.title_img
{
width
:
32%
;
}
#main
#block_title
div
.title_img
img
.img_on_main
{
width
:
72%
;
}
#main
#block_title
div
.title
{
color
:
white
;
color
:
white
;
text-align
:
left
;
text-align
:
left
;
white-space
:
normal
;
white-space
:
normal
;
line-height
:
0.9em
;
text-transform
:
uppercase
;
width
:
40%
;
/* font-family: "Noah"; */
font-weight
:
bold
;
}
}
#main
#title
{
width
:
95%
;
margin
:
0
auto
;
}
#main
#title
{
font-size
:
calc
(
0.05
*
100vw
+
11.2px
);
}
.strelka
{
border-radius
:
50%
;
border
:
3px
solid
white
;
position
:
relative
;
margin
:
0
auto
;
}
.strelka
{
content
:
''
;
background-color
:
none
;
transition
:
all
0.3s
;
}
#arrow
{
margin-top
:
39%
;
margin-left
:
22%
;
width
:
58%
;
height
:
58%
;
position
:
relative
;
}
#arrowleft
,
#arrowright
{
position
:
absolute
;
background-color
:
white
;
width
:
71%
;
height
:
9%
;
}
#arrowleft
{
transform
:
rotate
(
45deg
);
transform-origin
:
bottom
left
;
}
#arrowright
{
transform
:
rotate
(
-45deg
);
transform-origin
:
bottom
right
;
right
:
0
;
}
.strelka
:hover
{
background-color
:
#00aeff
;
}
@media
only
screen
and
(
min-width
:
1400px
)
{
.strelka
{
width
:
40px
;
height
:
40px
;
padding
:
15px
;
margin-top
:
13vh
;
}
}
@media
only
screen
and
(
max-width
:
1399px
)
and
(
min-width
:
1024px
)
{
.strelka
{
width
:
50px
;
height
:
50px
;
padding
:
15px
;
margin-top
:
13vh
;
}
}
@media
only
screen
and
(
max-width
:
1023px
)
and
(
min-width
:
380px
)
{
.strelka
{
width
:
50px
;
height
:
50px
;
padding
:
15px
;
margin-top
:
13vh
;
}
}
</
style
>
</
style
>
<
script
>
<
script
>
...
...
src/imgMain/pict/Earth.png
0 → 100644
View file @
363542b8
692 KB
src/source/Bacground.png
→
src/source/Bac
k
ground.png
View file @
363542b8
File moved
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