diff --git a/include/views/default/seven/frontend/restaurant.phtml b/include/views/default/seven/frontend/restaurant.phtml index 29c5881a3..0089fd16c 100644 --- a/include/views/default/seven/frontend/restaurant.phtml +++ b/include/views/default/seven/frontend/restaurant.phtml @@ -203,37 +203,47 @@ + + +
+ +
+
+ +
+ +
+ + Take out only! +
+
+ + -
-
-
- - Take out only! -
- - + +
- - + +
- -

Pickup from: {{restaurant.address | nl2br}}

- + +

Pickup from:

+
- - + +
@@ -289,20 +299,20 @@
- - + +
- - - + + +
- + - +
diff --git a/include/views/default/seven/frontend/support.phtml b/include/views/default/seven/frontend/support.phtml index 75793dec3..38fb19cd7 100644 --- a/include/views/default/seven/frontend/support.phtml +++ b/include/views/default/seven/frontend/support.phtml @@ -12,18 +12,18 @@
- - + +
- - + +
- - + +
diff --git a/www/assets/css/seven.css b/www/assets/css/seven.css index a7540cce0..3ca61e454 100644 --- a/www/assets/css/seven.css +++ b/www/assets/css/seven.css @@ -1678,7 +1678,7 @@ p { .form-icon { color: #00957f; font-size: 1.8em; - width: 1em; + width: 1.1em; text-align: center; padding-right: .5em; } @@ -1688,10 +1688,10 @@ p { box-sizing: border-box; white-space:nowrap; } -.form-icon, .form-input, .form-select { +.form-field, .form-field.fa { vertical-align: top; padding-top: .4em; - display: table-cell !important; + display: table-cell; } .form-select { background: #fff; @@ -1768,7 +1768,7 @@ p { /* appended by autosize directive */ .autosize { - margin: .1em 0 .2em 2px; + margin-bottom: .5em; -webkit-transition: height 0.2s; -moz-transition: height 0.2s; -ms-transition: height 0.2s; diff --git a/www/assets/js/directives.js b/www/assets/js/directives.js index e8c4ccde8..031c48ca0 100644 --- a/www/assets/js/directives.js +++ b/www/assets/js/directives.js @@ -272,7 +272,7 @@ NGApp.directive('ngAutosize', function () { link: function (scope, elem, attr) { setTimeout( function(){ elem.addClass('autosize'); - elem.data( 'autosize', elem.autosize({append: "\n"}) ); + elem.data( 'autosize', elem.autosize() ); }, 1 ); } }; diff --git a/www/assets/js/jquery.autosize-min.js b/www/assets/js/jquery.autosize-min.js index 41601a19e..ad19790af 100755 --- a/www/assets/js/jquery.autosize-min.js +++ b/www/assets/js/jquery.autosize-min.js @@ -1,7 +1,251 @@ /*! - Autosize v1.17.1 - 2013-06-23 + Autosize v1.18.1 - 2013-11-05 Automatically adjust textarea height based on user input. (c) 2013 Jack Moore - http://www.jacklmoore.com/autosize license: http://www.opensource.org/licenses/mit-license.php */ -(function(e){var t,o={className:"autosizejs",append:"",callback:!1,resizeDelay:10},i='