Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: seyhunak/twitter-bootstrap-rails
base: abbb56ddcc80a0eff652fdd2061dbf8382dccbae
...
head fork: seyhunak/twitter-bootstrap-rails
compare: v2.0.9
Checking mergeability… Don't worry, you can still create the pull request.
  • 20 commits
  • 40 files changed
  • 2 commit comments
  • 9 contributors
Commits on May 23, 2012
@aL3xa aL3xa Added options to breadcrumb links, blacklisted backup files in .gitig…
…nore
f590483
@aL3xa aL3xa Fixed a typo 1a9d843
Commits on May 24, 2012
@seyhunak Merge pull request #249 from aL3xa/master
Add options to breadcrumb links
eb7c1aa
@westonplatter westonplatter add left side margin space. 8d64241
@seyhunak Merge pull request #250 from westonplatter/master
Add CSS 20px of space on the left side of pages.
9d3323b
@erbmicha erbmicha fixed string interpolation problem for fontawesome.less 61baa89
Commits on May 25, 2012
@seyhunak Merge pull request #251 from erbmicha/master
String interpolation problem with fontawesome.less yielding 404 errors from rails - fixed
6c97494
@erbmicha erbmicha Updated template for bootstrap_and_overrides.less for absolute paths …
…for Font Awesome to work seamlessly with fix from pull request #251
15c212a
@erbmicha erbmicha added .rvmrc to gitignore d1b20ae
@erbmicha erbmicha updated version to 2.0.8.1 for local gemserver to have fixes for font…
… awesome path issues
77c2484
Commits on May 26, 2012
@seyhunak Merge pull request #252 from erbmicha/master
Updated template for bootstrap_and_overrides.less for absolute paths...
fb21308
Commits on May 31, 2012
@formigarafa formigarafa fixed regex matching "require_tree ."
it was matching "require_tree ./something_else" as "require_tree ." and skipping bootstrap insertion on css.
35126e5
@seyhunak Merge pull request #254 from formigarafa/master
fixing a mismatch of "require_tree ." when there is something more after.
0815234
Commits on Jun 06, 2012
@mikegee mikegee remove "Bell Character" (octal 007) from end of haml layout template 5298b8a
@tfentonz tfentonz Updated bootstrap to 2.0.4 8df7689
@seyhunak Merge pull request #258 from mikegee/patch-1
remove "Bell Character" (octal 007) from end of haml layout template
64966a4
@seyhunak Merge pull request #259 from tfentonz/master
Updated bootstrap to 2.0.4
c646c2d
@MaThGo MaThGo updated FontAwesome to 2.0 fc40fde
@seyhunak Merge pull request #261 from starflow/master
Update to latest FontAwesome
d470915
@seyhunak Updated to v.2.0.9
Bootstrap 2.0.4 and FontAwesome 2.0 support
650b160
Showing with 702 additions and 598 deletions.
  1. +3 −0  .gitignore
  2. +1 −0  README.md
  3. +10 −10 app/views/twitter-bootstrap/_breadcrumbs.html.erb
  4. +1 −1  lib/generators/bootstrap/install/install_generator.rb
  5. +10 −6 lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
  6. +0 −1  lib/generators/bootstrap/layout/templates/layout.html.haml
  7. +2 −2 lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb
  8. +7 −7 lib/twitter/bootstrap/rails/version.rb
  9. BIN  vendor/assets/fonts/fontawesome-webfont.eot
  10. +247 −167 vendor/assets/fonts/fontawesome-webfont.svg
  11. BIN  vendor/assets/fonts/fontawesome-webfont.svgz
  12. BIN  vendor/assets/fonts/fontawesome-webfont.ttf
  13. BIN  vendor/assets/fonts/fontawesome-webfont.woff
  14. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
  15. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
  16. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js
  17. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js
  18. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js
  19. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
  20. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js
  21. +2 −2 vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
  22. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js
  23. +3 −3 vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
  24. +1 −1  vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js
  25. +2 −2 vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js
  26. +265 −188 vendor/toolkit/fontawesome.less
  27. +0 −40 vendor/toolkit/twitter/bootstrap/badges.less
  28. +1 −1  vendor/toolkit/twitter/bootstrap/bootstrap.less
  29. +3 −3 vendor/toolkit/twitter/bootstrap/component-animations.less
  30. +3 −3 vendor/toolkit/twitter/bootstrap/dropdowns.less
  31. +91 −92 vendor/toolkit/twitter/bootstrap/forms.less
  32. +0 −38 vendor/toolkit/twitter/bootstrap/labels.less
  33. +20 −5 vendor/toolkit/twitter/bootstrap/mixins.less
  34. +2 −8 vendor/toolkit/twitter/bootstrap/navbar.less
  35. +5 −0 vendor/toolkit/twitter/bootstrap/reset.less
  36. +9 −2 vendor/toolkit/twitter/bootstrap/responsive-navbar.less
  37. +1 −1  vendor/toolkit/twitter/bootstrap/responsive.less
  38. +2 −2 vendor/toolkit/twitter/bootstrap/sprites.less
  39. +1 −4 vendor/toolkit/twitter/bootstrap/type.less
  40. +2 −1  vendor/toolkit/twitter/bootstrap/variables.less
View
3  .gitignore
@@ -3,3 +3,6 @@
Gemfile.lock
pkg/*
.DS_Store
+*.swp
+*~
+.rvmrc
View
1  README.md
@@ -178,6 +178,7 @@ gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootst
<li>Released gem v.2.0.6</li>
<li>Released gem v.2.0.7</li>
<li>Released gem v.2.0.8</li>
+ <li>Released gem v.2.0.9 (Bootstrap 2.0.4 and FontAwesome 2.0 support)</li>
</ul>
View
20 app/views/twitter-bootstrap/_breadcrumbs.html.erb
@@ -1,14 +1,14 @@
-<% if @breadcrumbs %>
<ul class="breadcrumb">
<% separator = divider %>
- <% @breadcrumbs[0..-2].each do |crumb| %>
- <li>
- <%= link_to crumb[:name], crumb[:url] %>
- <span class="divider"><%= separator %></span>
- </li>
+ <% if @breadcrumbs %>
+ <% @breadcrumbs[0..-2].each do |crumb| %>
+ <li>
+ <%= link_to crumb[:name], crumb[:url], crumb[:options] %>
+ <span class="divider"><%= separator %></span>
+ </li>
+ <% end %>
+ <li class="active">
+ <%= link_to @breadcrumbs.last[:name], @breadcrumbs.last[:url], @breadcrumbs.last[:options] %>
+ </li>
<% end %>
- <li class="active">
- <%= link_to @breadcrumbs.last[:name], @breadcrumbs.last[:url] %>
- </li>
</ul>
-<% end %>
View
2  lib/generators/bootstrap/install/install_generator.rb
@@ -18,7 +18,7 @@ def add_assets
if File.exist?('app/assets/stylesheets/application.css')
# Add our own require:
content = File.read("app/assets/stylesheets/application.css")
- if content.match(/require_tree\s+\./)
+ if content.match(/require_tree\s+\.\s*$/)
# Good enough - that'll include our bootstrap_and_overrides.css.less
else
style_require_block = " *= require bootstrap_and_overrides\n"
View
16 lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
@@ -1,5 +1,8 @@
@import "twitter/bootstrap/bootstrap";
-body { padding-top: 60px; }
+body {
+ padding-top: 60px;
+ padding-left: 20px;
+}
@import "twitter/bootstrap/responsive";
@@ -8,11 +11,12 @@ body { padding-top: 60px; }
@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png');
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-@fontAwesomeEotPath: asset-path('fontawesome-webfont.eot');
-@fontAwesomeWoffPath: asset-path('fontawesome-webfont.woff');
-@fontAwesomeTtfPath: asset-path('fontawesome-webfont.ttf');
-@fontAwesomeSvgzPath: asset-path('fontawesome-webfont.svgz');
-@fontAwesomeSvgPath: asset-path('fontawesome-webfont.svg');
+// Note: If you use asset_path() here, your compiled boostrap_and_overrides.css will not
+// have the proper paths. So for now we use the absolute path.
+@fontAwesomeEotPath: '/assets/fontawesome-webfont.eot';
+@fontAwesomeWoffPath: '/assets/fontawesome-webfont.woff';
+@fontAwesomeTtfPath: '/assets/fontawesome-webfont.ttf';
+@fontAwesomeSvgPath: '/assets/fontawesome-webfont.svg';
// Font Awesome
@import "fontawesome";
View
1  lib/generators/bootstrap/layout/templates/layout.html.haml
@@ -63,4 +63,3 @@
\==================================================
/ Placed at the end of the document so the pages load faster
= javascript_include_tag "application"
-
View
4 lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb
@@ -15,10 +15,10 @@ def add_breadcrumb name, url, options={}
protected
- def add_breadcrumb name, url = ''
+ def add_breadcrumb name, url = '', options = {}
@breadcrumbs ||= []
url = eval(url) if url =~ /_path|_url|@/
- @breadcrumbs << {:name => name, :url => url}
+ @breadcrumbs << {:name => name, :url => url, :options => options}
end
def render_breadcrumbs(divider = '/')
View
14 lib/twitter/bootstrap/rails/version.rb
@@ -1,7 +1,7 @@
-module Twitter
- module Bootstrap
- module Rails
- VERSION = "2.0.8"
- end
- end
-end
+module Twitter
+ module Bootstrap
+ module Rails
+ VERSION = "2.0.9"
+ end
+ end
+end
View
BIN  vendor/assets/fonts/fontawesome-webfont.eot
Binary file not shown
View
414 vendor/assets/fonts/fontawesome-webfont.svg
247 additions, 167 deletions not shown
View
BIN  vendor/assets/fonts/fontawesome-webfont.svgz
Binary file not shown
View
BIN  vendor/assets/fonts/fontawesome-webfont.ttf
Binary file not shown
View
BIN  vendor/assets/fonts/fontawesome-webfont.woff
Binary file not shown
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-alert.js v2.0.3
+ * bootstrap-alert.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-button.js v2.0.3
+ * bootstrap-button.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-carousel.js v2.0.3
+ * bootstrap-carousel.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-collapse.js v2.0.3
+ * bootstrap-collapse.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-dropdown.js v2.0.3
+ * bootstrap-dropdown.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
@@ -1,5 +1,5 @@
/* =========================================================
- * bootstrap-modal.js v2.0.3
+ * bootstrap-modal.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-popover.js v2.0.3
+ * bootstrap-popover.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
View
4 vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-scrollspy.js v2.0.3
+ * bootstrap-scrollspy.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -35,7 +35,7 @@
this.selector = (this.options.target
|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|| '') + ' .nav li > a'
- this.$body = $('body').on('click.scroll.data-api', this.selector, process)
+ this.$body = $('body')
this.refresh()
this.process()
}
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js
@@ -1,5 +1,5 @@
/* ========================================================
- * bootstrap-tab.js v2.0.3
+ * bootstrap-tab.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
View
6 vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-tooltip.js v2.0.3
+ * bootstrap-tooltip.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -84,9 +84,9 @@
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+ if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
- clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
@@ -272,4 +272,4 @@
, delay: 0
}
-}(window.jQuery);
+}(window.jQuery);
View
2  vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.0.3
+ * bootstrap-transition.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
View
4 vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-typeahead.js v2.0.3
+ * bootstrap-typeahead.js v2.0.4
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -56,7 +56,7 @@
}
, show: function () {
- var pos = $.extend({}, this.$element.position(), {
+ var pos = $.extend({}, this.$element.offset(), {
height: this.$element[0].offsetHeight
})
View
453 vendor/toolkit/fontawesome.less
@@ -18,23 +18,19 @@
-------------------------------------------------------
Email: dave@davegandy.com
Twitter: http://twitter.com/fortaweso_me
- Work: http://lemonwi.se co-founder
+ Work: Lead Product Designer @ http://kyruus.com
- Email: matwb@ug.edu.pl
-
- TODO: use font-url helper from the less-rails gem
*/
@font-face {
- font-family: 'FontAwesome';
- src: url(@fontAwesomeEotPath);
- src: url('@{@fontAwesomeEotPath}?#iefix') format('embedded-opentype'),
- url(@fontAwesomeWoffPath) format('woff'),
- url(@fontAwesomeTtfPath) format('truetype'),
- url('@{@fontAwesomeSvgzPath}#FontAwesomeRegular') format('svg'),
- url('@{@fontAwesomeSvgPath}#FontAwesomeRegular') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-family: 'FontAwesome';
+ src: url(@fontAwesomeEotPath);
+ src: url('@{@fontAwesomeEotPath}?#iefix') format('embedded-opentype'),
+ url(@fontAwesomeWoffPath) format('woff'),
+ url(@fontAwesomeTtfPath) format('truetype'),
+ url('@{@fontAwesomeSvgPath}#FontAwesome') format('svg');
+ font-weight: normal;
+ font-style: normal;
}
/* sprites.less reset */
@@ -58,210 +54,291 @@ li[class*=" icon-"] {
------------------------------------------------------- */
[class^="icon-"]:before,
[class*=" icon-"]:before {
- font-family: FontAwesome;
- font-weight: normal;
- font-style: normal;
- display: inline-block;
- text-decoration: inherit;
+ font-family: FontAwesome;
+ font-weight: normal;
+ font-style: normal;
+ display: inline-block;
+ text-decoration: inherit;
}
a [class^="icon-"],
a [class*=" icon-"] {
- display: inline-block;
- text-decoration: inherit;
+ display: inline-block;
+ text-decoration: inherit;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
- vertical-align: top;
- font-size: 4/3em;
+ vertical-align: middle;
+ font-size: 4/3em;
}
-.btn {
- [class^="icon-"],
- [class*=" icon-"] {
- /* keeps button heights with and without icons the same */
- line-height: .9em;
- }
+.btn, .nav-tabs {
+ [class^="icon-"],
+ [class*=" icon-"] {
+ /* keeps button heights with and without icons the same */
+ line-height: .9em;
+ }
}
li {
- [class^="icon-"],
- [class*=" icon-"] {
- display: inline-block;
- width: 1.25em;
- text-align: center;
- }
- .icon-large[class^="icon-"],
- .icon-large[class*=" icon-"] {
- /* 1.5 increased font size for icon-large * 1.25 width */
- width: 1.5*1.25em;
- }
+ [class^="icon-"],
+ [class*=" icon-"] {
+ display: inline-block;
+ width: 1.25em;
+ text-align: center;
+ }
+ .icon-large:before,
+ .icon-large:before {
+ /* 1.5 increased font size for icon-large * 1.25 width */
+ width: 1.5*1.25em;
+ }
}
-li[class^="icon-"],
-li[class*=" icon-"] {
- margin-left: 0;
- list-style-type: none;
+ul.icons {
+ list-style-type: none;
+ margin-left: 2em;
+ text-indent: -.8em;
- &:before {
- text-indent: -2em;
- text-align: center;
+ li {
+ [class^="icon-"],
+ [class*=" icon-"] {
+ width: .8em;
}
- &.icon-large:before {
- text-indent: -4/3em;
+ .icon-large:before,
+ .icon-large:before {
+ /* 1.5 increased font size for icon-large * 1.25 width */
+ vertical-align: initial;
+// width: 1.5*1.25em;
}
+ }
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
-.icon-glass:before { content: "\f000"; }
-.icon-music:before { content: "\f001"; }
-.icon-search:before { content: "\f002"; }
-.icon-envelope:before { content: "\f003"; }
-.icon-heart:before { content: "\f004"; }
-.icon-star:before { content: "\f005"; }
-.icon-star-empty:before { content: "\f006"; }
-.icon-user:before { content: "\f007"; }
-.icon-film:before { content: "\f008"; }
-.icon-th-large:before { content: "\f009"; }
-.icon-th:before { content: "\f00a"; }
-.icon-th-list:before { content: "\f00b"; }
-.icon-ok:before { content: "\f00c"; }
-.icon-remove:before { content: "\f00d"; }
-.icon-zoom-in:before { content: "\f00e"; }
+.icon-glass:before { content: "\f000"; }
+.icon-music:before { content: "\f001"; }
+.icon-search:before { content: "\f002"; }
+.icon-envelope:before { content: "\f003"; }
+.icon-heart:before { content: "\f004"; }
+.icon-star:before { content: "\f005"; }
+.icon-star-empty:before { content: "\f006"; }
+.icon-user:before { content: "\f007"; }
+.icon-film:before { content: "\f008"; }
+.icon-th-large:before { content: "\f009"; }
+.icon-th:before { content: "\f00a"; }
+.icon-th-list:before { content: "\f00b"; }
+.icon-ok:before { content: "\f00c"; }
+.icon-remove:before { content: "\f00d"; }
+.icon-zoom-in:before { content: "\f00e"; }
-.icon-zoom-out:before { content: "\f010"; }
-.icon-off:before { content: "\f011"; }
-.icon-signal:before { content: "\f012"; }
-.icon-cog:before { content: "\f013"; }
-.icon-trash:before { content: "\f014"; }
-.icon-home:before { content: "\f015"; }
-.icon-file:before { content: "\f016"; }
-.icon-time:before { content: "\f017"; }
-.icon-road:before { content: "\f018"; }
-.icon-download-alt:before { content: "\f019"; }
-.icon-download:before { content: "\f01a"; }
-.icon-upload:before { content: "\f01b"; }
-.icon-inbox:before { content: "\f01c"; }
-.icon-play-circle:before { content: "\f01d"; }
-.icon-repeat:before { content: "\f01e"; }
+.icon-zoom-out:before { content: "\f010"; }
+.icon-off:before { content: "\f011"; }
+.icon-signal:before { content: "\f012"; }
+.icon-cog:before { content: "\f013"; }
+.icon-trash:before { content: "\f014"; }
+.icon-home:before { content: "\f015"; }
+.icon-file:before { content: "\f016"; }
+.icon-time:before { content: "\f017"; }
+.icon-road:before { content: "\f018"; }
+.icon-download-alt:before { content: "\f019"; }
+.icon-download:before { content: "\f01a"; }
+.icon-upload:before { content: "\f01b"; }
+.icon-inbox:before { content: "\f01c"; }
+.icon-play-circle:before { content: "\f01d"; }
+.icon-repeat:before { content: "\f01e"; }
/* \f020 is not a valid unicode character. all shifted one down */
-.icon-refresh:before { content: "\f021"; }
-.icon-list-alt:before { content: "\f022"; }
-.icon-lock:before { content: "\f023"; }
-.icon-flag:before { content: "\f024"; }
-.icon-headphones:before { content: "\f025"; }
-.icon-volume-off:before { content: "\f026"; }
-.icon-volume-down:before { content: "\f027"; }
-.icon-volume-up:before { content: "\f028"; }
-.icon-qrcode:before { content: "\f029"; }
-.icon-barcode:before { content: "\f02a"; }
-.icon-tag:before { content: "\f02b"; }
-.icon-tags:before { content: "\f02c"; }
-.icon-book:before { content: "\f02d"; }
-.icon-bookmark:before { content: "\f02e"; }
-.icon-print:before { content: "\f02f"; }
+.icon-refresh:before { content: "\f021"; }
+.icon-list-alt:before { content: "\f022"; }
+.icon-lock:before { content: "\f023"; }
+.icon-flag:before { content: "\f024"; }
+.icon-headphones:before { content: "\f025"; }
+.icon-volume-off:before { content: "\f026"; }
+.icon-volume-down:before { content: "\f027"; }
+.icon-volume-up:before { content: "\f028"; }
+.icon-qrcode:before { content: "\f029"; }
+.icon-barcode:before { content: "\f02a"; }
+.icon-tag:before { content: "\f02b"; }
+.icon-tags:before { content: "\f02c"; }
+.icon-book:before { content: "\f02d"; }
+.icon-bookmark:before { content: "\f02e"; }
+.icon-print:before { content: "\f02f"; }
+
+.icon-camera:before { content: "\f030"; }
+.icon-font:before { content: "\f031"; }
+.icon-bold:before { content: "\f032"; }
+.icon-italic:before { content: "\f033"; }
+.icon-text-height:before { content: "\f034"; }
+.icon-text-width:before { content: "\f035"; }
+.icon-align-left:before { content: "\f036"; }
+.icon-align-center:before { content: "\f037"; }
+.icon-align-right:before { content: "\f038"; }
+.icon-align-justify:before { content: "\f039"; }
+.icon-list:before { content: "\f03a"; }
+.icon-indent-left:before { content: "\f03b"; }
+.icon-indent-right:before { content: "\f03c"; }
+.icon-facetime-video:before { content: "\f03d"; }
+.icon-picture:before { content: "\f03e"; }
+
+.icon-pencil:before { content: "\f040"; }
+.icon-map-marker:before { content: "\f041"; }
+.icon-adjust:before { content: "\f042"; }
+.icon-tint:before { content: "\f043"; }
+.icon-edit:before { content: "\f044"; }
+.icon-share:before { content: "\f045"; }
+.icon-check:before { content: "\f046"; }
+.icon-move:before { content: "\f047"; }
+.icon-step-backward:before { content: "\f048"; }
+.icon-fast-backward:before { content: "\f049"; }
+.icon-backward:before { content: "\f04a"; }
+.icon-play:before { content: "\f04b"; }
+.icon-pause:before { content: "\f04c"; }
+.icon-stop:before { content: "\f04d"; }
+.icon-forward:before { content: "\f04e"; }
+
+.icon-fast-forward:before { content: "\f050"; }
+.icon-step-forward:before { content: "\f051"; }
+.icon-eject:before { content: "\f052"; }
+.icon-chevron-left:before { content: "\f053"; }
+.icon-chevron-right:before { content: "\f054"; }
+.icon-plus-sign:before { content: "\f055"; }
+.icon-minus-sign:before { content: "\f056"; }
+.icon-remove-sign:before { content: "\f057"; }
+.icon-ok-sign:before { content: "\f058"; }
+.icon-question-sign:before { content: "\f059"; }
+.icon-info-sign:before { content: "\f05a"; }
+.icon-screenshot:before { content: "\f05b"; }
+.icon-remove-circle:before { content: "\f05c"; }
+.icon-ok-circle:before { content: "\f05d"; }
+.icon-ban-circle:before { content: "\f05e"; }
+
+.icon-arrow-left:before { content: "\f060"; }
+.icon-arrow-right:before { content: "\f061"; }
+.icon-arrow-up:before { content: "\f062"; }
+.icon-arrow-down:before { content: "\f063"; }
+.icon-share-alt:before { content: "\f064"; }
+.icon-resize-full:before { content: "\f065"; }
+.icon-resize-small:before { content: "\f066"; }
+.icon-plus:before { content: "\f067"; }
+.icon-minus:before { content: "\f068"; }
+.icon-asterisk:before { content: "\f069"; }
+.icon-exclamation-sign:before { content: "\f06a"; }
+.icon-gift:before { content: "\f06b"; }
+.icon-leaf:before { content: "\f06c"; }
+.icon-fire:before { content: "\f06d"; }
+.icon-eye-open:before { content: "\f06e"; }
+
+.icon-eye-close:before { content: "\f070"; }
+.icon-warning-sign:before { content: "\f071"; }
+.icon-plane:before { content: "\f072"; }
+.icon-calendar:before { content: "\f073"; }
+.icon-random:before { content: "\f074"; }
+.icon-comment:before { content: "\f075"; }
+.icon-magnet:before { content: "\f076"; }
+.icon-chevron-up:before { content: "\f077"; }
+.icon-chevron-down:before { content: "\f078"; }
+.icon-retweet:before { content: "\f079"; }
+.icon-shopping-cart:before { content: "\f07a"; }
+.icon-folder-close:before { content: "\f07b"; }
+.icon-folder-open:before { content: "\f07c"; }
+.icon-resize-vertical:before { content: "\f07d"; }
+.icon-resize-horizontal:before { content: "\f07e"; }
+
+.icon-bar-chart:before { content: "\f080"; }
+.icon-twitter-sign:before { content: "\f081"; }
+.icon-facebook-sign:before { content: "\f082"; }
+.icon-camera-retro:before { content: "\f083"; }
+.icon-key:before { content: "\f084"; }
+.icon-cogs:before { content: "\f085"; }
+.icon-comments:before { content: "\f086"; }
+.icon-thumbs-up:before { content: "\f087"; }
+.icon-thumbs-down:before { content: "\f088"; }
+.icon-star-half:before { content: "\f089"; }
+.icon-heart-empty:before { content: "\f08a"; }
+.icon-signout:before { content: "\f08b"; }
+.icon-linkedin-sign:before { content: "\f08c"; }
+.icon-pushpin:before { content: "\f08d"; }
+.icon-external-link:before { content: "\f08e"; }
-.icon-camera:before { content: "\f030"; }
-.icon-font:before { content: "\f031"; }
-.icon-bold:before { content: "\f032"; }
-.icon-italic:before { content: "\f033"; }
-.icon-text-height:before { content: "\f034"; }
-.icon-text-width:before { content: "\f035"; }
-.icon-align-left:before { content: "\f036"; }
-.icon-align-center:before { content: "\f037"; }
-.icon-align-right:before { content: "\f038"; }
-.icon-align-justify:before { content: "\f039"; }
-.icon-list:before { content: "\f03a"; }
-.icon-indent-left:before { content: "\f03b"; }
-.icon-indent-right:before { content: "\f03c"; }
-.icon-facetime-video:before { content: "\f03d"; }
-.icon-picture:before { content: "\f03e"; }
+.icon-signin:before { content: "\f090"; }
+.icon-trophy:before { content: "\f091"; }
+.icon-github-sign:before { content: "\f092"; }
+.icon-upload-alt:before { content: "\f093"; }
+.icon-lemon:before { content: "\f094"; }
+.icon-phone:before { content: "\f095"; }
+.icon-check-empty:before { content: "\f096"; }
+.icon-bookmark-empty:before { content: "\f097"; }
+.icon-phone-sign:before { content: "\f098"; }
+.icon-twitter:before { content: "\f099"; }
+.icon-facebook:before { content: "\f09a"; }
+.icon-github:before { content: "\f09b"; }
+.icon-unlock:before { content: "\f09c"; }
+.icon-credit-card:before { content: "\f09d"; }
+.icon-rss:before { content: "\f09e"; }
-.icon-pencil:before { content: "\f040"; }
-.icon-map-marker:before { content: "\f041"; }
-.icon-adjust:before { content: "\f042"; }
-.icon-tint:before { content: "\f043"; }
-.icon-edit:before { content: "\f044"; }
-.icon-share:before { content: "\f045"; }
-.icon-check:before { content: "\f046"; }
-.icon-move:before { content: "\f047"; }
-.icon-step-backward:before { content: "\f048"; }
-.icon-fast-backward:before { content: "\f049"; }
-.icon-backward:before { content: "\f04a"; }
-.icon-play:before { content: "\f04b"; }
-.icon-pause:before { content: "\f04c"; }
-.icon-stop:before { content: "\f04d"; }
-.icon-forward:before { content: "\f04e"; }
+.icon-hdd:before { content: "\f0a0"; }
+.icon-bullhorn:before { content: "\f0a1"; }
+.icon-bell:before { content: "\f0a2"; }
+.icon-certificate:before { content: "\f0a3"; }
+.icon-hand-right:before { content: "\f0a4"; }
+.icon-hand-left:before { content: "\f0a5"; }
+.icon-hand-up:before { content: "\f0a6"; }
+.icon-hand-down:before { content: "\f0a7"; }
+.icon-circle-arrow-left:before { content: "\f0a8"; }
+.icon-circle-arrow-right:before { content: "\f0a9"; }
+.icon-circle-arrow-up:before { content: "\f0aa"; }
+.icon-circle-arrow-down:before { content: "\f0ab"; }
+.icon-globe:before { content: "\f0ac"; }
+.icon-wrench:before { content: "\f0ad"; }
+.icon-tasks:before { content: "\f0ae"; }
-.icon-fast-forward:before { content: "\f050"; }
-.icon-step-forward:before { content: "\f051"; }
-.icon-eject:before { content: "\f052"; }
-.icon-chevron-left:before { content: "\f053"; }
-.icon-chevron-right:before { content: "\f054"; }
-.icon-plus-sign:before { content: "\f055"; }
-.icon-minus-sign:before { content: "\f056"; }
-.icon-remove-sign:before { content: "\f057"; }
-.icon-ok-sign:before { content: "\f058"; }
-.icon-question-sign:before { content: "\f059"; }
-.icon-info-sign:before { content: "\f05a"; }
-.icon-screenshot:before { content: "\f05b"; }
-.icon-remove-circle:before { content: "\f05c"; }
-.icon-ok-circle:before { content: "\f05d"; }
-.icon-ban-circle:before { content: "\f05e"; }
+.icon-filter:before { content: "\f0b0"; }
+.icon-briefcase:before { content: "\f0b1"; }
+.icon-fullscreen:before { content: "\f0b2"; }
-.icon-arrow-left:before { content: "\f060"; }
-.icon-arrow-right:before { content: "\f061"; }
-.icon-arrow-up:before { content: "\f062"; }
-.icon-arrow-down:before { content: "\f063"; }
-.icon-share-alt:before { content: "\f064"; }
-.icon-resize-full:before { content: "\f065"; }
-.icon-resize-small:before { content: "\f066"; }
-.icon-plus:before { content: "\f067"; }
-.icon-minus:before { content: "\f068"; }
-.icon-asterisk:before { content: "\f069"; }
-.icon-exclamation-sign:before { content: "\f06a"; }
-.icon-gift:before { content: "\f06b"; }
-.icon-leaf:before { content: "\f06c"; }
-.icon-fire:before { content: "\f06d"; }
-.icon-eye-open:before { content: "\f06e"; }
+.icon-group:before { content: "\f0c0"; }
+.icon-link:before { content: "\f0c1"; }
+.icon-cloud:before { content: "\f0c2"; }
+.icon-beaker:before { content: "\f0c3"; }
+.icon-cut:before { content: "\f0c4"; }
+.icon-copy:before { content: "\f0c5"; }
+.icon-paper-clip:before { content: "\f0c6"; }
+.icon-save:before { content: "\f0c7"; }
+.icon-sign-blank:before { content: "\f0c8"; }
+.icon-reorder:before { content: "\f0c9"; }
+.icon-list-ul:before { content: "\f0ca"; }
+.icon-list-ol:before { content: "\f0cb"; }
+.icon-strikethrough:before { content: "\f0cc"; }
+.icon-underline:before { content: "\f0cd"; }
+.icon-table:before { content: "\f0ce"; }
-.icon-eye-close:before { content: "\f070"; }
-.icon-warning-sign:before { content: "\f071"; }
-.icon-plane:before { content: "\f072"; }
-.icon-calendar:before { content: "\f073"; }
-.icon-random:before { content: "\f074"; }
-.icon-comment:before { content: "\f075"; }
-.icon-magnet:before { content: "\f076"; }
-.icon-chevron-up:before { content: "\f077"; }
-.icon-chevron-down:before { content: "\f078"; }
-.icon-retweet:before { content: "\f079"; }
-.icon-shopping-cart:before { content: "\f07a"; }
-.icon-folder-close:before { content: "\f07b"; }
-.icon-folder-open:before { content: "\f07c"; }
-.icon-resize-vertical:before { content: "\f07d"; }
-.icon-resize-horizontal:before { content: "\f07e"; }
+.icon-magic:before { content: "\f0d0"; }
+.icon-truck:before { content: "\f0d1"; }
+.icon-pinterest:before { content: "\f0d2"; }
+.icon-pinterest-sign:before { content: "\f0d3"; }
+.icon-google-plus-sign:before { content: "\f0d4"; }
+.icon-google-plus:before { content: "\f0d5"; }
+.icon-money:before { content: "\f0d6"; }
+.icon-caret-down:before { content: "\f0d7"; }
+.icon-caret-up:before { content: "\f0d8"; }
+.icon-caret-left:before { content: "\f0d9"; }
+.icon-caret-right:before { content: "\f0da"; }
+.icon-columns:before { content: "\f0db"; }
+.icon-sort:before { content: "\f0dc"; }
+.icon-sort-down:before { content: "\f0dd"; }
+.icon-sort-up:before { content: "\f0de"; }
-.icon-bar-chart:before { content: "\f080"; }
-.icon-twitter-sign:before { content: "\f081"; }
-.icon-facebook-sign:before { content: "\f082"; }
-.icon-camera-retro:before { content: "\f083"; }
-.icon-key:before { content: "\f084"; }
-.icon-cogs:before { content: "\f085"; }
-.icon-comments:before { content: "\f086"; }
-.icon-thumbs-up:before { content: "\f087"; }
-.icon-thumbs-down:before { content: "\f088"; }
-.icon-star-half:before { content: "\f089"; }
-.icon-heart-empty:before { content: "\f08a"; }
-.icon-signout:before { content: "\f08b"; }
-.icon-linkedin-sign:before { content: "\f08c"; }
-.icon-pushpin:before { content: "\f08d"; }
-.icon-external-link:before { content: "\f08e"; }
+.icon-envelope-alt:before { content: "\f0e0"; }
+.icon-linkedin:before { content: "\f0e1"; }
+.icon-undo:before { content: "\f0e2"; }
+.icon-legal:before { content: "\f0e3"; }
+.icon-dashboard:before { content: "\f0e4"; }
+.icon-comment-alt:before { content: "\f0e5"; }
+.icon-comments-alt:before { content: "\f0e6"; }
+.icon-bolt:before { content: "\f0e7"; }
+.icon-sitemap:before { content: "\f0e8"; }
+.icon-umbrella:before { content: "\f0e9"; }
+.icon-paste:before { content: "\f0ea"; }
-.icon-signin:before { content: "\f090"; }
-.icon-trophy:before { content: "\f091"; }
-.icon-github-sign:before { content: "\f092"; }
-.icon-upload-alt:before { content: "\f093"; }
-.icon-lemon:before { content: "\f094"; }
+.icon-user-md:before { content: "\f200"; }
View
40 vendor/toolkit/twitter/bootstrap/badges.less
@@ -1,40 +0,0 @@
-// BADGES
-// ------
-
-// Base
-.badge {
- padding: 1px 9px 2px;
- font-size: @baseFontSize * .925;
- font-weight: bold;
- white-space: nowrap;
- color: @white;
- background-color: @grayLight;
- .border-radius(9px);
-}
-
-// Hover state
-.badge:hover {
- color: @white;
- text-decoration: none;
- cursor: pointer;
-}
-
-// Colors
-.badge-error { background-color: @errorText; }
-.badge-error:hover { background-color: darken(@errorText, 10%); }
-
-// Colors
-.badge-important { background-color: @errorText; }
-.badge-important:hover { background-color: darken(@errorText, 10%); }
-
-.badge-warning { background-color: @orange; }
-.badge-warning:hover { background-color: darken(@orange, 10%); }
-
-.badge-success { background-color: @successText; }
-.badge-success:hover { background-color: darken(@successText, 10%); }
-
-.badge-info { background-color: @infoText; }
-.badge-info:hover { background-color: darken(@infoText, 10%); }
-
-.badge-inverse { background-color: @grayDark; }
-.badge-inverse:hover { background-color: darken(@grayDark, 10%); }
View
2  vendor/toolkit/twitter/bootstrap/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.3
+ * Bootstrap v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
View
6 vendor/toolkit/twitter/bootstrap/component-animations.less
@@ -2,10 +2,10 @@
// --------------------
.fade {
- .opacity(0);
+ opacity: 0;
.transition(opacity .15s linear);
&.in {
- .opacity(100);
+ opacity: 1;
}
}
@@ -17,4 +17,4 @@
&.in {
height: auto;
}
-}
+}
View
6 vendor/toolkit/twitter/bootstrap/dropdowns.less
@@ -71,7 +71,7 @@
// Dividers (basically an hr) within the dropdown
.divider {
- .nav-divider();
+ .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
}
// Links within the dropdown menu
@@ -103,14 +103,14 @@
// make the menu appear below buttons that appeared later on the page
*z-index: @zindexDropdown;
- .dropdown-menu {
+ & > .dropdown-menu {
display: block;
}
}
// Right aligned dropdowns
// ---------------------------
-.pull-right .dropdown-menu {
+.pull-right > .dropdown-menu {
right: 0;
left: auto;
}
View
183 vendor/toolkit/twitter/bootstrap/forms.less
@@ -27,7 +27,7 @@ legend {
line-height: @baseLineHeight * 2;
color: @grayDark;
border: 0;
- border-bottom: 1px solid #eee;
+ border-bottom: 1px solid #e5e5e5;
// Small
small {
@@ -55,72 +55,101 @@ textarea {
label {
display: block;
margin-bottom: 5px;
- color: @grayDark;
}
-// Inputs, Textareas, Selects
-input,
-textarea,
+// Form controls
+// -------------------------
+
+// Shared size and type resets
select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
.uneditable-input {
display: inline-block;
- width: 210px;
height: @baseLineHeight;
padding: 4px;
margin-bottom: 9px;
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @gray;
- background-color: @inputBackground;
- border: 1px solid @inputBorder;
- .border-radius(@inputBorderRadius);
}
-.uneditable-textarea {
- width: auto;
+
+// Reset appearance properties for textual inputs and textarea
+// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
+input,
+textarea {
+ width: 210px;
+}
+// Reset height since textareas have rows
+textarea {
height: auto;
}
+// Everything else
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+ background-color: @inputBackground;
+ border: 1px solid @inputBorder;
+ .border-radius(@inputBorderRadius);
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+ @transition: border linear .2s, box-shadow linear .2s;
+ .transition(@transition);
-// Inputs within a label
-label input,
-label textarea,
-label select {
- display: block;
+ // Focus state
+ &:focus {
+ border-color: rgba(82,168,236,.8);
+ outline: 0;
+ outline: thin dotted \9; /* IE6-9 */
+ .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
+ }
}
-// Mini reset for unique input types
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
- width: auto;
- height: auto;
- padding: 0;
+// Position radios and checkboxes better
+input[type="radio"],
+input[type="checkbox"] {
margin: 3px 0;
*margin-top: 0; /* IE7 */
line-height: normal;
cursor: pointer;
- background-color: transparent;
- border: 0 \9; /* IE9 and down */
- .border-radius(0);
-}
-input[type="image"] {
- border: 0;
}
-// Reset the file input to browser defaults
-input[type="file"] {
- width: auto;
- padding: initial;
- line-height: initial;
- background-color: @inputBackground;
- background-color: initial;
- border: initial;
- .box-shadow(none);
+// Reset width of input buttons, radios, checkboxes
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+ width: auto; // Override of generic input selector
}
-// Help out input buttons
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
width: auto;
height: auto;
}
@@ -133,15 +162,10 @@ input[type="file"] {
line-height: 28px;
}
-// Reset line-height for IE
-input[type="file"] {
- line-height: 18px \9;
-}
-
-// Chrome on Linux and Mobile Safari need background-color
+// Make select elements obey height by applying a border
select {
width: 220px; // default input width + 10px of padding that doesn't get applied
- background-color: @inputBackground;
+ border: 1px solid #bbb;
}
// Make multiple select elements height not fixed
@@ -150,19 +174,12 @@ select[size] {
height: auto;
}
-// Remove shadow from image inputs
-input[type="image"] {
- .box-shadow(none);
-}
-
-// Make textarea height behave
-textarea {
- height: auto;
-}
-
-// Hidden inputs
-input[type="hidden"] {
- display: none;
+// Focus for select, file, radio, and checkbox
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+ .tab-focus();
}
@@ -204,32 +221,6 @@ input[type="hidden"] {
-// FOCUS STATE
-// -----------
-
-input,
-textarea {
- .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
- @transition: border linear .2s, box-shadow linear .2s;
- .transition(@transition);
-}
-input:focus,
-textarea:focus {
- border-color: rgba(82,168,236,.8);
- outline: 0;
- outline: thin dotted \9; /* IE6-9 */
- .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus {
- .tab-focus();
- .box-shadow(none); // override for file inputs
-}
-
-
-
// INPUT SIZES
// -----------
@@ -254,14 +245,22 @@ textarea[class*="span"],
float: none;
margin-left: 0;
}
+// Ensure input-prepend/append never wraps
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+ display: inline-block;
+}
// GRID SIZING FOR INPUTS
// ----------------------
-#grid > .input (@gridColumnWidth, @gridGutterWidth);
-
+#grid > .input(@gridColumnWidth, @gridGutterWidth);
@@ -329,7 +328,7 @@ select:focus:required:invalid {
margin-top: @baseLineHeight;
margin-bottom: @baseLineHeight;
background-color: @formActionsBackground;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e5e5e5;
.clearfix(); // Adding clearfix to allow for .pull-right button containers
}
@@ -344,7 +343,7 @@ select:focus:required:invalid {
}
// Placeholder text gets special styles; can't be bundled together though for some reason
-.placeholder(@grayLight);
+.placeholder();
View
38 vendor/toolkit/twitter/bootstrap/labels.less
@@ -1,38 +0,0 @@
-// LABELS
-// ------
-
-// Base
-.label {
- padding: 1px 4px 2px;
- font-size: @baseFontSize * .846;
- font-weight: bold;
- line-height: 13px; // ensure proper line-height if floated
- color: @white;
- vertical-align: middle;
- white-space: nowrap;
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
- background-color: @grayLight;
- .border-radius(3px);
-}
-
-// Hover state
-.label:hover {
- color: @white;
- text-decoration: none;
-}
-
-// Colors
-.label-important { background-color: @errorText; }
-.label-important:hover { background-color: darken(@errorText, 10%); }
-
-.label-warning { background-color: @orange; }
-.label-warning:hover { background-color: darken(@orange, 10%); }
-
-.label-success { background-color: @successText; }
-.label-success:hover { background-color: darken(@successText, 10%); }
-
-.label-info { background-color: @infoText; }
-.label-info:hover { background-color: darken(@infoText, 10%); }
-
-.label-inverse { background-color: @grayDark; }
-.label-inverse:hover { background-color: darken(@grayDark, 10%); }
View
25 vendor/toolkit/twitter/bootstrap/mixins.less
@@ -81,10 +81,13 @@
// Placeholder text
// -------------------------
.placeholder(@color: @placeholderText) {
- :-moz-placeholder {
+ &:-moz-placeholder {
color: @color;
}
- ::-webkit-input-placeholder {
+ &:-ms-input-placeholder {
+ color: @color;
+ }
+ &::-webkit-input-placeholder {
color: @color;
}
}
@@ -166,6 +169,8 @@
color: @textColor;
}
// Style inputs accordingly
+ .checkbox,
+ .radio,
input,
select,
textarea {
@@ -312,6 +317,16 @@
column-gap: @columnGap;
}
+// Optional hyphenation
+.hyphens(@mode: auto) {
+ word-wrap: break-word;
+ -webkit-hyphens: @mode;
+ -moz-hyphens: @mode;
+ -ms-hyphens: @mode;
+ -o-hyphens: @mode;
+ hyphens: @mode;
+}
+
// Opacity
.opacity(@opacity) {
opacity: @opacity / 100;
@@ -417,7 +432,7 @@
// Horizontal dividers
// -------------------------
// Dividers (basically an hr) within dropdowns and nav lists
-.nav-divider() {
+.nav-divider(@top: #e5e5e5, @bottom: @white) {
// IE7 needs a set width since we gave a height. Restricting just
// to IE7 to keep the 1px left/right space in other browsers.
// It is unclear where IE is getting the extra space that we need
@@ -427,8 +442,8 @@
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
*margin: -5px 0 5px;
overflow: hidden;
- background-color: #e5e5e5;
- border-bottom: 1px solid @white;
+ background-color: @top;
+ border-bottom: 1px solid @bottom;
}
// Button backgrounds
View
10 vendor/toolkit/twitter/bootstrap/navbar.less
@@ -120,16 +120,10 @@
color: @white;
background-color: @navbarSearchBackground;
border: 1px solid @navbarSearchBorder;
- .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15)");
+ .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
.transition(none);
- // Placeholder text gets special styles; can't be a grouped selector
- &:-moz-placeholder {
- color: @navbarSearchPlaceholderColor;
- }
- &::-webkit-input-placeholder {
- color: @navbarSearchPlaceholderColor;
- }
+ .placeholder(@navbarSearchPlaceholderColor);
// Focus states (we use .focused since IE7-8 and down doesn't support :focus)
&:focus,
View
5 vendor/toolkit/twitter/bootstrap/reset.less
@@ -81,6 +81,11 @@ img {
-ms-interpolation-mode: bicubic;
}
+// Prevent max-width from affecting Google Maps
+#map_canvas img {
+ max-width: none;
+}
+
// Forms
// -------------------------
View
11 vendor/toolkit/twitter/bootstrap/responsive-navbar.less
@@ -9,11 +9,18 @@
padding-top: 0;
}
// Unfix the navbar
- .navbar-fixed-top {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
position: static;
+ }
+ .navbar-fixed-top {
margin-bottom: @baseLineHeight;
}
- .navbar-fixed-top .navbar-inner {
+ .navbar-fixed-bottom {
+ margin-top: @baseLineHeight;
+ }
+ .navbar-fixed-top .navbar-inner,
+ .navbar-fixed-bottom .navbar-inner {
padding: 5px;
}
.navbar .container {
View
2  vendor/toolkit/twitter/bootstrap/responsive.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.0.3
+ * Bootstrap Responsive v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
View
4 vendor/toolkit/twitter/bootstrap/sprites.less
@@ -22,13 +22,13 @@
.ie7-restore-right-whitespace();
line-height: 14px;
vertical-align: text-top;
- background-image: url(@iconSpritePath);
+ background-image: url("@{iconSpritePath}");
background-position: 14px 14px;
background-repeat: no-repeat;
}
.icon-white {
- background-image: url(@iconWhiteSpritePath);
+ background-image: url("@{iconWhiteSpritePath}");
}
.icon-glass { background-position: 0 0; }
View
5 vendor/toolkit/twitter/bootstrap/type.less
@@ -8,9 +8,6 @@
p {
margin: 0 0 @baseLineHeight / 2;
- font-family: @baseFontFamily;
- font-size: @baseFontSize;
- line-height: @baseLineHeight;
small {
font-size: @baseFontSize - 2;
color: @grayLight;
@@ -171,7 +168,7 @@ em {
// Abbreviations and acronyms
abbr[title] {
cursor: help;
- border-bottom: 1px dotted #ddd;
+ border-bottom: 1px dotted @grayLight;
}
abbr.initialism {
font-size: 90%;
View
3  vendor/toolkit/twitter/bootstrap/variables.less
@@ -107,7 +107,8 @@
@dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: @linkColor;
-
+@dropdownDividerTop: #e5e5e5;
+@dropdownDividerBottom: @white;

Showing you all comments on commits in this comparison.

@briantigerchow

Why was 20px padding-left added here? See issue: #294

@seyhunak
Owner

Thanks, fixed in master.

Something went wrong with that request. Please try again.