Startsida Utforska Hjälp
Logga in
medgis
/
ru-assets
4
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0
Bläddra i källkod

Merge branch 'work' of Adyn/medgis-ru-assets into master

Alexander Larkin 8 år sedan
förälder
244d81bab5 4f1f3fb06b
incheckning
42abb2db5f
8 ändrade filer med 36 tillägg och 132 borttagningar
Delad Vy Visa Diff Statistik
  1. 10 0
      app/assets/styles/_base.scss
  2. 6 0
      app/www/css/all.css
  3. 0 83
      app/www/css/all.css.map
  4. 0 0
      app/www/css/all.min.css
  5. 1 1
      app/www/smi_error.php
  6. 17 46
      app/www/smi_material.php
  7. 1 1
      app/www/smi_regions.php
  8. 1 1
      app/www/smi_regions_range.php

+ 10 - 0
app/assets/styles/_base.scss
Visa fil 

@@ -25,3 +25,13 @@ body {
 
     //     z-index: 100 !important;
 
     // }
 
 }
 
+
 
+@media screen and (max-width: 640px) {
 
+    .leftbar {
 
+        display: none;
 
+    }
 
+    .doctors__photo {
 
+        margin: 0 auto;
 
+    }
 
+}
 
+

+ 6 - 0
app/www/css/all.css
Visa fil 

@@ -233,6 +233,12 @@ body {
 
   height: 100%;
 
   font-family: "opensans", Arial, "Helvetica CY", "Nimbus Sans L", sans-serif; }
 
 
+@media screen and (max-width: 640px) {
 
+  .leftbar {
 
+    display: none; }
 
+  .doctors__photo {
 
+    margin: 0 auto; } }
 
+
 
 .wrapper {
 
   width: 100%;
 
   max-width: 1220px;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 83
app/www/css/all.css.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
app/www/css/all.min.css


+ 1 - 1
app/www/smi_error.php
Visa fil 

@@ -3,7 +3,7 @@
 
 	<head>
 
 		<title>СМИ - Ошибка</title>
 
 		<link href="css/all.css" rel="stylesheet">
 
-        <script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
+		<script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
 		<script src="js/all.min.js"></script>
 
 	</head>
 
 	<body>

+ 17 - 46
app/www/smi_material.php
Visa fil 

@@ -3,7 +3,7 @@
 
 	<head>
 
 		<title>Главная страница</title>
 
 		<link href="css/all.css" rel="stylesheet">
 
-        <script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
+		<script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
 		<script src="js/all.min.js"></script>
 
 	</head>
 
 	<body>
 
@@ -154,55 +154,26 @@
 
 							<div class="grid-dis-col-3">
 
 								<!--fullnews-->
 
 								<div class="fullnews">
 
-                                    <div class="full-news__details">
 
-                                        <div class="full-news__left">
 
-                                            <div class="full-news__date">06.02.2017</div>
 
-                                            <a href="#" class="full-news__category">Категория</a><a href="#"
 
-                                                                                                    class="full-news__region">Регион</a>
 
+									<div class="full-news__details">
 
+										<div class="full-news__left">
 
+											<div class="full-news__date">06.02.2017</div><a href="#" class="full-news__category">Категория</a><a href="#" class="full-news__region">Регион</a>
 
 										</div>
 
-                                        <div class="full-news__right">
 
-                                            <div class="full-news__views">2 346 789</div>
 
-                                            <div class="full-news__comments">786</div>
 
+										<div class="full-news__right">
 
+											<div class="full-news__views">2 346 789</div>
 
+											<div class="full-news__comments">786</div>
 
 										</div>
 
 									</div>
 
 									<!--slider-->
 
-                                    <ul id="full_news__sliderlist" class="full-news__sliderlist">
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/1"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/1"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/2"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/2"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/3"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/3"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/4"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/4"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/5"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/5"
 
-                                                    class="fullnews__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/6"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/6"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/7"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/7"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/8"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/8"
 
-                                                    class="full-news__sliderimg"></li>
 
-                                        <li data-thumb="http://lorempixel.com/150/130/cats/9"
 
-                                            class="full-news__slideritem"><img
 
-                                                    src="http://lorempixel.com/710/360/cats/9"
 
-                                                    class="full-news__sliderimg"></li>
 
+									<ul id="full_news__sliderlist" class="full-news__sliderlist">
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/1" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/1" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/2" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/2" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/3" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/3" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/4" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/4" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/5" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/5" class="fullnews__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/6" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/6" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/7" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/7" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/8" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/8" class="full-news__sliderimg"></li>
 
+										<li data-thumb="http://lorempixel.com/150/130/cats/9" class="full-news__slideritem"><img src="http://lorempixel.com/710/360/cats/9" class="full-news__sliderimg"></li>
 
 									</ul>
 
 									<!--image-->
 
 									<!--ul.fullnews__sliderlist

+ 1 - 1
app/www/smi_regions.php
Visa fil 

@@ -3,7 +3,7 @@
 
 	<head>
 
 		<title>СМИ - Районы</title>
 
 		<link href="css/all.css" rel="stylesheet">
 
-        <script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
+		<script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
 		<script src="js/all.min.js"></script>
 
 	</head>
 
 	<body>

+ 1 - 1
app/www/smi_regions_range.php
Visa fil 

@@ -3,7 +3,7 @@
 
 	<head>
 
 		<title>СМИ - Районы</title>
 
 		<link href="css/all.css" rel="stylesheet">
 
-        <script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
+		<script src="https://code.jquery.com/jquery-2.2.4.js"></script>
 
 		<script src="js/all.min.js"></script>
 
 	</head>
 
 	<body>

Vissa filer visades inte eftersom för många filer har ändrats