Merge pull request #17 from murych/develop

responsiveness fixes
murych · Dec 25, 2016 · 629ac22 · 629ac22
2 parents e144920 + 813cbc7
commit 629ac22
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 80 deletions.
diff --git a/lambdaweb/templates/base.html b/lambdaweb/templates/base.html
@@ -27,8 +27,8 @@
     </title>
 
     <!-- Custom styles for this template -->
-    <link href="{% static 'css/main.css' %}" rel="stylesheet">
     <link rel="shortcut icon" href="{% static 'img/favicon.ico' %}">
+    <link href="{% static 'css/main.css' %}" rel="stylesheet">
     {% block styles %}
     {% endblock styles %}
 

diff --git a/lambdaweb/templates/blocks/block_events.html b/lambdaweb/templates/blocks/block_events.html
@@ -10,7 +10,7 @@ <h1>Последние события</h1>
 				<p>Лекции, выступления спикеров, хакатоны...</p>
 			</div><!-- col-lg-8-->
 			<div class="col-lg-4 goright">
-				<p><a href="#"><i class="fa fa-angle-right"></i> Посмотреть
+				<p><a href="{% url 'events' %}"><i class="fa fa-angle-right"></i> Посмотреть
 					все записи</a></p>
 			</div>
 		</div><!-- row -->

diff --git a/lambdaweb/templates/blocks/block_footer.html b/lambdaweb/templates/blocks/block_footer.html
@@ -23,31 +23,30 @@ <h4 class="ml">SLACK</h4>
 </div>
 
 <!-- CONTACT FOOTER -->
-<div id="cf">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8">
-                <div id="mapwrap">
-                    <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2241.980588614794!2d37.49686361573025!3d55.81093738056895!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46b54837dc21e865%3A0x47049bf0a967fbda!2z0JTQmtC40KIg0JzQkNCY!5e0!3m2!1sen!2sru!4v1481646733124"
-                            width="100%" height="400" frameborder="0" style="border:0" allowfullscreen></iframe>
-                </div>
-            </div>
-            <div class="col-lg-4">
-                <h4>Как нас найти?</h4>
-                <br>
-                <p>
-                    Понедельник/среда<br/>
-                    17:00 - 20:00
-                </p>
-                <p>
-                    ДКиТ МАИ, 208<br/>
-                    Москва, Россия.
-                </p>
-                <p>
-                    {#						P: +55 4839-4390<br/>#}
-                    E: <a href="mailto:#">[email protected]</a>
-                </p>
-            </div>
-        </div>
-    </div>
-</div>
+	<div id="cf">
+		<div class="container">
+			<div class="row">
+				<div class="col-lg-8">
+		        	<div id="mapwrap">
+						<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2241.980588614794!2d37.49686361573025!3d55.81093738056895!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46b54837dc21e865%3A0x47049bf0a967fbda!2z0JTQmtC40KIg0JzQkNCY!5e0!3m2!1sen!2sru!4v1481646733124" width="100%" height="400" frameborder="0" style="border:0" allowfullscreen></iframe>
+					</div>	
+				</div>
+				<div class="col-lg-4">
+					<h4>Как нас найти?</h4>
+					<br>
+					<p>
+						Понедельник/среда<br/>
+						17:00 - 20:00
+					</p>
+					<p>
+						ДКиТ МАИ, 208<br/>
+						Москва, Россия.
+					</p>
+					<p>
+{#						P: +55 4839-4390<br/>#}
+						E: <a href="mailto:[email protected]">[email protected]</a>
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
diff --git a/lambdaweb/templates/blocks/block_navbar.html b/lambdaweb/templates/blocks/block_navbar.html
@@ -5,13 +5,13 @@
 <nav class="navbar navbar-default" role="navigation">
 	<div class="container-fluid">
 		<div class="navbar-header">
-			<button type="button" class="navbar-toggle" 
-				 data-toggle="collapse" data-target="#navbar-menu">
-				 <span class="sr-only">Toggle navigation</span>
-				 <span class="icon-bar"></span>
-				 <span class="icon-bar"></span>
-				 <span class="icon-bar"></span>
-			</button>
+{#			<button type="button" class="navbar-toggle" #}
+{#				 data-toggle="collapse" data-target="#navbar-menu">#}
+{#				 <span class="sr-only">Toggle navigation</span>#}
+{#				 <span class="icon-bar"></span>#}
+{#				 <span class="icon-bar"></span>#}
+{#				 <span class="icon-bar"></span>#}
+{#			</button>#}
 			{% include 'blocks/block_brand.html' %}
 		</div>
 

diff --git a/lambdaweb/templates/index.html b/lambdaweb/templates/index.html
@@ -6,7 +6,7 @@
 {% endblock title %}
 
 {% block styles %}
-    <link href="{% static 'css/indexwrap.css' %}" rel="stylesheet">
+{#    <link href="{% static 'css/indexwrap.css' %}" rel="stylesheet">#}
 {% endblock styles %}
 
 <!-- MAIN IMAGE SECTION -->

diff --git a/static/files/css/indexwrap.css b/static/files/css/indexwrap.css
diff --git a/static/files/css/main.css b/static/files/css/main.css