contour 1.1.0.pre → 1.1.0.pre2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.rdoc +1 -1
- data/app/assets/images/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/glyphicons-halflings-white.png +0 -0
- data/app/assets/images/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/glyphicons-halflings.png +0 -0
- data/app/assets/javascripts/contour.js +1 -14
- data/app/assets/javascripts/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/bootstrap.js +126 -19
- data/app/assets/stylesheets/bootstrap-base-overrides.css +6 -23
- data/app/assets/stylesheets/contour.css +2 -2
- data/app/assets/stylesheets/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/bootstrap-responsive.css +5 -36
- data/app/assets/stylesheets/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/bootstrap.css +126 -69
- data/app/views/contour/layouts/application.html.erb +2 -2
- data/contour.gemspec +2 -2
- data/lib/contour/version.rb +1 -1
- data/lib/generators/contour/scaffold/templates/controller.rb +1 -1
- data/lib/generators/contour/scaffold/templates/index.html.erb +1 -7
- data/test/dummy/db/test.sqlite3 +0 -0
- data/test/dummy/log/test.log +524 -0
- metadata +11 -24
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-affix.js +0 -104
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-alert.js +0 -90
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-button.js +0 -96
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-carousel.js +0 -176
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-collapse.js +0 -158
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-dropdown.js +0 -150
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-modal.js +0 -239
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-popover.js +0 -102
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-scrollspy.js +0 -151
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-tab.js +0 -135
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-tooltip.js +0 -273
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-transition.js +0 -60
- data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-typeahead.js +0 -300
data/CHANGELOG.rdoc
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
* Interactions: Draggable, Droppable, Resizable, Selectable, Sortable
|
7
7
|
* Widgets: Datepicker
|
8
8
|
* Effects: Effects Core, Blind, Bounce, Clip, Drop, Explode, Fade, Fold, Highlight, Pulsate, Scale, Shake, Slide, Transfer
|
9
|
-
* Updated Twitter Bootstrap from 2.0.4 to 2.1.0
|
9
|
+
* Updated Twitter Bootstrap from 2.0.4 to 2.1.0
|
10
10
|
|
11
11
|
* Breaking Changes
|
12
12
|
* Unobtrusive JS now required, JavaScript is now included at bottom of HTML to improve perceived page load
|
data/app/assets/images/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/glyphicons-halflings-white.png
RENAMED
File without changes
|
File without changes
|
@@ -7,20 +7,7 @@
|
|
7
7
|
//= require external/jquery-ui-1.8.22.custom.min.js
|
8
8
|
//= require external/jquery.qtip.min.js
|
9
9
|
//
|
10
|
-
//= require twitter-bootstrap/v2.1.0
|
11
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-affix
|
12
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-alert
|
13
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-button
|
14
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-carousel
|
15
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-collapse
|
16
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-dropdown
|
17
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-modal
|
18
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-popover
|
19
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-scrollspy
|
20
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-tab
|
21
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-tooltip
|
22
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-transition
|
23
|
-
//= require twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-typeahead
|
10
|
+
//= require twitter-bootstrap/v2.1.0/bootstrap
|
24
11
|
//
|
25
12
|
//= require twitter-bootstrap/bootstrap-scroll-modal
|
26
13
|
//= require twitter-bootstrap/bootstrap
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===================================================
|
2
|
-
* bootstrap-transition.js v2.0
|
2
|
+
* bootstrap-transition.js v2.1.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
4
4
|
* ===================================================
|
5
5
|
* Copyright 2012 Twitter, Inc.
|
@@ -58,7 +58,7 @@
|
|
58
58
|
})
|
59
59
|
|
60
60
|
}(window.jQuery);/* ==========================================================
|
61
|
-
* bootstrap-alert.js v2.0
|
61
|
+
* bootstrap-alert.js v2.1.0
|
62
62
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
63
63
|
* ==========================================================
|
64
64
|
* Copyright 2012 Twitter, Inc.
|
@@ -147,7 +147,7 @@
|
|
147
147
|
})
|
148
148
|
|
149
149
|
}(window.jQuery);/* ============================================================
|
150
|
-
* bootstrap-button.js v2.0
|
150
|
+
* bootstrap-button.js v2.1.0
|
151
151
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
152
152
|
* ============================================================
|
153
153
|
* Copyright 2012 Twitter, Inc.
|
@@ -242,7 +242,7 @@
|
|
242
242
|
})
|
243
243
|
|
244
244
|
}(window.jQuery);/* ==========================================================
|
245
|
-
* bootstrap-carousel.js v2.0
|
245
|
+
* bootstrap-carousel.js v2.1.0
|
246
246
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
247
247
|
* ==========================================================
|
248
248
|
* Copyright 2012 Twitter, Inc.
|
@@ -417,7 +417,7 @@
|
|
417
417
|
})
|
418
418
|
|
419
419
|
}(window.jQuery);/* =============================================================
|
420
|
-
* bootstrap-collapse.js v2.0
|
420
|
+
* bootstrap-collapse.js v2.1.0
|
421
421
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
422
422
|
* =============================================================
|
423
423
|
* Copyright 2012 Twitter, Inc.
|
@@ -574,7 +574,7 @@
|
|
574
574
|
})
|
575
575
|
|
576
576
|
}(window.jQuery);/* ============================================================
|
577
|
-
* bootstrap-dropdown.js v2.0
|
577
|
+
* bootstrap-dropdown.js v2.1.0
|
578
578
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
579
579
|
* ============================================================
|
580
580
|
* Copyright 2012 Twitter, Inc.
|
@@ -715,15 +715,15 @@
|
|
715
715
|
|
716
716
|
$(function () {
|
717
717
|
$('html')
|
718
|
-
.on('click.dropdown.data-api', clearMenus)
|
718
|
+
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
|
719
719
|
$('body')
|
720
|
-
.on('click.dropdown', '.dropdown
|
721
|
-
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
722
|
-
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
720
|
+
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
|
721
|
+
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
|
722
|
+
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
723
723
|
})
|
724
724
|
|
725
725
|
}(window.jQuery);/* =========================================================
|
726
|
-
* bootstrap-modal.js v2.0
|
726
|
+
* bootstrap-modal.js v2.1.0
|
727
727
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
728
728
|
* =========================================================
|
729
729
|
* Copyright 2012 Twitter, Inc.
|
@@ -953,7 +953,7 @@
|
|
953
953
|
e.preventDefault()
|
954
954
|
|
955
955
|
$target
|
956
|
-
.modal(option)
|
956
|
+
.modal(option)
|
957
957
|
.one('hide', function () {
|
958
958
|
$this.focus()
|
959
959
|
})
|
@@ -961,7 +961,7 @@
|
|
961
961
|
})
|
962
962
|
|
963
963
|
}(window.jQuery);/* ===========================================================
|
964
|
-
* bootstrap-tooltip.js v2.0
|
964
|
+
* bootstrap-tooltip.js v2.1.0
|
965
965
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
966
966
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
967
967
|
* ===========================================================
|
@@ -1006,8 +1006,10 @@
|
|
1006
1006
|
this.options = this.getOptions(options)
|
1007
1007
|
this.enabled = true
|
1008
1008
|
|
1009
|
-
if (this.options.trigger
|
1010
|
-
|
1009
|
+
if (this.options.trigger == 'click') {
|
1010
|
+
this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
|
1011
|
+
} else if (this.options.trigger != 'manual') {
|
1012
|
+
eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
|
1011
1013
|
eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
|
1012
1014
|
this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
|
1013
1015
|
this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
|
@@ -1234,7 +1236,7 @@
|
|
1234
1236
|
|
1235
1237
|
}(window.jQuery);
|
1236
1238
|
/* ===========================================================
|
1237
|
-
* bootstrap-popover.js v2.0
|
1239
|
+
* bootstrap-popover.js v2.1.0
|
1238
1240
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
1239
1241
|
* ===========================================================
|
1240
1242
|
* Copyright 2012 Twitter, Inc.
|
@@ -1330,12 +1332,13 @@
|
|
1330
1332
|
|
1331
1333
|
$.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
|
1332
1334
|
placement: 'right'
|
1335
|
+
, trigger: 'click'
|
1333
1336
|
, content: ''
|
1334
1337
|
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
1335
1338
|
})
|
1336
1339
|
|
1337
1340
|
}(window.jQuery);/* =============================================================
|
1338
|
-
* bootstrap-scrollspy.js v2.0
|
1341
|
+
* bootstrap-scrollspy.js v2.1.0
|
1339
1342
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
1340
1343
|
* =============================================================
|
1341
1344
|
* Copyright 2012 Twitter, Inc.
|
@@ -1485,7 +1488,7 @@
|
|
1485
1488
|
})
|
1486
1489
|
|
1487
1490
|
}(window.jQuery);/* ========================================================
|
1488
|
-
* bootstrap-tab.js v2.0
|
1491
|
+
* bootstrap-tab.js v2.1.0
|
1489
1492
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
1490
1493
|
* ========================================================
|
1491
1494
|
* Copyright 2012 Twitter, Inc.
|
@@ -1619,7 +1622,7 @@
|
|
1619
1622
|
})
|
1620
1623
|
|
1621
1624
|
}(window.jQuery);/* =============================================================
|
1622
|
-
* bootstrap-typeahead.js v2.0
|
1625
|
+
* bootstrap-typeahead.js v2.1.0
|
1623
1626
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
1624
1627
|
* =============================================================
|
1625
1628
|
* Copyright 2012 Twitter, Inc.
|
@@ -1918,3 +1921,107 @@
|
|
1918
1921
|
})
|
1919
1922
|
|
1920
1923
|
}(window.jQuery);
|
1924
|
+
/* ==========================================================
|
1925
|
+
* bootstrap-affix.js v2.1.0
|
1926
|
+
* http://twitter.github.com/bootstrap/javascript.html#affix
|
1927
|
+
* ==========================================================
|
1928
|
+
* Copyright 2012 Twitter, Inc.
|
1929
|
+
*
|
1930
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
1931
|
+
* you may not use this file except in compliance with the License.
|
1932
|
+
* You may obtain a copy of the License at
|
1933
|
+
*
|
1934
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
1935
|
+
*
|
1936
|
+
* Unless required by applicable law or agreed to in writing, software
|
1937
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
1938
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
1939
|
+
* See the License for the specific language governing permissions and
|
1940
|
+
* limitations under the License.
|
1941
|
+
* ========================================================== */
|
1942
|
+
|
1943
|
+
|
1944
|
+
!function ($) {
|
1945
|
+
|
1946
|
+
"use strict"; // jshint ;_;
|
1947
|
+
|
1948
|
+
|
1949
|
+
/* AFFIX CLASS DEFINITION
|
1950
|
+
* ====================== */
|
1951
|
+
|
1952
|
+
var Affix = function (element, options) {
|
1953
|
+
this.options = $.extend({}, $.fn.affix.defaults, options)
|
1954
|
+
this.$window = $(window).on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
|
1955
|
+
this.$element = $(element)
|
1956
|
+
this.checkPosition()
|
1957
|
+
}
|
1958
|
+
|
1959
|
+
Affix.prototype.checkPosition = function () {
|
1960
|
+
if (!this.$element.is(':visible')) return
|
1961
|
+
|
1962
|
+
var scrollHeight = $(document).height()
|
1963
|
+
, scrollTop = this.$window.scrollTop()
|
1964
|
+
, position = this.$element.offset()
|
1965
|
+
, offset = this.options.offset
|
1966
|
+
, offsetBottom = offset.bottom
|
1967
|
+
, offsetTop = offset.top
|
1968
|
+
, reset = 'affix affix-top affix-bottom'
|
1969
|
+
, affix
|
1970
|
+
|
1971
|
+
if (typeof offset != 'object') offsetBottom = offsetTop = offset
|
1972
|
+
if (typeof offsetTop == 'function') offsetTop = offset.top()
|
1973
|
+
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
|
1974
|
+
|
1975
|
+
affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
|
1976
|
+
false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
|
1977
|
+
'bottom' : offsetTop != null && scrollTop <= offsetTop ?
|
1978
|
+
'top' : false
|
1979
|
+
|
1980
|
+
if (this.affixed === affix) return
|
1981
|
+
|
1982
|
+
this.affixed = affix
|
1983
|
+
this.unpin = affix == 'bottom' ? position.top - scrollTop : null
|
1984
|
+
|
1985
|
+
this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
|
1986
|
+
}
|
1987
|
+
|
1988
|
+
|
1989
|
+
/* AFFIX PLUGIN DEFINITION
|
1990
|
+
* ======================= */
|
1991
|
+
|
1992
|
+
$.fn.affix = function (option) {
|
1993
|
+
return this.each(function () {
|
1994
|
+
var $this = $(this)
|
1995
|
+
, data = $this.data('affix')
|
1996
|
+
, options = typeof option == 'object' && option
|
1997
|
+
if (!data) $this.data('affix', (data = new Affix(this, options)))
|
1998
|
+
if (typeof option == 'string') data[option]()
|
1999
|
+
})
|
2000
|
+
}
|
2001
|
+
|
2002
|
+
$.fn.affix.Constructor = Affix
|
2003
|
+
|
2004
|
+
$.fn.affix.defaults = {
|
2005
|
+
offset: 0
|
2006
|
+
}
|
2007
|
+
|
2008
|
+
|
2009
|
+
/* AFFIX DATA-API
|
2010
|
+
* ============== */
|
2011
|
+
|
2012
|
+
$(window).on('load', function () {
|
2013
|
+
$('[data-spy="affix"]').each(function () {
|
2014
|
+
var $spy = $(this)
|
2015
|
+
, data = $spy.data()
|
2016
|
+
|
2017
|
+
data.offset = data.offset || {}
|
2018
|
+
|
2019
|
+
data.offsetBottom && (data.offset.bottom = data.offsetBottom)
|
2020
|
+
data.offsetTop && (data.offset.top = data.offsetTop)
|
2021
|
+
|
2022
|
+
$spy.affix(data)
|
2023
|
+
})
|
2024
|
+
})
|
2025
|
+
|
2026
|
+
|
2027
|
+
}(window.jQuery);
|
@@ -1,40 +1,23 @@
|
|
1
1
|
/* bootstrap-base-overrides.css */
|
2
2
|
/* These overrides come after bootstrap.css but before bootstrap-responsive.css */
|
3
3
|
|
4
|
-
/* Line
|
4
|
+
/* Line 2041 */
|
5
5
|
[class^="icon-"],
|
6
6
|
[class*=" icon-"] {
|
7
|
-
background-image: url(twitter-bootstrap/v2.1.0
|
7
|
+
background-image: url(twitter-bootstrap/v2.1.0/glyphicons-halflings.png);
|
8
8
|
}
|
9
9
|
|
10
|
-
/* Line
|
10
|
+
/* Line 2055 */
|
11
11
|
.icon-white {
|
12
|
-
background-image: url(twitter-bootstrap/v2.1.0
|
12
|
+
background-image: url(twitter-bootstrap/v2.1.0/glyphicons-halflings-white.png);
|
13
13
|
}
|
14
14
|
|
15
|
-
/* Line
|
15
|
+
/* Line 4060 */
|
16
16
|
.navbar .brand {
|
17
17
|
color: #ffffff;
|
18
18
|
}
|
19
19
|
|
20
|
-
|
21
|
-
background-color: #006dcc;
|
22
|
-
*background-color: #0044cc;
|
23
|
-
|
24
|
-
background-image: -moz-linear-gradient(top, #0088CC, #0044CC);
|
25
|
-
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088CC), to(#0044CC));
|
26
|
-
background-image: -webkit-linear-gradient(top, #0088CC, #0044CC);
|
27
|
-
background-image: -o-linear-gradient(top, #0088CC, #0044CC);
|
28
|
-
background-image: linear-gradient(to bottom, #0088CC, #0044CC);
|
29
|
-
background-repeat: repeat-x;
|
30
|
-
|
31
|
-
border-color: #0044cc #0044cc #002a80;
|
32
|
-
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
33
|
-
|
34
|
-
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
|
35
|
-
}*/
|
36
|
-
|
37
|
-
/* Line 4433 */
|
20
|
+
/* Line 4472 */
|
38
21
|
.navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
|
39
22
|
background-color: transparent;
|
40
23
|
}
|
@@ -3,10 +3,10 @@
|
|
3
3
|
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
4
4
|
* the top of the compiled file, but it's generally better to create a new file per style scope.
|
5
5
|
*= require_self
|
6
|
-
*= require twitter-bootstrap/v2.1.0
|
6
|
+
*= require twitter-bootstrap/v2.1.0/bootstrap
|
7
7
|
*= require bootstrap-base-overrides
|
8
8
|
*= require twitter-bootstrap/bootstrap-scroll-modal
|
9
|
-
*= require twitter-bootstrap/v2.1.0
|
9
|
+
*= require twitter-bootstrap/v2.1.0/bootstrap-responsive
|
10
10
|
*= require twitter-bootstrap/bootstrap-subnav
|
11
11
|
*= require bootstrap-responsive-overrides
|
12
12
|
*= require jquery-ui-1.8.22.custom
|
data/app/assets/stylesheets/twitter-bootstrap/{v2.1.0-wip → v2.1.0}/bootstrap-responsive.css
RENAMED
@@ -1,5 +1,5 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap Responsive v2.0
|
2
|
+
* Bootstrap Responsive v2.1.0
|
3
3
|
*
|
4
4
|
* Copyright 2012 Twitter, Inc
|
5
5
|
* Licensed under the Apache License v2.0
|
@@ -110,6 +110,7 @@
|
|
110
110
|
margin-left: 30px;
|
111
111
|
}
|
112
112
|
.container,
|
113
|
+
.navbar-static-top .container,
|
113
114
|
.navbar-fixed-top .container,
|
114
115
|
.navbar-fixed-bottom .container {
|
115
116
|
width: 1170px;
|
@@ -455,6 +456,7 @@
|
|
455
456
|
margin-left: 20px;
|
456
457
|
}
|
457
458
|
.container,
|
459
|
+
.navbar-static-top .container,
|
458
460
|
.navbar-fixed-top .container,
|
459
461
|
.navbar-fixed-bottom .container {
|
460
462
|
width: 724px;
|
@@ -806,6 +808,7 @@
|
|
806
808
|
}
|
807
809
|
.thumbnails > li {
|
808
810
|
float: none;
|
811
|
+
margin-left: 0;
|
809
812
|
}
|
810
813
|
[class*="span"],
|
811
814
|
.row-fluid [class*="span"] {
|
@@ -902,8 +905,7 @@
|
|
902
905
|
padding-top: 0;
|
903
906
|
}
|
904
907
|
.navbar-fixed-top,
|
905
|
-
.navbar-fixed-bottom
|
906
|
-
.navbar-subnav-fixed {
|
908
|
+
.navbar-fixed-bottom {
|
907
909
|
position: static;
|
908
910
|
}
|
909
911
|
.navbar-fixed-top {
|
@@ -1028,39 +1030,6 @@
|
|
1028
1030
|
padding-right: 10px;
|
1029
1031
|
padding-left: 10px;
|
1030
1032
|
}
|
1031
|
-
.navbar-subnav {
|
1032
|
-
width: auto;
|
1033
|
-
height: auto;
|
1034
|
-
-webkit-box-shadow: none;
|
1035
|
-
-moz-box-shadow: none;
|
1036
|
-
box-shadow: none;
|
1037
|
-
}
|
1038
|
-
.navbar-subnav .navbar-inner {
|
1039
|
-
background-color: #fff;
|
1040
|
-
background-image: none;
|
1041
|
-
}
|
1042
|
-
.navbar-subnav .nav {
|
1043
|
-
float: none;
|
1044
|
-
margin-right: 0;
|
1045
|
-
}
|
1046
|
-
.navbar-subnav .nav > li {
|
1047
|
-
float: none;
|
1048
|
-
}
|
1049
|
-
.navbar-subnav .nav > li > a {
|
1050
|
-
border: 0;
|
1051
|
-
}
|
1052
|
-
.navbar-subnav .nav > li > a:hover {
|
1053
|
-
background-color: #f5f5f5;
|
1054
|
-
}
|
1055
|
-
.navbar-subnav .nav > li + li > a {
|
1056
|
-
border-top: 1px solid #e5e5e5;
|
1057
|
-
}
|
1058
|
-
.navbar-subnav .nav > li:first-child > a,
|
1059
|
-
.navbar-subnav .nav > li:first-child > a:hover {
|
1060
|
-
-webkit-border-radius: 4px 4px 0 0;
|
1061
|
-
-moz-border-radius: 4px 4px 0 0;
|
1062
|
-
border-radius: 4px 4px 0 0;
|
1063
|
-
}
|
1064
1033
|
}
|
1065
1034
|
|
1066
1035
|
@media (min-width: 980px) {
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap v2.0
|
2
|
+
* Bootstrap v2.1.0
|
3
3
|
*
|
4
4
|
* Copyright 2012 Twitter, Inc
|
5
5
|
* Licensed under the Apache License v2.0
|
@@ -219,6 +219,7 @@ a:hover {
|
|
219
219
|
}
|
220
220
|
|
221
221
|
.container,
|
222
|
+
.navbar-static-top .container,
|
222
223
|
.navbar-fixed-top .container,
|
223
224
|
.navbar-fixed-bottom .container {
|
224
225
|
width: 940px;
|
@@ -580,11 +581,6 @@ p {
|
|
580
581
|
margin: 0 0 10px;
|
581
582
|
}
|
582
583
|
|
583
|
-
p small {
|
584
|
-
font-size: 12px;
|
585
|
-
color: #999999;
|
586
|
-
}
|
587
|
-
|
588
584
|
.lead {
|
589
585
|
margin-bottom: 20px;
|
590
586
|
font-size: 20px;
|
@@ -592,6 +588,26 @@ p small {
|
|
592
588
|
line-height: 30px;
|
593
589
|
}
|
594
590
|
|
591
|
+
small {
|
592
|
+
font-size: 85%;
|
593
|
+
}
|
594
|
+
|
595
|
+
strong {
|
596
|
+
font-weight: bold;
|
597
|
+
}
|
598
|
+
|
599
|
+
em {
|
600
|
+
font-style: italic;
|
601
|
+
}
|
602
|
+
|
603
|
+
cite {
|
604
|
+
font-style: normal;
|
605
|
+
}
|
606
|
+
|
607
|
+
.muted {
|
608
|
+
color: #999999;
|
609
|
+
}
|
610
|
+
|
595
611
|
h1,
|
596
612
|
h2,
|
597
613
|
h3,
|
@@ -730,18 +746,6 @@ hr {
|
|
730
746
|
border-bottom: 1px solid #ffffff;
|
731
747
|
}
|
732
748
|
|
733
|
-
strong {
|
734
|
-
font-weight: bold;
|
735
|
-
}
|
736
|
-
|
737
|
-
em {
|
738
|
-
font-style: italic;
|
739
|
-
}
|
740
|
-
|
741
|
-
.muted {
|
742
|
-
color: #999999;
|
743
|
-
}
|
744
|
-
|
745
749
|
abbr[title] {
|
746
750
|
cursor: help;
|
747
751
|
border-bottom: 1px dotted #999999;
|
@@ -810,14 +814,6 @@ address {
|
|
810
814
|
line-height: 20px;
|
811
815
|
}
|
812
816
|
|
813
|
-
small {
|
814
|
-
font-size: 100%;
|
815
|
-
}
|
816
|
-
|
817
|
-
cite {
|
818
|
-
font-style: normal;
|
819
|
-
}
|
820
|
-
|
821
817
|
code,
|
822
818
|
pre {
|
823
819
|
padding: 0 3px 2px;
|
@@ -840,7 +836,7 @@ pre {
|
|
840
836
|
display: block;
|
841
837
|
padding: 9.5px;
|
842
838
|
margin: 0 0 10px;
|
843
|
-
font-size:
|
839
|
+
font-size: 13px;
|
844
840
|
line-height: 20px;
|
845
841
|
word-break: break-all;
|
846
842
|
word-wrap: break-word;
|
@@ -1019,6 +1015,7 @@ input[type="checkbox"] {
|
|
1019
1015
|
cursor: pointer;
|
1020
1016
|
}
|
1021
1017
|
|
1018
|
+
input[type="file"],
|
1022
1019
|
input[type="image"],
|
1023
1020
|
input[type="submit"],
|
1024
1021
|
input[type="reset"],
|
@@ -1471,7 +1468,7 @@ select:focus:required:invalid:focus {
|
|
1471
1468
|
margin-bottom: 0;
|
1472
1469
|
*margin-left: 0;
|
1473
1470
|
font-size: 14px;
|
1474
|
-
vertical-align:
|
1471
|
+
vertical-align: top;
|
1475
1472
|
-webkit-border-radius: 0 3px 3px 0;
|
1476
1473
|
-moz-border-radius: 0 3px 3px 0;
|
1477
1474
|
border-radius: 0 3px 3px 0;
|
@@ -1498,7 +1495,6 @@ select:focus:required:invalid:focus {
|
|
1498
1495
|
line-height: 20px;
|
1499
1496
|
text-align: center;
|
1500
1497
|
text-shadow: 0 1px 0 #ffffff;
|
1501
|
-
vertical-align: middle;
|
1502
1498
|
background-color: #eeeeee;
|
1503
1499
|
border: 1px solid #ccc;
|
1504
1500
|
}
|
@@ -1508,6 +1504,7 @@ select:focus:required:invalid:focus {
|
|
1508
1504
|
.input-append .btn,
|
1509
1505
|
.input-prepend .btn {
|
1510
1506
|
margin-left: -1px;
|
1507
|
+
vertical-align: top;
|
1511
1508
|
-webkit-border-radius: 0;
|
1512
1509
|
-moz-border-radius: 0;
|
1513
1510
|
border-radius: 0;
|
@@ -1570,7 +1567,7 @@ select:focus:required:invalid:focus {
|
|
1570
1567
|
border-radius: 0 3px 3px 0;
|
1571
1568
|
}
|
1572
1569
|
|
1573
|
-
.search-query {
|
1570
|
+
input.search-query {
|
1574
1571
|
padding-right: 14px;
|
1575
1572
|
padding-right: 4px \9;
|
1576
1573
|
padding-left: 14px;
|
@@ -1651,7 +1648,9 @@ select:focus:required:invalid:focus {
|
|
1651
1648
|
}
|
1652
1649
|
|
1653
1650
|
.form-search label,
|
1654
|
-
.form-inline label
|
1651
|
+
.form-inline label,
|
1652
|
+
.form-search .btn-group,
|
1653
|
+
.form-inline .btn-group {
|
1655
1654
|
display: inline-block;
|
1656
1655
|
}
|
1657
1656
|
|
@@ -2035,6 +2034,7 @@ table .span24 {
|
|
2035
2034
|
display: inline-block;
|
2036
2035
|
width: 14px;
|
2037
2036
|
height: 14px;
|
2037
|
+
margin-top: 1px;
|
2038
2038
|
*margin-right: .3em;
|
2039
2039
|
line-height: 14px;
|
2040
2040
|
vertical-align: text-top;
|
@@ -2049,7 +2049,8 @@ table .span24 {
|
|
2049
2049
|
.nav > .active > a > [class^="icon-"],
|
2050
2050
|
.nav > .active > a > [class*=" icon-"],
|
2051
2051
|
.dropdown-menu > li > a:hover > [class^="icon-"],
|
2052
|
-
.dropdown-menu > li > a:hover > [class*=" icon-"]
|
2052
|
+
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
2053
|
+
.dropdown-menu > .active > a > [class^="icon-"],
|
2053
2054
|
.dropdown-menu > .active > a > [class*=" icon-"] {
|
2054
2055
|
background-image: url("../img/glyphicons-halflings-white.png");
|
2055
2056
|
}
|
@@ -3013,17 +3014,17 @@ button.close {
|
|
3013
3014
|
}
|
3014
3015
|
|
3015
3016
|
.btn-large [class^="icon-"] {
|
3016
|
-
margin-top:
|
3017
|
+
margin-top: 2px;
|
3017
3018
|
}
|
3018
3019
|
|
3019
3020
|
.btn-small {
|
3020
|
-
padding:
|
3021
|
+
padding: 3px 9px;
|
3021
3022
|
font-size: 12px;
|
3022
3023
|
line-height: 18px;
|
3023
3024
|
}
|
3024
3025
|
|
3025
3026
|
.btn-small [class^="icon-"] {
|
3026
|
-
margin-top:
|
3027
|
+
margin-top: 0;
|
3027
3028
|
}
|
3028
3029
|
|
3029
3030
|
.btn-mini {
|
@@ -3282,18 +3283,22 @@ input[type="submit"].btn.btn-mini {
|
|
3282
3283
|
*padding-bottom: 1px;
|
3283
3284
|
}
|
3284
3285
|
|
3286
|
+
.btn-link,
|
3287
|
+
.btn-link:active {
|
3288
|
+
background-color: transparent;
|
3289
|
+
background-image: none;
|
3290
|
+
-webkit-box-shadow: none;
|
3291
|
+
-moz-box-shadow: none;
|
3292
|
+
box-shadow: none;
|
3293
|
+
}
|
3294
|
+
|
3285
3295
|
.btn-link {
|
3286
3296
|
color: #0088cc;
|
3287
3297
|
cursor: pointer;
|
3288
|
-
background-color: transparent;
|
3289
|
-
background-image: none;
|
3290
3298
|
border-color: transparent;
|
3291
3299
|
-webkit-border-radius: 0;
|
3292
3300
|
-moz-border-radius: 0;
|
3293
3301
|
border-radius: 0;
|
3294
|
-
-webkit-box-shadow: none;
|
3295
|
-
-moz-box-shadow: none;
|
3296
|
-
box-shadow: none;
|
3297
3302
|
}
|
3298
3303
|
|
3299
3304
|
.btn-link:hover {
|
@@ -3320,6 +3325,7 @@ input[type="submit"].btn.btn-mini {
|
|
3320
3325
|
.btn-toolbar {
|
3321
3326
|
margin-top: 10px;
|
3322
3327
|
margin-bottom: 10px;
|
3328
|
+
font-size: 0;
|
3323
3329
|
}
|
3324
3330
|
|
3325
3331
|
.btn-toolbar .btn-group {
|
@@ -3330,14 +3336,23 @@ input[type="submit"].btn.btn-mini {
|
|
3330
3336
|
*zoom: 1;
|
3331
3337
|
}
|
3332
3338
|
|
3339
|
+
.btn-toolbar .btn + .btn,
|
3340
|
+
.btn-toolbar .btn-group + .btn,
|
3341
|
+
.btn-toolbar .btn + .btn-group {
|
3342
|
+
margin-left: 5px;
|
3343
|
+
}
|
3344
|
+
|
3333
3345
|
.btn-group > .btn {
|
3334
3346
|
position: relative;
|
3335
|
-
margin-left: -1px;
|
3336
3347
|
-webkit-border-radius: 0;
|
3337
3348
|
-moz-border-radius: 0;
|
3338
3349
|
border-radius: 0;
|
3339
3350
|
}
|
3340
3351
|
|
3352
|
+
.btn-group > .btn + .btn {
|
3353
|
+
margin-left: -1px;
|
3354
|
+
}
|
3355
|
+
|
3341
3356
|
.btn-group > .btn,
|
3342
3357
|
.btn-group > .dropdown-menu {
|
3343
3358
|
font-size: 14px;
|
@@ -3408,9 +3423,9 @@ input[type="submit"].btn.btn-mini {
|
|
3408
3423
|
}
|
3409
3424
|
|
3410
3425
|
.btn-group > .btn + .dropdown-toggle {
|
3411
|
-
*padding-top:
|
3426
|
+
*padding-top: 5px;
|
3412
3427
|
padding-right: 8px;
|
3413
|
-
*padding-bottom:
|
3428
|
+
*padding-bottom: 5px;
|
3414
3429
|
padding-left: 8px;
|
3415
3430
|
-webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
3416
3431
|
-moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
@@ -3418,17 +3433,21 @@ input[type="submit"].btn.btn-mini {
|
|
3418
3433
|
}
|
3419
3434
|
|
3420
3435
|
.btn-group > .btn-mini + .dropdown-toggle {
|
3436
|
+
*padding-top: 2px;
|
3421
3437
|
padding-right: 5px;
|
3438
|
+
*padding-bottom: 2px;
|
3422
3439
|
padding-left: 5px;
|
3423
3440
|
}
|
3424
3441
|
|
3425
3442
|
.btn-group > .btn-small + .dropdown-toggle {
|
3426
|
-
*padding-top:
|
3443
|
+
*padding-top: 5px;
|
3427
3444
|
*padding-bottom: 4px;
|
3428
3445
|
}
|
3429
3446
|
|
3430
3447
|
.btn-group > .btn-large + .dropdown-toggle {
|
3448
|
+
*padding-top: 7px;
|
3431
3449
|
padding-right: 12px;
|
3450
|
+
*padding-bottom: 7px;
|
3432
3451
|
padding-left: 12px;
|
3433
3452
|
}
|
3434
3453
|
|
@@ -3501,13 +3520,16 @@ input[type="submit"].btn.btn-mini {
|
|
3501
3520
|
|
3502
3521
|
.btn-group-vertical {
|
3503
3522
|
display: inline-block;
|
3523
|
+
*display: inline;
|
3524
|
+
/* IE7 inline-block hack */
|
3525
|
+
|
3526
|
+
*zoom: 1;
|
3504
3527
|
}
|
3505
3528
|
|
3506
3529
|
.btn-group-vertical .btn {
|
3507
3530
|
display: block;
|
3508
3531
|
float: none;
|
3509
3532
|
width: 100%;
|
3510
|
-
margin-left: 0;
|
3511
3533
|
-webkit-border-radius: 0;
|
3512
3534
|
-moz-border-radius: 0;
|
3513
3535
|
border-radius: 0;
|
@@ -3515,6 +3537,7 @@ input[type="submit"].btn.btn-mini {
|
|
3515
3537
|
|
3516
3538
|
.btn-group-vertical .btn + .btn {
|
3517
3539
|
margin-top: -1px;
|
3540
|
+
margin-left: 0;
|
3518
3541
|
}
|
3519
3542
|
|
3520
3543
|
.btn-group-vertical .btn:first-child {
|
@@ -4137,6 +4160,18 @@ input[type="submit"].btn.btn-mini {
|
|
4137
4160
|
border-radius: 15px;
|
4138
4161
|
}
|
4139
4162
|
|
4163
|
+
.navbar-static-top {
|
4164
|
+
position: static;
|
4165
|
+
width: 100%;
|
4166
|
+
margin-bottom: 0;
|
4167
|
+
}
|
4168
|
+
|
4169
|
+
.navbar-static-top .navbar-inner {
|
4170
|
+
-webkit-border-radius: 0;
|
4171
|
+
-moz-border-radius: 0;
|
4172
|
+
border-radius: 0;
|
4173
|
+
}
|
4174
|
+
|
4140
4175
|
.navbar-fixed-top,
|
4141
4176
|
.navbar-fixed-bottom {
|
4142
4177
|
position: fixed;
|
@@ -4147,7 +4182,8 @@ input[type="submit"].btn.btn-mini {
|
|
4147
4182
|
}
|
4148
4183
|
|
4149
4184
|
.navbar-fixed-top .navbar-inner,
|
4150
|
-
.navbar-fixed-bottom .navbar-inner
|
4185
|
+
.navbar-fixed-bottom .navbar-inner,
|
4186
|
+
.navbar-static-top .navbar-inner {
|
4151
4187
|
border: 0;
|
4152
4188
|
}
|
4153
4189
|
|
@@ -4160,6 +4196,7 @@ input[type="submit"].btn.btn-mini {
|
|
4160
4196
|
border-radius: 0;
|
4161
4197
|
}
|
4162
4198
|
|
4199
|
+
.navbar-static-top .container,
|
4163
4200
|
.navbar-fixed-top .container,
|
4164
4201
|
.navbar-fixed-bottom .container {
|
4165
4202
|
width: 940px;
|
@@ -4169,10 +4206,11 @@ input[type="submit"].btn.btn-mini {
|
|
4169
4206
|
top: 0;
|
4170
4207
|
}
|
4171
4208
|
|
4172
|
-
.navbar-fixed-top .navbar-inner
|
4173
|
-
|
4174
|
-
|
4175
|
-
|
4209
|
+
.navbar-fixed-top .navbar-inner,
|
4210
|
+
.navbar-static-top .navbar-inner {
|
4211
|
+
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
|
4212
|
+
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
|
4213
|
+
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
|
4176
4214
|
}
|
4177
4215
|
|
4178
4216
|
.navbar-fixed-bottom {
|
@@ -4180,9 +4218,9 @@ input[type="submit"].btn.btn-mini {
|
|
4180
4218
|
}
|
4181
4219
|
|
4182
4220
|
.navbar-fixed-bottom .navbar-inner {
|
4183
|
-
-webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
|
4184
|
-
-moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
|
4185
|
-
box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
|
4221
|
+
-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
|
4222
|
+
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
|
4223
|
+
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
|
4186
4224
|
}
|
4187
4225
|
|
4188
4226
|
.navbar .nav {
|
@@ -4220,9 +4258,9 @@ input[type="submit"].btn.btn-mini {
|
|
4220
4258
|
background-color: transparent;
|
4221
4259
|
}
|
4222
4260
|
|
4223
|
-
.navbar .nav .active > a,
|
4224
|
-
.navbar .nav .active > a:hover,
|
4225
|
-
.navbar .nav .active > a:focus {
|
4261
|
+
.navbar .nav > .active > a,
|
4262
|
+
.navbar .nav > .active > a:hover,
|
4263
|
+
.navbar .nav > .active > a:focus {
|
4226
4264
|
color: #555555;
|
4227
4265
|
text-decoration: none;
|
4228
4266
|
background-color: #e5e5e5;
|
@@ -4684,7 +4722,7 @@ input[type="submit"].btn.btn-mini {
|
|
4684
4722
|
}
|
4685
4723
|
|
4686
4724
|
.modal-open .tooltip {
|
4687
|
-
z-index:
|
4725
|
+
z-index: 2080;
|
4688
4726
|
}
|
4689
4727
|
|
4690
4728
|
.modal-backdrop {
|
@@ -4803,7 +4841,7 @@ input[type="submit"].btn.btn-mini {
|
|
4803
4841
|
|
4804
4842
|
.tooltip {
|
4805
4843
|
position: absolute;
|
4806
|
-
z-index:
|
4844
|
+
z-index: 1030;
|
4807
4845
|
display: block;
|
4808
4846
|
padding: 5px;
|
4809
4847
|
font-size: 11px;
|
@@ -5059,6 +5097,10 @@ input[type="submit"].btn.btn-mini {
|
|
5059
5097
|
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
|
5060
5098
|
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
|
5061
5099
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
|
5100
|
+
-webkit-transition: all 0.2s ease-in-out;
|
5101
|
+
-moz-transition: all 0.2s ease-in-out;
|
5102
|
+
-o-transition: all 0.2s ease-in-out;
|
5103
|
+
transition: all 0.2s ease-in-out;
|
5062
5104
|
}
|
5063
5105
|
|
5064
5106
|
a.thumbnail:hover {
|
@@ -5220,8 +5262,8 @@ a.badge:hover {
|
|
5220
5262
|
}
|
5221
5263
|
|
5222
5264
|
.progress {
|
5223
|
-
height:
|
5224
|
-
margin-bottom:
|
5265
|
+
height: 20px;
|
5266
|
+
margin-bottom: 20px;
|
5225
5267
|
overflow: hidden;
|
5226
5268
|
background-color: #f7f7f7;
|
5227
5269
|
background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
|
@@ -5240,6 +5282,7 @@ a.badge:hover {
|
|
5240
5282
|
}
|
5241
5283
|
|
5242
5284
|
.progress .bar {
|
5285
|
+
float: left;
|
5243
5286
|
width: 0;
|
5244
5287
|
height: 100%;
|
5245
5288
|
font-size: 12px;
|
@@ -5247,11 +5290,11 @@ a.badge:hover {
|
|
5247
5290
|
text-align: center;
|
5248
5291
|
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
5249
5292
|
background-color: #0e90d2;
|
5293
|
+
background-image: -moz-linear-gradient(top, #149bdf, #0480be);
|
5250
5294
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
|
5251
5295
|
background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
|
5252
5296
|
background-image: -o-linear-gradient(top, #149bdf, #0480be);
|
5253
5297
|
background-image: linear-gradient(to bottom, #149bdf, #0480be);
|
5254
|
-
background-image: -moz-linear-gradient(top, #149bdf, #0480be);
|
5255
5298
|
background-repeat: repeat-x;
|
5256
5299
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
|
5257
5300
|
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
@@ -5266,6 +5309,12 @@ a.badge:hover {
|
|
5266
5309
|
transition: width 0.6s ease;
|
5267
5310
|
}
|
5268
5311
|
|
5312
|
+
.progress .bar + .bar {
|
5313
|
+
-webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
5314
|
+
-moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
5315
|
+
box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
5316
|
+
}
|
5317
|
+
|
5269
5318
|
.progress-striped .bar {
|
5270
5319
|
background-color: #149bdf;
|
5271
5320
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
|
@@ -5287,7 +5336,8 @@ a.badge:hover {
|
|
5287
5336
|
animation: progress-bar-stripes 2s linear infinite;
|
5288
5337
|
}
|
5289
5338
|
|
5290
|
-
.progress-danger .bar
|
5339
|
+
.progress-danger .bar,
|
5340
|
+
.progress .bar-danger {
|
5291
5341
|
background-color: #dd514c;
|
5292
5342
|
background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
|
5293
5343
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
|
@@ -5298,7 +5348,8 @@ a.badge:hover {
|
|
5298
5348
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
|
5299
5349
|
}
|
5300
5350
|
|
5301
|
-
.progress-danger.progress-striped .bar
|
5351
|
+
.progress-danger.progress-striped .bar,
|
5352
|
+
.progress-striped .bar-danger {
|
5302
5353
|
background-color: #ee5f5b;
|
5303
5354
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
|
5304
5355
|
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
@@ -5307,7 +5358,8 @@ a.badge:hover {
|
|
5307
5358
|
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
5308
5359
|
}
|
5309
5360
|
|
5310
|
-
.progress-success .bar
|
5361
|
+
.progress-success .bar,
|
5362
|
+
.progress .bar-success {
|
5311
5363
|
background-color: #5eb95e;
|
5312
5364
|
background-image: -moz-linear-gradient(top, #62c462, #57a957);
|
5313
5365
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
|
@@ -5318,7 +5370,8 @@ a.badge:hover {
|
|
5318
5370
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
|
5319
5371
|
}
|
5320
5372
|
|
5321
|
-
.progress-success.progress-striped .bar
|
5373
|
+
.progress-success.progress-striped .bar,
|
5374
|
+
.progress-striped .bar-success {
|
5322
5375
|
background-color: #62c462;
|
5323
5376
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
|
5324
5377
|
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
@@ -5327,7 +5380,8 @@ a.badge:hover {
|
|
5327
5380
|
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
5328
5381
|
}
|
5329
5382
|
|
5330
|
-
.progress-info .bar
|
5383
|
+
.progress-info .bar,
|
5384
|
+
.progress .bar-info {
|
5331
5385
|
background-color: #4bb1cf;
|
5332
5386
|
background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
|
5333
5387
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
|
@@ -5338,7 +5392,8 @@ a.badge:hover {
|
|
5338
5392
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
|
5339
5393
|
}
|
5340
5394
|
|
5341
|
-
.progress-info.progress-striped .bar
|
5395
|
+
.progress-info.progress-striped .bar,
|
5396
|
+
.progress-striped .bar-info {
|
5342
5397
|
background-color: #5bc0de;
|
5343
5398
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
|
5344
5399
|
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
@@ -5347,7 +5402,8 @@ a.badge:hover {
|
|
5347
5402
|
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|
5348
5403
|
}
|
5349
5404
|
|
5350
|
-
.progress-warning .bar
|
5405
|
+
.progress-warning .bar,
|
5406
|
+
.progress .bar-warning {
|
5351
5407
|
background-color: #faa732;
|
5352
5408
|
background-image: -moz-linear-gradient(top, #fbb450, #f89406);
|
5353
5409
|
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
|
@@ -5358,7 +5414,8 @@ a.badge:hover {
|
|
5358
5414
|
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
|
5359
5415
|
}
|
5360
5416
|
|
5361
|
-
.progress-warning.progress-striped .bar
|
5417
|
+
.progress-warning.progress-striped .bar,
|
5418
|
+
.progress-striped .bar-warning {
|
5362
5419
|
background-color: #fbb450;
|
5363
5420
|
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
|
5364
5421
|
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
|