Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty

2017-06-08 17:57:43 +06:30
parent 74b0550c30 395250fd47
commit 0bcd612bc2
25 changed files with 857 additions and 126 deletions
--- a/app/assets/stylesheets/orgiami.scss
+++ b/app/assets/stylesheets/orgiami.scss
@@ -69,3 +69,10 @@
 .green{
 	background-color: #009900
 }
+
+
+/*----- Reset -----*/
+
+select.form-control {
+  height: inherit !important;
+}