From 9e4bf31ae9a1ad0955e64382c3ac87dd60fc2a20 Mon Sep 17 00:00:00 2001 From: Claudius Nicolae Date: Mon, 18 Mar 2013 00:40:58 +0200 Subject: [PATCH] tooltips and other tweaks --- .../components/behaviors.js.coffee | 9 ++++--- .../stylesheets/bootstrap-custom.css.scss | 24 ++++++++++--------- .../stylesheets/theme/overrides.css.scss | 5 ++++ app/views/users/registrations/edit.html.erb | 1 - 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/components/behaviors.js.coffee b/app/assets/javascripts/components/behaviors.js.coffee index 56a1b18..4ac686e 100644 --- a/app/assets/javascripts/components/behaviors.js.coffee +++ b/app/assets/javascripts/components/behaviors.js.coffee @@ -1,3 +1,6 @@ -$ -> - $(document).tooltip(selector: '[rel=tooltip]') - $(document).popover(selector: '[rel=popover]', trigger: 'hover') +$document = $(document) + +$document.on 'mouseenter', '[rel=tooltip]', -> $(@).tooltip('show') +$document.on 'mouseleave', '[rel=tooltip]', -> $(@).tooltip('hide') + +$document.popover(selector: '[rel=popover]', trigger: 'hover', html: true) diff --git a/app/assets/stylesheets/bootstrap-custom.css.scss b/app/assets/stylesheets/bootstrap-custom.css.scss index 424f9db..e94987a 100644 --- a/app/assets/stylesheets/bootstrap-custom.css.scss +++ b/app/assets/stylesheets/bootstrap-custom.css.scss @@ -1,15 +1,15 @@ // // Remove icons since we use font-awesome // -// -// Bootstrap v2.3.0 -// -// Copyright 2012 Twitter, Inc -// Licensed under the Apache License v2.0 -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Designed and built with all the love in the world @twitter by @mdo and @fat. -// Converted to Sass by @thomasmcdonald_, and distributed as bootstrap-sass +/*! + * Bootstrap v2.3.0 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ // Core variables and mixins @import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc @@ -30,6 +30,7 @@ @import "bootstrap/tables"; // Components: common +//@import "bootstrap/sprites"; @import "bootstrap/dropdowns"; @import "bootstrap/wells"; @import "bootstrap/component-animations"; @@ -38,7 +39,7 @@ // Components: Buttons & Alerts @import "bootstrap/buttons"; @import "bootstrap/button-groups"; -@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in _buttons.scss +@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons // Components: Nav @import "bootstrap/navs"; @@ -54,6 +55,7 @@ // Components: Misc @import "bootstrap/thumbnails"; +@import "bootstrap/media"; @import "bootstrap/labels-badges"; @import "bootstrap/progress-bars"; @import "bootstrap/accordion"; @@ -61,4 +63,4 @@ @import "bootstrap/hero-unit"; // Utility classes -@import "bootstrap/utilities"; // Has to be last to override when necessary \ No newline at end of file +@import "bootstrap/utilities"; // Has to be last to override when necessary diff --git a/app/assets/stylesheets/theme/overrides.css.scss b/app/assets/stylesheets/theme/overrides.css.scss index 0efef29..130d82c 100644 --- a/app/assets/stylesheets/theme/overrides.css.scss +++ b/app/assets/stylesheets/theme/overrides.css.scss @@ -23,3 +23,8 @@ margin-left: 0; } } + +.active-scaffold div.popover-content { + padding: 9px 14px; + font-weight: normal; +} \ No newline at end of file diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index cfd9fa4..41d55ac 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -21,7 +21,6 @@
<%= f.submit "Update", class: 'btn btn-primary' %> - <%= link_to "Back", :back %>
<% end %>