Revert "WIP"

This reverts commit 5d27aa4.
allegro · Apr 25, 2016 · cb2f64b · cb2f64b
1 parent 7c3cc81
commit cb2f64b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/src/ralph/admin/static/elements/auto-complete.html b/src/ralph/admin/static/elements/auto-complete.html
@@ -95,7 +95,7 @@
         <a hidden="{{!addRelatedUrl}}" on-tap='showAdminPopup' id="add_id_[[name]]" href="[[addRelatedUrl]]">
           <i class="fa fa-plus-circle"></i>
         </a>
-        <tool-tip title='[[searchTooltip]]'> </tool-tip>
+        <i data-tooltip class="has-tip fa fa-info-circle" title="[[searchTooltip]]"></i>
       </div>
     </div>
 

diff --git a/src/ralph/admin/static/elements/elements.html b/src/ralph/admin/static/elements/elements.html
@@ -1,10 +1,6 @@
 <script type="text/javascript" src="/static/vendor/js/modernizr.js" ></script>
 <script type="text/javascript" src="/static/vendor/js/jquery.js" ></script>
-<script type="text/javascript" src="/static/vendor/js/foundation.js" ></script>
-
-<script type="text/javascript">
-    Foundation.global.namespace = '';
-</script>
+<script type="text/javascript" src="/static/vendor/js/foundation.min.js" ></script>
 
 <link rel="import" href="../bower_components/iron-ajax/iron-ajax.html">
 <link rel="import" href="../bower_components/iron-input/iron-input.html">

diff --git a/src/ralph/admin/static/elements/tool-tip.html b/src/ralph/admin/static/elements/tool-tip.html
@@ -13,22 +13,16 @@
   <script>
     Polymer({
       is: "tool-tip",
-      created: function() {
-        Foundation.init($(this), 'tooltip');
-        // Foundation.libs.tooltip.events($(this));
-        // console.log(Foundation.libs.tooltip.getTip($(this)));
-        // $(this).foundation('tooltip');
-      },
       properties: {
         'title': {
           type: String,
-          // observer: '_reinitTooltip',
+          observer: '_reinitTooltip',
           value: ''
         }
       },
-      // _reinitTooltip: function(newValue, oldValue) {
-        // tip.html('dsfsdf');
-      // }
+      _reinitTooltip: function(newValue, oldValue) {
+        $(this).foundation("tooltip");
+      }
     });
   </script>
 <dom-module>
diff --git a/src/ralph/admin/templates/admin/includes/javascripts.html b/src/ralph/admin/templates/admin/includes/javascripts.html
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="{% static 'vendor/js/jquery.js' %}"></script>
 <script type="text/javascript" src="{% static 'src/js/ralph.init.js' %}"></script>
 <script type="text/javascript" src="{% static "auto-complete-helpers.js" %}"></script>
-<script type="text/javascript" src="{% static 'vendor/js/foundation.js' %}"></script>
+<script type="text/javascript" src="{% static 'vendor/js/foundation.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'vendor/js/modernizr.js' %}"></script>
 <script type="text/javascript" src="{% static 'src/js/fill-fields.js' %}"></script>
 

diff --git a/src/ralph/static/src/scss/_settings.scss b/src/ralph/static/src/scss/_settings.scss
@@ -2,8 +2,6 @@
 @import 'colors';
 @import 'foundation/settings';
 
-$namespace: false;
-
 $fa-font-path: '../vendor/fonts';
 
 $base-font-size: 12px;