popover works, styling is still not showing under elements but is und… (

publiclab#4906) * popover works, styling is still not showing under elements but is under.btn-default * copied yml file back in
icarito · Apr 9, 2019 · bb5feab · bb5feab
1 parent 311f722
commit bb5feab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -48,7 +48,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ansi (1.5.0)
     arel (9.0.0)
@@ -60,7 +60,6 @@ GEM
       scrypt (>= 1.2, < 4.0)
     authlogic-oid (1.0.4)
       authlogic
-      hoe (>= 1.12.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -108,7 +107,7 @@ GEM
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
+    ffi (1.10.0)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -123,7 +122,7 @@ GEM
       geokit (~> 1.5)
       rails (>= 3.0)
     georuby (2.0.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     grape (1.2.3)
       activesupport
@@ -148,9 +147,7 @@ GEM
     grape-swagger-ui (2.2.8)
       railties (>= 3.1)
     hashie (3.6.0)
-    highline (2.0.0)
-    hoe (3.17.0)
-      rake (>= 0.8, < 13.0)
+    highline (2.0.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http_accept_language (2.1.1)
@@ -177,7 +174,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.1.0)
+    json (2.2.0)
     json_expressions (0.9.0)
     jwt (2.1.0)
     launchy (2.4.3)
@@ -215,7 +212,7 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
@@ -238,7 +235,7 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.0)
+    nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.5.4)
     oauth2 (1.4.1)
@@ -276,7 +273,7 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    parallel (1.13.0)
+    parallel (1.14.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     passenger (6.0.2)
@@ -344,8 +341,8 @@ GEM
     rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rb-readline (0.5.5)
     rdiscount (2.2.0.1)
     recaptcha (4.13.1)
@@ -369,7 +366,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -392,7 +389,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sass (3.5.7)
+    sass (3.7.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -431,7 +428,7 @@ GEM
       railties (>= 3.2.5, < 6)
     teaspoon-mocha (2.3.3)
       teaspoon (>= 1.0.0)
-    term-ansicolor (1.6.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
@@ -442,9 +439,9 @@ GEM
       ref
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.9.1)
-    tins (1.16.3)
+    tins (1.20.2)
     turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -575,4 +572,4 @@ RUBY VERSION
    ruby 2.4.4p296
 
 BUNDLED WITH
-   1.17.1
+   1.17.3
diff --git a/app/assets/stylesheets/dashboard.css b/app/assets/stylesheets/dashboard.css
@@ -41,8 +41,8 @@
   margin-bottom: 0;
   font-size: 14px;
   color: #888;
-}                          
-                           
+}
+
 .dashboard .stats h4 b {
   font-weight: normal;
   color: #333;
@@ -65,7 +65,7 @@
 /* line-on-sides-header example based on https://css-tricks.com/line-on-sides-headers/ */
 .dashboard h3 i {
   display: inline-block;
-  position: relative;  
+  position: relative;
   font-style: normal;
 }
 
@@ -254,7 +254,7 @@
   color: #555;
 }
 
-.note-wiki    .btn-default:hover, 
+.note-wiki    .btn-default:hover,
 .note-comment .btn-default:hover {
   background: #eee;
 }

diff --git a/app/views/home/subscriptions.html.erb b/app/views/home/subscriptions.html.erb
@@ -18,7 +18,7 @@
   <hr />
 
   <a href="/settings" class="btn btn-default" style="margin-bottom: 10px;"><i class="fa fa-envelope"></i> Email Settings </a>
-  
+
   <p style="font-style: italic;"> Control which emails you want to receive. </p>
 
 </div>
@@ -46,7 +46,7 @@
         <a rel="tooltip" title="Once per day" class="btn btn-default btn-xs" href="javascript:void(0)"><i class="fa fa-list"></i> Digest</a>
         -->
         <script> input_<%= subscription.tid %> = '#share-<%= subscription.tid %>'</script>
-        <a class="btn btn-default btn-xs" rel="popover" data-placement="left" title="<%= t('home.subscriptions.share_subscription_link') %>" data-html="true" data-content="<input id='share-<%= subscription.tid %>' onClick='$(input_<%= subscription.tid %>).select()' type='text' value='https://<%= ActionController::Base.default_url_options[:host] %>/subscribe/tag/<%= subscription.tagname %>'/><div style='margin-top:10px;'><a style='padding-left:3px;' href='https://twitter.com/share' class='twitter-share-button'>Tweet</a></div> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src='//platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document,'script','twitter-wjs');</script>
+        <a class="btn btn-default btn-xs" rel="popover"  data-toggle="popover" data-placement="left" title="<%= t('home.subscriptions.share_subscription_link') %>" data-html="true" data-content="<input id='share-<%= subscription.tid %>' onClick='$(input_<%= subscription.tid %>).select()' type='text' value='https://<%= ActionController::Base.default_url_options[:host] %>/subscribe/tag/<%= subscription.tagname %>'/><div style='margin-top:10px;'><a style='padding-left:3px;' href='https://twitter.com/share' class='twitter-share-button'>Tweet</a></div> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src='//platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document,'script','twitter-wjs');</script>
         <i class="fa fa-share"></i> <%= t('home.subscriptions.share') %></a>
         <a class="btn btn-default btn-xs" href="/unsubscribe/tag/<%= subscription.tagname %>" data-method="delete"><i class="fa fa-remove"></i> <%= t('home.subscriptions.unsubscribe') %></a>
       </div>