Browse Source

tooltips and other tweaks

pull/1/head
Claudius Nicolae 12 years ago
parent
commit
9e4bf31ae9
  1. 9
      app/assets/javascripts/components/behaviors.js.coffee
  2. 24
      app/assets/stylesheets/bootstrap-custom.css.scss
  3. 5
      app/assets/stylesheets/theme/overrides.css.scss
  4. 1
      app/views/users/registrations/edit.html.erb

9
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)

24
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
@import "bootstrap/utilities"; // Has to be last to override when necessary

5
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;
}

1
app/views/users/registrations/edit.html.erb

@ -21,7 +21,6 @@
<div class="form-actions">
<%= f.submit "Update", class: 'btn btn-primary' %>
<%= link_to "Back", :back %>
</div>
<% end %>

Loading…
Cancel
Save