Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Mar 5, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8740ab9
popover works, styling is still not showing under elements but is und…
Chrisyee22 Mar 4, 2019
93aa084
copied yml file back in
Chrisyee22 Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -575,4 +572,4 @@ RUBY VERSION
ruby 2.4.4p296

BUNDLED WITH
1.17.1
1.17.3
8 changes: 4 additions & 4 deletions app/assets/stylesheets/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
margin-bottom: 0;
font-size: 14px;
color: #888;
}
}

.dashboard .stats h4 b {
font-weight: normal;
color: #333;
Expand All @@ -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;
}

Expand Down Expand Up @@ -254,7 +254,7 @@
color: #555;
}

.note-wiki .btn-default:hover,
.note-wiki .btn-default:hover,
.note-comment .btn-default:hover {
background: #eee;
}
Expand Down
4 changes: 2 additions & 2 deletions app/views/home/subscriptions.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checking here -- is the only change adding data-toggle="popover"? Thanks!

<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>
Expand Down