publish: Merge pull request #24 from umpirsky/fix/popup-on-mobile

generated from commit 3d044ad
umpirsky · May 21, 2015 · 43d79bf · 43d79bf
1 parent 0c29e9d
commit 43d79bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!doctype html><!--[if lt IE 7]><html lang="sr" class="no-js ie6"><![endif]--><!--[if IE 7]><html lang="sr" class="no-js ie7"><![endif]--><!--[if IE 8]><html lang="sr" class="no-js ie8"><![endif]--><!--[if gt IE 8]><!--> <html lang="sr" class="no-js"> <!--<![endif]--> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta charset="utf-8"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <title>Šta jesti?</title> <link rel="shortcut icon" href="favicon.png"> <link rel="stylesheet" href="styles/vendor.9cff5df9.css"> <link rel="stylesheet" href="styles/main.7627935c.css"> <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script> <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-    <![endif]-->  <body ng-app="restaurantsApp"> <div class="wrapper"> <section id="main"> <div class="container"> <div ng-view=""></div> </div> </section> <footer> <div class="container"> <div class="social"> <a href="https://www.facebook.com/stajesti" target="_blank"><i class="fa fa-facebook fa-lg"></i></a> <a href="https://twitter.com/stajesti" target="_blank"><i class="fa fa-twitter fa-lg"></i></a> <a href="mailto:info@stajesti.rs"><i class="fa fa-envelope fa-lg"></i></a> </div> <div class="rights"> <p><a href="https://github.com/umpirsky/stajesti.rs/wiki/%C5%A0ta-jesti%3F" target="_blank">O projektu</a></p> <p>Dizajn baziran na <a href="http://www.scoopthemes.com" target="_blank">Scoop</a> temi</p> </div> </div> </footer> </div> <script src="scripts/vendor.6fa7b5e4.js"></script> <script src="scripts/scripts.74369142.js"></script> <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    <![endif]-->  <body ng-app="restaurantsApp"> <div class="wrapper"> <section id="main"> <div class="container"> <div ng-view=""></div> </div> </section> <footer> <div class="container"> <div class="social"> <a href="https://www.facebook.com/stajesti" target="_blank"><i class="fa fa-facebook fa-lg"></i></a> <a href="https://twitter.com/stajesti" target="_blank"><i class="fa fa-twitter fa-lg"></i></a> <a href="mailto:info@stajesti.rs"><i class="fa fa-envelope fa-lg"></i></a> </div> <div class="rights"> <p><a href="https://github.com/umpirsky/stajesti.rs/wiki/%C5%A0ta-jesti%3F" target="_blank">O projektu</a></p> <p>Dizajn baziran na <a href="http://www.scoopthemes.com" target="_blank">Scoop</a> temi</p> </div> </div> </footer> </div> <script src="scripts/vendor.6fa7b5e4.js"></script> <script src="scripts/scripts.76c1dd0a.js"></script> <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');

diff --git a/scripts/scripts.74369142.js → scripts/scripts.76c1dd0a.js b/scripts/scripts.74369142.js → scripts/scripts.76c1dd0a.js
diff --git a/views/restaurant.html b/views/restaurant.html
@@ -1,19 +1 @@
-<div class="section-heading"> <h1>{{ restaurant.name }}</h1> <div class="divider"></div> <img ng-src="{{ restaurant.logo }}" class="img-centered restaurant-logo" alt="{{ restaurant.name }}"> </div> <div class="row"> <div class="col-md-3 col-sm-3 col-xs-6"> <div class="media"> <a class="pull-left" href="tel:{{ restaurant.phone }}"> <i class="fa fa-phone fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">{{ restaurant.phone }}</h4> </div> </div> </div> <div class="col-md-3 col-sm-3 col-xs-6" ng-class="restaurant.delivery ? '' : 'opacity-75'"> <div class="media"> <a ng-if="restaurant.delivery !== undefined" class="pull-left"> <i ng-if="restaurant.delivery" class="fa fa-check fa-2x"></i> <i ng-if="!restaurant.delivery" class="fa fa-close fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">Dostava</h4> </div> </div> </div> <div class="col-md-3 col-sm-3 col-xs-6"> <div class="media"> <a class="pull-left" target="_blank" rel="external" href="http://maps.google.com/?q={{ restaurant.address }}, Srbija"> <i class="fa fa-map-marker fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">{{ restaurant.address }}</h4> </div> </div> </div> <div class="col-md-3 col-sm-3 col-xs-6"> <div class="media"> <a class="pull-left" target="_blank" rel="external" href="{{ restaurant.url}}"> <i class="fa fa-{{ restaurant.url | urlIcon }} fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">{{ restaurant.url | urlText }}</h4> </div> </div> </div> </div> <slick init-onload="true" data="restaurant.images" slides-to-show="4" slides-to-scroll="1" class="slider filtering" responsive="[{
-        breakpoint: 1024,
-        settings: {
-            slidesToShow: 3,
-            slidesToScroll: 1
-        }
-    }, {
-        breakpoint: 600,
-        settings: {
-            slidesToShow: 2,
-            slidesToScroll: 1
-        }
-    }, {
-        breakpoint: 480,
-        settings: {
-            slidesToShow: 1,
-            slidesToScroll: 1
-        }
-    }]"> <div ng-repeat="image in restaurant.images"> <a href="javascript:;" ng-click="zoom($index)"> <img ng-src="{{ image | thumbnail:200 }}" class="img-responsive" alt="{{ restaurant.name }}"> </a> </div> </slick>
+<div class="section-heading"> <h1>{{ restaurant.name }}</h1> <div class="divider"></div> <img ng-src="{{ restaurant.logo }}" class="img-centered restaurant-logo" alt="{{ restaurant.name }}"> </div> <div class="row"> <div class="col-md-3 col-sm-3 col-xs-6"> <div class="media"> <a class="pull-left" href="tel:{{ restaurant.phone }}"> <i class="fa fa-phone fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">{{ restaurant.phone }}</h4> </div> </div> </div> <div class="col-md-3 col-sm-3 col-xs-6" ng-class="restaurant.delivery ? '' : 'opacity-75'"> <div class="media"> <a ng-if="restaurant.delivery !== undefined" class="pull-left"> <i ng-if="restaurant.delivery" class="fa fa-check fa-2x"></i> <i ng-if="!restaurant.delivery" class="fa fa-close fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">Dostava</h4> </div> </div> </div> <div class="col-md-3 col-sm-3 col-xs-6"> <div class="media"> <a class="pull-left" target="_blank" rel="external" href="http://maps.google.com/?q={{ restaurant.address }}, Srbija"> <i class="fa fa-map-marker fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">{{ restaurant.address }}</h4> </div> </div> </div> <div class="col-md-3 col-sm-3 col-xs-6"> <div class="media"> <a class="pull-left" target="_blank" rel="external" href="{{ restaurant.url}}"> <i class="fa fa-{{ restaurant.url | urlIcon }} fa-2x"></i> </a> <div class="media-body"> <h4 class="media-heading">{{ restaurant.url | urlText }}</h4> </div> </div> </div> </div> <slick init-onload="true" data="restaurant.images" slides-to-show="4" slides-to-scroll="1" class="slider filtering" responsive="breakpoints"> <div ng-repeat="image in restaurant.images"> <a data-index="{{ $index }}" href="javascript:;"> <img ng-src="{{ image | thumbnail:200 }}" class="img-responsive" alt="{{ restaurant.name }}"> </a> </div> </slick>