Skip to content

N
NewSite v3.0
Commit 21911ac7 authored by Sergey Serov's avatar Sergey Serov
Browse files
Options

Main page (>1024px)

parent fe5a9cbf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 53 deletions
site/css/app.2f1c9e15.css 0 → 100644
View file @ 21911ac7
This diff is collapsed.
site/css/app.793a3d49.css deleted 100644 → 0
View file @ fe5a9cbf
This diff is collapsed.
site/index.html
View file @ 21911ac7
<!DOCTYPE html><html lang=ru><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" type="image/png" href="favicon.png"/><![endif]--><link rel=stylesheet href=https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css><title>АО "АНЦ"</title><link href=css/app.793a3d49.css rel=preload as=style><link href=js/app.4cb25409.js rel=preload as=script><link href=js/chunk-vendors.fd958138.js rel=preload as=script><link href=css/app.793a3d49.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=site><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><noscript><strong>We're sorry but site doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.fd958138.js></script><script src=js/app.4cb25409.js></script></body></html> <!DOCTYPE html><html lang=ru><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" type="image/png" href="favicon.png"/><![endif]--><link rel=stylesheet href=https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css><title>АО "АНЦ"</title><link href=css/app.2f1c9e15.css rel=preload as=style><link href=js/app.919f0336.js rel=preload as=script><link href=js/chunk-vendors.fd958138.js rel=preload as=script><link href=css/app.2f1c9e15.css rel=stylesheet><link rel=icon type=image/png sizes=32x32 href=img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=img/icons/favicon-16x16.png><link rel=manifest href=manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=site><link rel=apple-touch-icon href=img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><noscript><strong>We're sorry but site doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.fd958138.js></script><script src=js/app.919f0336.js></script></body></html>
\ No newline at end of file \ No newline at end of file
site/js/app.4cb25409.js.map deleted 100644 → 0
View file @ fe5a9cbf
This source diff could not be displayed because it is too large. You can view the blob instead.
site/js/app.919f0336.js.map 0 → 100644
View file @ 21911ac7
This source diff could not be displayed because it is too large. You can view the blob instead.
site/precache-manifest.50e910267013e1adf0d565d7c3f929c5.js → site/precache-manifest.8aae99f9e1a98ad29838ed57ef5a7f10.js
View file @ 21911ac7
self.__precacheManifest = [ self.__precacheManifest = [
{ {
"revision": "916537507de710cef912", "revision": "ca4029d5d9959c02fcc8",
"url": "css/app.793a3d49.css" "url": "css/app.2f1c9e15.css"
}, },
{ {
"revision": "916537507de710cef912", "revision": "ca4029d5d9959c02fcc8",
"url": "js/app.4cb25409.js" "url": "js/app.919f0336.js"
}, },
{ {
"revision": "98b2956152c9ac78fea5", "revision": "98b2956152c9ac78fea5",
...@@ -52,7 +52,7 @@ self.__precacheManifest = [ ...@@ -52,7 +52,7 @@ self.__precacheManifest = [
"url": "img/Logo_circle.92069ed4.png" "url": "img/Logo_circle.92069ed4.png"
}, },
{ {
"revision": "b1a2a9049f6737fbf1a9e81e4cd0a1c6", "revision": "f78a2d61ba706f378178598c250abadb",
"url": "index.html" "url": "index.html"
}, },
{ {
......
site/service-worker.js
View file @ 21911ac7
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js"); importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts( importScripts(
"precache-manifest.50e910267013e1adf0d565d7c3f929c5.js" "precache-manifest.8aae99f9e1a98ad29838ed57ef5a7f10.js"
); );
workbox.core.setCacheNameDetails({prefix: "site"}); workbox.core.setCacheNameDetails({prefix: "site"});
......
src/App.vue
View file @ 21911ac7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<img id="logotip" src="./source/Logo.png" /> <img id="logotip" src="./source/Logo.png" />
</div> </div>
</transition> </transition>
<div class="WidthNavigation TitlesNavigation col-sm-7 col-md-9 col-lg-7"> <div class="WidthNavigation TitlesNavigation col-sm-9 col-md-9 col-lg-7">
<div class="menu"> <div class="menu">
<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>
...@@ -41,6 +41,7 @@ body{ ...@@ -41,6 +41,7 @@ body{
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
overflow-x: hidden; overflow-x: hidden;
background-color: black; background-color: black;
width: 100%;
} }
@font-face { @font-face {
font-family: "Europe"; font-family: "Europe";
......
src/components/Main.vue
View file @ 21911ac7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<img class="img_on_main" src="../imgMain/pict/Earth.png" /> <img class="img_on_main" src="../imgMain/pict/Earth.png" />
</div> </div>
<div class="title"> <div class="title">
<span id="title">{{Title}}</span> <p id="title_text">{{Title}}</p>
</div> </div>
</div> </div>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</div> </div>
<div id="about" class="item"> <div id="about" class="item">
<div class="row"> <div class="row">
<div class="about_block col-sm-10 col-md-8 col-lg-8"> <div class="about_block col-sm-10 col-md-8 col-lg-11 col-xl-6">
<p id="about_title">{{About}}</p> <p id="about_title">{{About}}</p>
<div class="row about_mini_block"> <div class="row about_mini_block">
<div style="margin: 0 auto; margin-bottom: 10px;" class="col-sm-9 col-md-12 col-lg-4"> <div style="margin: 0 auto; margin-bottom: 10px;" class="col-sm-9 col-md-12 col-lg-4">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
</div> </div>
<div id="info" class="item row"> <div id="info" class="item row">
<div id="info_block" class="col-sm-12 col-md-12 col-lg-6"> <div id="info_block" class="col-sm-12 col-md-12 col-lg-8 col-xl-6">
<div id="info_mini_block"> <div id="info_mini_block">
<div id="info_title"> <div id="info_title">
<p>{{info}}</p> <p>{{info}}</p>
...@@ -184,8 +184,8 @@ ...@@ -184,8 +184,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="strelka_four">
<div v-scroll-to="'#main'" class="strelka strelka_four"> <div v-scroll-to="'#main'" class="strelka strelka_four_rot">
<div id="arrow"> <div id="arrow">
<div id="arrowleft"></div> <div id="arrowleft"></div>
<div id="arrowright"></div> <div id="arrowright"></div>
...@@ -193,6 +193,7 @@ ...@@ -193,6 +193,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="footer"> <div id="footer">
<div id="footer_position"> <div id="footer_position">
<div class="footer"> <div class="footer">
...@@ -219,12 +220,12 @@ ...@@ -219,12 +220,12 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-align: center; text-align: center;
color: #2c3e50; color: #2c3e50;
/* height: 100vh; */ /* height: 100%; */
width: 100vw; width: 100%;
/* background-image: url('../source/Bacground.png') */ /* background-image: url('../source/Bacground.png') */
} }
#main .background_image{ #main .background_image{
padding-top: calc( 0.04 * 100vh + 100px ); padding-top: calc( 0.04 * 100% + 100px );
background-image: url('../source/Background.png') ; background-image: url('../source/Background.png') ;
background-size: cover; background-size: cover;
} }
...@@ -235,14 +236,16 @@ ...@@ -235,14 +236,16 @@
#main .item{ #main .item{
/* width: 85%; */ /* width: 85%; */
margin: 0 auto; margin: 0 auto;
/* height: 100vh; */ /* height: 100%; */
} }
/* TITLE */ /* TITLE */
#main #title{ #main #title{
height: calc( 0.9 * 100vh - 80px ); height: calc( 0.9 * 100% - 80px );
width: 95%;
margin: 0 auto;
} }
#main #block_title{ #main #block_title{
/* width: 43vw; */ /* width: 43%; */
margin: 0 auto; margin: 0 auto;
padding-top: 12%; padding-top: 12%;
/* margin-right: 13%; */ /* margin-right: 13%; */
...@@ -256,46 +259,43 @@ ...@@ -256,46 +259,43 @@
width: 32%; width: 32%;
} }
#main #block_title div.title_img img.img_on_main{ #main #block_title div.title_img img.img_on_main{
width: 72%; /* width: 72%; */
} }
#main #block_title div.title{ #main #block_title div.title{
color: white; color: white;
text-align: left; text-align: left;
white-space: normal; white-space: normal;
text-transform: uppercase; text-transform: uppercase;
width: 40%; width: 67%;
/* font-family: "Noah"; */ /* font-family: "Noah"; */
font-weight: bold; font-weight: bold;
} }
#main #title{ #main p#title_text {
width: 95%; width: 100%;
margin: 0 auto; font-size: calc( 4.4 * 100% + 19.2px )
}
#main #title {
font-size: calc( 0.04 * 100vw + 19.2px );
} }
/* ABOUT */ /* ABOUT */
#main #about{ #main #about{
/* margin-top: -1.9vh; */ /* margin-top: -1.9%; */
min-height: calc( 0.9 * 100vh); min-height: calc( 0.9 * 100%);
} }
#main .about_block{ #main .about_block{
margin: 0 auto; margin: 0 auto;
margin-top: 5vh; margin-top: 5%;
width: 60%; width: 60%;
} }
#main .about_block p#about_title{ #main .about_block p#about_title{
width: 90%; width: 90%;
text-transform: uppercase; text-transform: uppercase;
font-size: calc( 0.01 * 100vmin + 19.2px ); font-size: calc( 0.01 * 100% + 19.2px );
color: white; color: white;
font-weight: bold; font-weight: bold;
margin: 0 auto; margin: 0 auto;
} }
#main .about_block .about_mini_block{ #main .about_block .about_mini_block{
margin-top:6vh; margin-top:6%;
} }
#main .about_block .about_mini_block .about_fon_block{ #main .about_block .about_mini_block .about_fon_block{
...@@ -334,8 +334,9 @@ ...@@ -334,8 +334,9 @@
} }
/* INFO */ /* INFO */
#main #info{ #main #info{
height: 1000px; height: 100%;
margin: 0 auto; margin: 0 auto;
margin-top: 14%;
} }
#main #info_block{ #main #info_block{
margin: 0 auto; margin: 0 auto;
...@@ -345,14 +346,14 @@ ...@@ -345,14 +346,14 @@
#main #info #info_mini_block{ #main #info #info_mini_block{
/* width: 50%; */ /* width: 50%; */
margin-left: 33%; margin-left: 33%;
margin-left: calc( 0.07 * 100vmin + 19.2px ); margin-left: calc( 0.07 * 100% + 19.2px );
} }
#main #info #info_mini_block #info_title{ #main #info #info_mini_block #info_title{
width: 84%; width: 84%;
} }
#main #info #info_mini_block #info_title p{ #main #info #info_mini_block #info_title p{
color: white; color: white;
font-size: calc( 0.002 * 100vmin + 19.2px ); font-size: calc( 0.002 * 100% + 19.2px );
text-transform: uppercase; text-transform: uppercase;
text-align: left; text-align: left;
...@@ -382,11 +383,11 @@ ...@@ -382,11 +383,11 @@
} }
#main #info #info_mini_block #info_list ul#information .info_list_title{ #main #info #info_mini_block #info_list ul#information .info_list_title{
font-weight: bold; font-weight: bold;
font-size: calc( 0.002 * 100vmin + 19.2px ); font-size: calc( 0.002 * 100% + 19.2px );
} }
#main #info #info_mini_block #info_list ul#information .info_list_text{ #main #info #info_mini_block #info_list ul#information .info_list_text{
font-weight: bold; font-weight: bold;
font-size: calc( 0.002 * 100vmin + 17.2px ); font-size: calc( 0.002 * 100% + 17.2px );
} }
#main #info #telescope{ #main #info #telescope{
margin-top: 15%; margin-top: 15%;
...@@ -395,7 +396,7 @@ ...@@ -395,7 +396,7 @@
color: white; color: white;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
font-size: calc( 0.013 * 100vmin + 17.2px ); font-size: calc( 0.013 * 100% + 17.2px );
} }
#main #info #telescope .teleskopes_info{ #main #info #telescope .teleskopes_info{
margin: 0 auto; margin: 0 auto;
...@@ -405,7 +406,7 @@ ...@@ -405,7 +406,7 @@
#main #base{ #main #base{
margin: 0 auto; margin: 0 auto;
padding-top: 10%; padding-top: 10%;
min-height: 90vh; min-height: 90%;
} }
#main #base_block{ #main #base_block{
margin: 0 auto; margin: 0 auto;
...@@ -444,7 +445,7 @@ ...@@ -444,7 +445,7 @@
width: 67%; width: 67%;
} }
#main #base #earth .graf #planet div#img_planet{ #main #base #earth .graf #planet div#img_planet{
height: 100%; /* height: 100%; */
} }
#main #base #earth .graf #planet div#text_planet{ #main #base #earth .graf #planet div#text_planet{
height: 37%; height: 37%;
...@@ -456,7 +457,7 @@ ...@@ -456,7 +457,7 @@
color: white; color: white;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
font-size: calc( 0.013 * 100vmin + 7px ); font-size: calc( 0.8 * 100% + 7px )
} }
#main #base #earth .graf #left{ #main #base #earth .graf #left{
...@@ -577,9 +578,11 @@ ...@@ -577,9 +578,11 @@
margin-left: calc(50% - 25px); margin-left: calc(50% - 25px);
} }
.strelka_four{ .strelka_four{
margin-top: 60px; margin-top: 10%;
margin-bottom: 2%; margin-bottom: 2%;
margin-left: calc(50% - 25px); margin-left: calc(50% - 25px);
}
.strelka_four_rot{
transform: rotate(180deg); transform: rotate(180deg);
} }
...@@ -598,6 +601,12 @@ ...@@ -598,6 +601,12 @@
height: 70px; height: 70px;
padding: 15px; padding: 15px;
} }
#main #block_title{
padding-top: 10%;
}
#main #block_title div.title{
width: 47%;
}
} }
@media only screen and (max-width: 1399px) and (min-width: 1024px) { @media only screen and (max-width: 1399px) and (min-width: 1024px) {
.strelka{ .strelka{
...@@ -605,20 +614,29 @@ ...@@ -605,20 +614,29 @@
height: 50px; height: 50px;
padding: 15px; padding: 15px;
} }
#main #block_title{
padding-top: 2%;
}
#main p#title_text{
font-size: 5em;
width: 50%;
width: 91%;
margin-left: 19%;
}
} }
@media only screen and (max-width: 1023px) and (min-width: 380px) { @media only screen and (max-width: 1023px) and (min-width: 380px) {
.strelka{ .strelka{
width: 50px; width: 20px;
height: 50px; height: 20px;
padding: 15px; padding: 15px;
} }
} }
#main #footer{ #main #footer{
height: 7vh; /* height: 7%; */
width: 100vw; /* width: 100%; */
display: table-cell; /* display: table-cell; */
vertical-align: middle; /* vertical-align: middle; */
background: black; background: black;
position: relative; position: relative;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment