bootstrapped 0.0.4 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +0 -1
- data/Gemfile.lock +133 -0
- data/README.rdoc +101 -0
- data/bootstrapped.gemspec +4 -0
- data/features/bootstrap_layout.feature +13 -0
- data/features/bootstrap_scaffold.feature +80 -0
- data/features/step_definitions/common_steps.rb +62 -0
- data/features/step_definitions/rails_setup_steps.rb +6 -0
- data/features/support/env.rb +6 -0
- data/features/support/matchers.rb +7 -0
- data/lib/bootstrapped.rb +2 -1
- data/lib/bootstrapped/engine.rb +3 -1
- data/lib/bootstrapped/version.rb +1 -1
- data/lib/generators/bootstrapped/install/install_generator.rb +26 -0
- data/{vendor/assets/stylesheets/bootstrap.css.less → lib/generators/bootstrapped/install/templates/bootstrap.less} +2 -2
- data/{vendor/assets/stylesheets/forms.css.less → lib/generators/bootstrapped/install/templates/forms.less} +49 -35
- data/{vendor/assets/stylesheets/mixins.css.less → lib/generators/bootstrapped/install/templates/mixins.less} +35 -30
- data/{vendor/assets/stylesheets/patterns.css.less → lib/generators/bootstrapped/install/templates/patterns.less} +97 -42
- data/{vendor/assets/stylesheets/reset.css.less → lib/generators/bootstrapped/install/templates/reset.less} +0 -0
- data/{vendor/assets/stylesheets/scaffolding.css.less → lib/generators/bootstrapped/install/templates/scaffolding.less} +20 -18
- data/{vendor/assets/stylesheets/tables.css.less → lib/generators/bootstrapped/install/templates/tables.less} +68 -15
- data/{vendor/assets/stylesheets/type.css.less → lib/generators/bootstrapped/install/templates/type.less} +0 -0
- data/{vendor/assets/stylesheets/variables.css.less → lib/generators/bootstrapped/install/templates/variables.less} +0 -0
- data/lib/generators/bootstrapped/layout/templates/error_messages_helper.rb +7 -5
- data/lib/generators/bootstrapped/layout/templates/layout.html.erb +13 -7
- data/lib/generators/bootstrapped/layout/templates/layout_helper.rb +5 -1
- data/lib/generators/bootstrapped/scaffold/templates/views/erb/_form.html.erb +1 -0
- data/vendor/assets/javascripts/.DS_Store +0 -0
- data/vendor/assets/javascripts/{bootstrap-alerts.js → twitter/bootstrap/bootstrap-alerts.js} +18 -9
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-buttons.js +62 -0
- data/vendor/assets/javascripts/{bootstrap-dropdown.js → twitter/bootstrap/bootstrap-dropdown.js} +17 -12
- data/vendor/assets/javascripts/{bootstrap-modal.js → twitter/bootstrap/bootstrap-modal.js} +57 -35
- data/vendor/assets/javascripts/{bootstrap-popover.js → twitter/bootstrap/bootstrap-popover.js} +20 -7
- data/vendor/assets/javascripts/{bootstrap-scrollspy.js → twitter/bootstrap/bootstrap-scrollspy.js} +4 -2
- data/vendor/assets/javascripts/{bootstrap-tabs.js → twitter/bootstrap/bootstrap-tabs.js} +25 -7
- data/vendor/assets/javascripts/{bootstrap-twipsy.js → twitter/bootstrap/bootstrap-twipsy.js} +30 -16
- data/vendor/assets/stylesheets/.DS_Store +0 -0
- data/vendor/assets/stylesheets/{bootstrap.css → twitter/bootstrap/bootstrap.css} +238 -133
- data/vendor/framework/bootstrap.less +26 -0
- data/vendor/framework/forms.less +479 -0
- data/vendor/framework/mixins.less +222 -0
- data/vendor/framework/patterns.less +1060 -0
- data/vendor/framework/reset.less +141 -0
- data/vendor/framework/scaffolding.less +137 -0
- data/vendor/framework/tables.less +224 -0
- data/vendor/framework/type.less +187 -0
- data/vendor/framework/variables.less +60 -0
- metadata +90 -29
- data/vendor/.DS_Store +0 -0
- data/vendor/assets/.DS_Store +0 -0
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =========================================================
|
2
|
-
* bootstrap-modal.js v1.
|
2
|
+
* bootstrap-modal.js v1.4.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#modal
|
4
4
|
* =========================================================
|
5
5
|
* Copyright 2011 Twitter, Inc.
|
@@ -20,6 +20,8 @@
|
|
20
20
|
|
21
21
|
!function( $ ){
|
22
22
|
|
23
|
+
"use strict"
|
24
|
+
|
23
25
|
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
24
26
|
* ======================================================= */
|
25
27
|
|
@@ -53,16 +55,12 @@
|
|
53
55
|
* ============================= */
|
54
56
|
|
55
57
|
var Modal = function ( content, options ) {
|
56
|
-
this.settings = $.extend({}, $.fn.modal.defaults)
|
58
|
+
this.settings = $.extend({}, $.fn.modal.defaults, options)
|
57
59
|
this.$element = $(content)
|
58
60
|
.delegate('.close', 'click.modal', $.proxy(this.hide, this))
|
59
61
|
|
60
|
-
if (
|
61
|
-
|
62
|
-
|
63
|
-
if ( options.show ) {
|
64
|
-
this.show()
|
65
|
-
}
|
62
|
+
if ( this.settings.show ) {
|
63
|
+
this.show()
|
66
64
|
}
|
67
65
|
|
68
66
|
return this
|
@@ -81,17 +79,22 @@
|
|
81
79
|
|
82
80
|
escape.call(this)
|
83
81
|
backdrop.call(this, function () {
|
82
|
+
var transition = $.support.transition && that.$element.hasClass('fade')
|
83
|
+
|
84
84
|
that.$element
|
85
85
|
.appendTo(document.body)
|
86
86
|
.show()
|
87
87
|
|
88
|
-
if (
|
89
|
-
that.$
|
88
|
+
if (transition) {
|
89
|
+
that.$element[0].offsetWidth // force reflow
|
90
90
|
}
|
91
91
|
|
92
|
-
that.$element
|
93
|
-
|
94
|
-
|
92
|
+
that.$element.addClass('in')
|
93
|
+
|
94
|
+
transition ?
|
95
|
+
that.$element.one(transitionEnd, function () { that.$element.trigger('shown') }) :
|
96
|
+
that.$element.trigger('shown')
|
97
|
+
|
95
98
|
})
|
96
99
|
|
97
100
|
return this
|
@@ -100,6 +103,10 @@
|
|
100
103
|
, hide: function (e) {
|
101
104
|
e && e.preventDefault()
|
102
105
|
|
106
|
+
if ( !this.isShown ) {
|
107
|
+
return this
|
108
|
+
}
|
109
|
+
|
103
110
|
var that = this
|
104
111
|
this.isShown = false
|
105
112
|
|
@@ -109,17 +116,9 @@
|
|
109
116
|
.trigger('hide')
|
110
117
|
.removeClass('in')
|
111
118
|
|
112
|
-
function removeElement () {
|
113
|
-
that.$element
|
114
|
-
.hide()
|
115
|
-
.trigger('hidden')
|
116
|
-
|
117
|
-
backdrop.call(that)
|
118
|
-
}
|
119
|
-
|
120
119
|
$.support.transition && this.$element.hasClass('fade') ?
|
121
|
-
|
122
|
-
|
120
|
+
hideWithTransition.call(this) :
|
121
|
+
hideModal.call(this)
|
123
122
|
|
124
123
|
return this
|
125
124
|
}
|
@@ -130,6 +129,28 @@
|
|
130
129
|
/* MODAL PRIVATE METHODS
|
131
130
|
* ===================== */
|
132
131
|
|
132
|
+
function hideWithTransition() {
|
133
|
+
// firefox drops transitionEnd events :{o
|
134
|
+
var that = this
|
135
|
+
, timeout = setTimeout(function () {
|
136
|
+
that.$element.unbind(transitionEnd)
|
137
|
+
hideModal.call(that)
|
138
|
+
}, 500)
|
139
|
+
|
140
|
+
this.$element.one(transitionEnd, function () {
|
141
|
+
clearTimeout(timeout)
|
142
|
+
hideModal.call(that)
|
143
|
+
})
|
144
|
+
}
|
145
|
+
|
146
|
+
function hideModal (that) {
|
147
|
+
this.$element
|
148
|
+
.hide()
|
149
|
+
.trigger('hidden')
|
150
|
+
|
151
|
+
backdrop.call(this)
|
152
|
+
}
|
153
|
+
|
133
154
|
function backdrop ( callback ) {
|
134
155
|
var that = this
|
135
156
|
, animate = this.$element.hasClass('fade') ? 'fade' : ''
|
@@ -144,31 +165,32 @@
|
|
144
165
|
}
|
145
166
|
|
146
167
|
if ( doAnimate ) {
|
147
|
-
|
168
|
+
this.$backdrop[0].offsetWidth // force reflow
|
148
169
|
}
|
149
170
|
|
150
|
-
|
171
|
+
this.$backdrop.addClass('in')
|
151
172
|
|
152
173
|
doAnimate ?
|
153
|
-
|
174
|
+
this.$backdrop.one(transitionEnd, callback) :
|
154
175
|
callback()
|
155
176
|
|
156
177
|
} else if ( !this.isShown && this.$backdrop ) {
|
157
178
|
this.$backdrop.removeClass('in')
|
158
179
|
|
159
|
-
function removeElement() {
|
160
|
-
that.$backdrop.remove()
|
161
|
-
that.$backdrop = null
|
162
|
-
}
|
163
|
-
|
164
180
|
$.support.transition && this.$element.hasClass('fade')?
|
165
|
-
this.$backdrop.one(transitionEnd,
|
166
|
-
|
181
|
+
this.$backdrop.one(transitionEnd, $.proxy(removeBackdrop, this)) :
|
182
|
+
removeBackdrop.call(this)
|
183
|
+
|
167
184
|
} else if ( callback ) {
|
168
185
|
callback()
|
169
186
|
}
|
170
187
|
}
|
171
188
|
|
189
|
+
function removeBackdrop() {
|
190
|
+
this.$backdrop.remove()
|
191
|
+
this.$backdrop = null
|
192
|
+
}
|
193
|
+
|
172
194
|
function escape() {
|
173
195
|
var that = this
|
174
196
|
if ( this.isShown && this.settings.keyboard ) {
|
@@ -220,7 +242,7 @@
|
|
220
242
|
$.fn.modal.defaults = {
|
221
243
|
backdrop: false
|
222
244
|
, keyboard: false
|
223
|
-
, show:
|
245
|
+
, show: false
|
224
246
|
}
|
225
247
|
|
226
248
|
|
@@ -235,4 +257,4 @@
|
|
235
257
|
})
|
236
258
|
})
|
237
259
|
|
238
|
-
}( window.jQuery || window.ender )
|
260
|
+
}( window.jQuery || window.ender );
|
data/vendor/assets/javascripts/{bootstrap-popover.js → twitter/bootstrap/bootstrap-popover.js}
RENAMED
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ===========================================================
|
2
|
-
* bootstrap-popover.js v1.
|
2
|
+
* bootstrap-popover.js v1.4.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#popover
|
4
4
|
* ===========================================================
|
5
5
|
* Copyright 2011 Twitter, Inc.
|
@@ -20,6 +20,8 @@
|
|
20
20
|
|
21
21
|
!function( $ ) {
|
22
22
|
|
23
|
+
"use strict"
|
24
|
+
|
23
25
|
var Popover = function ( element, options ) {
|
24
26
|
this.$element = $(element)
|
25
27
|
this.options = options
|
@@ -35,27 +37,32 @@
|
|
35
37
|
setContent: function () {
|
36
38
|
var $tip = this.tip()
|
37
39
|
$tip.find('.title')[this.options.html ? 'html' : 'text'](this.getTitle())
|
38
|
-
$tip.find('.content
|
40
|
+
$tip.find('.content > *')[this.options.html ? 'html' : 'text'](this.getContent())
|
39
41
|
$tip[0].className = 'popover'
|
40
42
|
}
|
41
43
|
|
44
|
+
, hasContent: function () {
|
45
|
+
return this.getTitle() || this.getContent()
|
46
|
+
}
|
47
|
+
|
42
48
|
, getContent: function () {
|
43
|
-
var
|
49
|
+
var content
|
44
50
|
, $e = this.$element
|
45
51
|
, o = this.options
|
46
52
|
|
47
53
|
if (typeof this.options.content == 'string') {
|
48
|
-
content = $e.attr(
|
54
|
+
content = $e.attr(this.options.content)
|
49
55
|
} else if (typeof this.options.content == 'function') {
|
50
56
|
content = this.options.content.call(this.$element[0])
|
51
57
|
}
|
58
|
+
|
52
59
|
return content
|
53
60
|
}
|
54
61
|
|
55
62
|
, tip: function() {
|
56
63
|
if (!this.$tip) {
|
57
64
|
this.$tip = $('<div class="popover" />')
|
58
|
-
.html(
|
65
|
+
.html(this.options.template)
|
59
66
|
}
|
60
67
|
return this.$tip
|
61
68
|
}
|
@@ -72,6 +79,12 @@
|
|
72
79
|
return this
|
73
80
|
}
|
74
81
|
|
75
|
-
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
|
82
|
+
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
|
83
|
+
placement: 'right'
|
84
|
+
, content: 'data-content'
|
85
|
+
, template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
|
86
|
+
})
|
87
|
+
|
88
|
+
$.fn.twipsy.rejectAttrOptions.push( 'content' )
|
76
89
|
|
77
|
-
}( window.jQuery || window.ender )
|
90
|
+
}( window.jQuery || window.ender );
|
data/vendor/assets/javascripts/{bootstrap-scrollspy.js → twitter/bootstrap/bootstrap-scrollspy.js}
RENAMED
@@ -1,5 +1,5 @@
|
|
1
1
|
/* =============================================================
|
2
|
-
* bootstrap-scrollspy.js v1.
|
2
|
+
* bootstrap-scrollspy.js v1.4.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
4
4
|
* =============================================================
|
5
5
|
* Copyright 2011 Twitter, Inc.
|
@@ -20,6 +20,8 @@
|
|
20
20
|
|
21
21
|
!function ( $ ) {
|
22
22
|
|
23
|
+
"use strict"
|
24
|
+
|
23
25
|
var $window = $(window)
|
24
26
|
|
25
27
|
function ScrollSpy( topbar, selector ) {
|
@@ -102,4 +104,4 @@
|
|
102
104
|
$('body').scrollSpy('[data-scrollspy] li > a')
|
103
105
|
})
|
104
106
|
|
105
|
-
}( window.jQuery || window.ender )
|
107
|
+
}( window.jQuery || window.ender );
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ========================================================
|
2
|
-
* bootstrap-tabs.js v1.
|
2
|
+
* bootstrap-tabs.js v1.4.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
4
4
|
* ========================================================
|
5
5
|
* Copyright 2011 Twitter, Inc.
|
@@ -20,28 +20,46 @@
|
|
20
20
|
|
21
21
|
!function( $ ){
|
22
22
|
|
23
|
+
"use strict"
|
24
|
+
|
23
25
|
function activate ( element, container ) {
|
24
|
-
container
|
26
|
+
container
|
27
|
+
.find('> .active')
|
28
|
+
.removeClass('active')
|
29
|
+
.find('> .dropdown-menu > .active')
|
30
|
+
.removeClass('active')
|
31
|
+
|
25
32
|
element.addClass('active')
|
33
|
+
|
34
|
+
if ( element.parent('.dropdown-menu') ) {
|
35
|
+
element.closest('li.dropdown').addClass('active')
|
36
|
+
}
|
26
37
|
}
|
27
38
|
|
28
39
|
function tab( e ) {
|
29
40
|
var $this = $(this)
|
41
|
+
, $ul = $this.closest('ul:not(.dropdown-menu)')
|
30
42
|
, href = $this.attr('href')
|
31
|
-
,
|
32
|
-
, $
|
43
|
+
, previous
|
44
|
+
, $href
|
33
45
|
|
34
|
-
if (/^#\w+/.test(href)) {
|
46
|
+
if ( /^#\w+/.test(href) ) {
|
35
47
|
e.preventDefault()
|
36
48
|
|
37
|
-
if ($this.hasClass('active')) {
|
49
|
+
if ( $this.parent('li').hasClass('active') ) {
|
38
50
|
return
|
39
51
|
}
|
40
52
|
|
53
|
+
previous = $ul.find('.active a').last()[0]
|
41
54
|
$href = $(href)
|
42
55
|
|
43
56
|
activate($this.parent('li'), $ul)
|
44
57
|
activate($href, $href.parent())
|
58
|
+
|
59
|
+
$this.trigger({
|
60
|
+
type: 'change'
|
61
|
+
, relatedTarget: previous
|
62
|
+
})
|
45
63
|
}
|
46
64
|
}
|
47
65
|
|
@@ -59,4 +77,4 @@
|
|
59
77
|
$('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
|
60
78
|
})
|
61
79
|
|
62
|
-
}( window.jQuery || window.ender )
|
80
|
+
}( window.jQuery || window.ender );
|
data/vendor/assets/javascripts/{bootstrap-twipsy.js → twitter/bootstrap/bootstrap-twipsy.js}
RENAMED
@@ -1,5 +1,5 @@
|
|
1
1
|
/* ==========================================================
|
2
|
-
* bootstrap-twipsy.js v1.
|
2
|
+
* bootstrap-twipsy.js v1.4.0
|
3
3
|
* http://twitter.github.com/bootstrap/javascript.html#twipsy
|
4
4
|
* Adapted from the original jQuery.tipsy by Jason Frame
|
5
5
|
* ==========================================================
|
@@ -21,6 +21,8 @@
|
|
21
21
|
|
22
22
|
!function( $ ) {
|
23
23
|
|
24
|
+
"use strict"
|
25
|
+
|
24
26
|
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
|
25
27
|
* ======================================================= */
|
26
28
|
|
@@ -70,7 +72,7 @@
|
|
70
72
|
, $tip
|
71
73
|
, tp
|
72
74
|
|
73
|
-
if (this.
|
75
|
+
if (this.hasContent() && this.enabled) {
|
74
76
|
$tip = this.tip()
|
75
77
|
this.setContent()
|
76
78
|
|
@@ -90,7 +92,8 @@
|
|
90
92
|
|
91
93
|
actualWidth = $tip[0].offsetWidth
|
92
94
|
actualHeight = $tip[0].offsetHeight
|
93
|
-
|
95
|
+
|
96
|
+
placement = maybeCall(this.options.placement, this, [ $tip[0], this.$element[0] ])
|
94
97
|
|
95
98
|
switch (placement) {
|
96
99
|
case 'below':
|
@@ -142,6 +145,10 @@
|
|
142
145
|
}
|
143
146
|
}
|
144
147
|
|
148
|
+
, hasContent: function () {
|
149
|
+
return this.getTitle()
|
150
|
+
}
|
151
|
+
|
145
152
|
, getTitle: function() {
|
146
153
|
var title
|
147
154
|
, $e = this.$element
|
@@ -161,10 +168,7 @@
|
|
161
168
|
}
|
162
169
|
|
163
170
|
, tip: function() {
|
164
|
-
|
165
|
-
this.$tip = $('<div class="twipsy" />').html('<div class="twipsy-arrow"></div><div class="twipsy-inner"></div>')
|
166
|
-
}
|
167
|
-
return this.$tip
|
171
|
+
return this.$tip = this.$tip || $('<div class="twipsy" />').html(this.options.template)
|
168
172
|
}
|
169
173
|
|
170
174
|
, validate: function() {
|
@@ -187,21 +191,20 @@
|
|
187
191
|
this.enabled = !this.enabled
|
188
192
|
}
|
189
193
|
|
194
|
+
, toggle: function () {
|
195
|
+
this[this.tip().hasClass('in') ? 'hide' : 'show']()
|
196
|
+
}
|
197
|
+
|
190
198
|
}
|
191
199
|
|
192
200
|
|
193
201
|
/* TWIPSY PRIVATE METHODS
|
194
202
|
* ====================== */
|
195
203
|
|
196
|
-
|
197
|
-
|
198
|
-
maybeCall: function ( thing, ctx ) {
|
199
|
-
return (typeof thing == 'function') ? (thing.call(ctx)) : thing
|
200
|
-
}
|
201
|
-
|
204
|
+
function maybeCall ( thing, ctx, args ) {
|
205
|
+
return typeof thing == 'function' ? thing.apply(ctx, args) : thing
|
202
206
|
}
|
203
207
|
|
204
|
-
|
205
208
|
/* TWIPSY PLUGIN DEFINITION
|
206
209
|
* ======================== */
|
207
210
|
|
@@ -298,10 +301,21 @@
|
|
298
301
|
, offset: 0
|
299
302
|
, title: 'title'
|
300
303
|
, trigger: 'hover'
|
304
|
+
, template: '<div class="twipsy-arrow"></div><div class="twipsy-inner"></div>'
|
301
305
|
}
|
302
306
|
|
307
|
+
$.fn.twipsy.rejectAttrOptions = [ 'title' ]
|
308
|
+
|
303
309
|
$.fn.twipsy.elementOptions = function(ele, options) {
|
304
|
-
|
310
|
+
var data = $(ele).data()
|
311
|
+
, rejects = $.fn.twipsy.rejectAttrOptions
|
312
|
+
, i = rejects.length
|
313
|
+
|
314
|
+
while (i--) {
|
315
|
+
delete data[rejects[i]]
|
316
|
+
}
|
317
|
+
|
318
|
+
return $.extend({}, options, data)
|
305
319
|
}
|
306
320
|
|
307
|
-
}( window.jQuery || window.ender )
|
321
|
+
}( window.jQuery || window.ender );
|
Binary file
|
@@ -1,12 +1,12 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap v1.
|
2
|
+
* Bootstrap v1.4.0
|
3
3
|
*
|
4
4
|
* Copyright 2011 Twitter, Inc
|
5
5
|
* Licensed under the Apache License v2.0
|
6
6
|
* http://www.apache.org/licenses/LICENSE-2.0
|
7
7
|
*
|
8
8
|
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
9
|
-
* Date:
|
9
|
+
* Date: Sat Nov 5 17:07:48 PDT 2011
|
10
10
|
*/
|
11
11
|
/* Reset.less
|
12
12
|
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
|
@@ -173,17 +173,15 @@ textarea {
|
|
173
173
|
/* Variables.less
|
174
174
|
* Variables to customize the look and feel of Bootstrap
|
175
175
|
* ----------------------------------------------------- */
|
176
|
-
/*
|
176
|
+
/* Mixins.less
|
177
177
|
* Snippets of reusable CSS to develop faster and keep code readable
|
178
178
|
* ----------------------------------------------------------------- */
|
179
179
|
/*
|
180
180
|
* Scaffolding
|
181
181
|
* Basic and global styles for generating a grid system, structural layout, and page templates
|
182
182
|
* ------------------------------------------------------------------------------------------- */
|
183
|
-
html, body {
|
184
|
-
background-color: #ffffff;
|
185
|
-
}
|
186
183
|
body {
|
184
|
+
background-color: #ffffff;
|
187
185
|
margin: 0;
|
188
186
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
189
187
|
font-size: 13px;
|
@@ -201,7 +199,6 @@ body {
|
|
201
199
|
display: table;
|
202
200
|
content: "";
|
203
201
|
zoom: 1;
|
204
|
-
*display: inline;
|
205
202
|
}
|
206
203
|
.container:after {
|
207
204
|
clear: both;
|
@@ -217,13 +214,14 @@ body {
|
|
217
214
|
display: table;
|
218
215
|
content: "";
|
219
216
|
zoom: 1;
|
220
|
-
*display: inline;
|
221
217
|
}
|
222
218
|
.container-fluid:after {
|
223
219
|
clear: both;
|
224
220
|
}
|
225
221
|
.container-fluid > .sidebar {
|
226
|
-
|
222
|
+
position: absolute;
|
223
|
+
top: 0;
|
224
|
+
left: 20px;
|
227
225
|
width: 220px;
|
228
226
|
}
|
229
227
|
.container-fluid > .content {
|
@@ -259,12 +257,11 @@ a:hover {
|
|
259
257
|
display: table;
|
260
258
|
content: "";
|
261
259
|
zoom: 1;
|
262
|
-
*display: inline;
|
263
260
|
}
|
264
261
|
.row:after {
|
265
262
|
clear: both;
|
266
263
|
}
|
267
|
-
[class*="span"] {
|
264
|
+
.row > [class*="span"] {
|
268
265
|
display: inline;
|
269
266
|
float: left;
|
270
267
|
margin-left: 20px;
|
@@ -341,40 +338,40 @@ a:hover {
|
|
341
338
|
.span24 {
|
342
339
|
width: 1420px;
|
343
340
|
}
|
344
|
-
.offset1 {
|
341
|
+
.row > .offset1 {
|
345
342
|
margin-left: 80px;
|
346
343
|
}
|
347
|
-
.offset2 {
|
344
|
+
.row > .offset2 {
|
348
345
|
margin-left: 140px;
|
349
346
|
}
|
350
|
-
.offset3 {
|
347
|
+
.row > .offset3 {
|
351
348
|
margin-left: 200px;
|
352
349
|
}
|
353
|
-
.offset4 {
|
350
|
+
.row > .offset4 {
|
354
351
|
margin-left: 260px;
|
355
352
|
}
|
356
|
-
.offset5 {
|
353
|
+
.row > .offset5 {
|
357
354
|
margin-left: 320px;
|
358
355
|
}
|
359
|
-
.offset6 {
|
356
|
+
.row > .offset6 {
|
360
357
|
margin-left: 380px;
|
361
358
|
}
|
362
|
-
.offset7 {
|
359
|
+
.row > .offset7 {
|
363
360
|
margin-left: 440px;
|
364
361
|
}
|
365
|
-
.offset8 {
|
362
|
+
.row > .offset8 {
|
366
363
|
margin-left: 500px;
|
367
364
|
}
|
368
|
-
.offset9 {
|
365
|
+
.row > .offset9 {
|
369
366
|
margin-left: 560px;
|
370
367
|
}
|
371
|
-
.offset10 {
|
368
|
+
.row > .offset10 {
|
372
369
|
margin-left: 620px;
|
373
370
|
}
|
374
|
-
.offset11 {
|
371
|
+
.row > .offset11 {
|
375
372
|
margin-left: 680px;
|
376
373
|
}
|
377
|
-
.offset12 {
|
374
|
+
.row > .offset12 {
|
378
375
|
margin-left: 740px;
|
379
376
|
}
|
380
377
|
.span-one-third {
|
@@ -598,7 +595,6 @@ form .clearfix:before, form .clearfix:after {
|
|
598
595
|
display: table;
|
599
596
|
content: "";
|
600
597
|
zoom: 1;
|
601
|
-
*display: inline;
|
602
598
|
}
|
603
599
|
form .clearfix:after {
|
604
600
|
clear: both;
|
@@ -643,7 +639,9 @@ select,
|
|
643
639
|
-moz-border-radius: 3px;
|
644
640
|
border-radius: 3px;
|
645
641
|
}
|
646
|
-
|
642
|
+
select {
|
643
|
+
padding: initial;
|
644
|
+
}
|
647
645
|
input[type=checkbox], input[type=radio] {
|
648
646
|
width: auto;
|
649
647
|
height: auto;
|
@@ -670,6 +668,7 @@ input[type=button], input[type=reset], input[type=submit] {
|
|
670
668
|
}
|
671
669
|
select, input[type=file] {
|
672
670
|
height: 27px;
|
671
|
+
*height: auto;
|
673
672
|
line-height: 27px;
|
674
673
|
*margin-top: 4px;
|
675
674
|
/* For IE7, add top margin to align select with labels */
|
@@ -677,6 +676,7 @@ select, input[type=file] {
|
|
677
676
|
}
|
678
677
|
select[multiple] {
|
679
678
|
height: inherit;
|
679
|
+
background-color: #ffffff;
|
680
680
|
}
|
681
681
|
textarea {
|
682
682
|
height: auto;
|
@@ -719,33 +719,59 @@ input[type=file]:focus, input[type=checkbox]:focus, select:focus {
|
|
719
719
|
box-shadow: none;
|
720
720
|
outline: 1px dotted #666;
|
721
721
|
}
|
722
|
-
form
|
723
|
-
|
724
|
-
padding: 10px 0;
|
725
|
-
margin: -10px 0 10px;
|
726
|
-
-webkit-border-radius: 4px;
|
727
|
-
-moz-border-radius: 4px;
|
728
|
-
border-radius: 4px;
|
722
|
+
form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline {
|
723
|
+
color: #b94a48;
|
729
724
|
}
|
730
|
-
form
|
731
|
-
color: #
|
725
|
+
form .clearfix.error input, form .clearfix.error textarea {
|
726
|
+
color: #b94a48;
|
727
|
+
border-color: #ee5f5b;
|
728
|
+
}
|
729
|
+
form .clearfix.error input:focus, form .clearfix.error textarea:focus {
|
730
|
+
border-color: #e9322d;
|
731
|
+
-webkit-box-shadow: 0 0 6px #f8b9b7;
|
732
|
+
-moz-box-shadow: 0 0 6px #f8b9b7;
|
733
|
+
box-shadow: 0 0 6px #f8b9b7;
|
734
|
+
}
|
735
|
+
form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on {
|
736
|
+
color: #b94a48;
|
737
|
+
background-color: #fce6e6;
|
738
|
+
border-color: #b94a48;
|
739
|
+
}
|
740
|
+
form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline {
|
741
|
+
color: #c09853;
|
742
|
+
}
|
743
|
+
form .clearfix.warning input, form .clearfix.warning textarea {
|
744
|
+
color: #c09853;
|
745
|
+
border-color: #ccae64;
|
746
|
+
}
|
747
|
+
form .clearfix.warning input:focus, form .clearfix.warning textarea:focus {
|
748
|
+
border-color: #be9a3f;
|
749
|
+
-webkit-box-shadow: 0 0 6px #e5d6b1;
|
750
|
+
-moz-box-shadow: 0 0 6px #e5d6b1;
|
751
|
+
box-shadow: 0 0 6px #e5d6b1;
|
732
752
|
}
|
733
|
-
form
|
734
|
-
|
735
|
-
-
|
736
|
-
-
|
737
|
-
box-shadow: 0 0 3px rgba(171, 41, 32, 0.25);
|
753
|
+
form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on {
|
754
|
+
color: #c09853;
|
755
|
+
background-color: #d2b877;
|
756
|
+
border-color: #c09853;
|
738
757
|
}
|
739
|
-
form
|
740
|
-
|
741
|
-
-webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
|
742
|
-
-moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
|
743
|
-
box-shadow: 0 0 6px rgba(171, 41, 32, 0.5);
|
758
|
+
form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline {
|
759
|
+
color: #468847;
|
744
760
|
}
|
745
|
-
form
|
746
|
-
|
747
|
-
border-color: #
|
748
|
-
|
761
|
+
form .clearfix.success input, form .clearfix.success textarea {
|
762
|
+
color: #468847;
|
763
|
+
border-color: #57a957;
|
764
|
+
}
|
765
|
+
form .clearfix.success input:focus, form .clearfix.success textarea:focus {
|
766
|
+
border-color: #458845;
|
767
|
+
-webkit-box-shadow: 0 0 6px #9acc9a;
|
768
|
+
-moz-box-shadow: 0 0 6px #9acc9a;
|
769
|
+
box-shadow: 0 0 6px #9acc9a;
|
770
|
+
}
|
771
|
+
form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on {
|
772
|
+
color: #468847;
|
773
|
+
background-color: #bcddbc;
|
774
|
+
border-color: #468847;
|
749
775
|
}
|
750
776
|
.input-mini,
|
751
777
|
input.mini,
|
@@ -786,97 +812,97 @@ select.xxlarge {
|
|
786
812
|
textarea.xxlarge {
|
787
813
|
overflow-y: auto;
|
788
814
|
}
|
789
|
-
input.span1, textarea.span1
|
815
|
+
input.span1, textarea.span1 {
|
790
816
|
display: inline-block;
|
791
817
|
float: none;
|
792
818
|
width: 30px;
|
793
819
|
margin-left: 0;
|
794
820
|
}
|
795
|
-
input.span2, textarea.span2
|
821
|
+
input.span2, textarea.span2 {
|
796
822
|
display: inline-block;
|
797
823
|
float: none;
|
798
824
|
width: 90px;
|
799
825
|
margin-left: 0;
|
800
826
|
}
|
801
|
-
input.span3, textarea.span3
|
827
|
+
input.span3, textarea.span3 {
|
802
828
|
display: inline-block;
|
803
829
|
float: none;
|
804
830
|
width: 150px;
|
805
831
|
margin-left: 0;
|
806
832
|
}
|
807
|
-
input.span4, textarea.span4
|
833
|
+
input.span4, textarea.span4 {
|
808
834
|
display: inline-block;
|
809
835
|
float: none;
|
810
836
|
width: 210px;
|
811
837
|
margin-left: 0;
|
812
838
|
}
|
813
|
-
input.span5, textarea.span5
|
839
|
+
input.span5, textarea.span5 {
|
814
840
|
display: inline-block;
|
815
841
|
float: none;
|
816
842
|
width: 270px;
|
817
843
|
margin-left: 0;
|
818
844
|
}
|
819
|
-
input.span6, textarea.span6
|
845
|
+
input.span6, textarea.span6 {
|
820
846
|
display: inline-block;
|
821
847
|
float: none;
|
822
848
|
width: 330px;
|
823
849
|
margin-left: 0;
|
824
850
|
}
|
825
|
-
input.span7, textarea.span7
|
851
|
+
input.span7, textarea.span7 {
|
826
852
|
display: inline-block;
|
827
853
|
float: none;
|
828
854
|
width: 390px;
|
829
855
|
margin-left: 0;
|
830
856
|
}
|
831
|
-
input.span8, textarea.span8
|
857
|
+
input.span8, textarea.span8 {
|
832
858
|
display: inline-block;
|
833
859
|
float: none;
|
834
860
|
width: 450px;
|
835
861
|
margin-left: 0;
|
836
862
|
}
|
837
|
-
input.span9, textarea.span9
|
863
|
+
input.span9, textarea.span9 {
|
838
864
|
display: inline-block;
|
839
865
|
float: none;
|
840
866
|
width: 510px;
|
841
867
|
margin-left: 0;
|
842
868
|
}
|
843
|
-
input.span10, textarea.span10
|
869
|
+
input.span10, textarea.span10 {
|
844
870
|
display: inline-block;
|
845
871
|
float: none;
|
846
872
|
width: 570px;
|
847
873
|
margin-left: 0;
|
848
874
|
}
|
849
|
-
input.span11, textarea.span11
|
875
|
+
input.span11, textarea.span11 {
|
850
876
|
display: inline-block;
|
851
877
|
float: none;
|
852
878
|
width: 630px;
|
853
879
|
margin-left: 0;
|
854
880
|
}
|
855
|
-
input.span12, textarea.span12
|
881
|
+
input.span12, textarea.span12 {
|
856
882
|
display: inline-block;
|
857
883
|
float: none;
|
858
884
|
width: 690px;
|
859
885
|
margin-left: 0;
|
860
886
|
}
|
861
|
-
input.span13, textarea.span13
|
887
|
+
input.span13, textarea.span13 {
|
862
888
|
display: inline-block;
|
863
889
|
float: none;
|
864
890
|
width: 750px;
|
865
891
|
margin-left: 0;
|
866
892
|
}
|
867
|
-
input.span14, textarea.span14
|
893
|
+
input.span14, textarea.span14 {
|
868
894
|
display: inline-block;
|
869
895
|
float: none;
|
870
896
|
width: 810px;
|
871
897
|
margin-left: 0;
|
872
898
|
}
|
873
|
-
input.span15, textarea.span15
|
899
|
+
input.span15, textarea.span15 {
|
874
900
|
display: inline-block;
|
875
901
|
float: none;
|
876
902
|
width: 870px;
|
877
903
|
margin-left: 0;
|
878
904
|
}
|
879
|
-
input.span16, textarea.span16
|
905
|
+
input.span16, textarea.span16 {
|
880
906
|
display: inline-block;
|
881
907
|
float: none;
|
882
908
|
width: 930px;
|
@@ -912,7 +938,7 @@ textarea[readonly] {
|
|
912
938
|
text-decoration: underline;
|
913
939
|
}
|
914
940
|
.help-inline, .help-block {
|
915
|
-
font-size:
|
941
|
+
font-size: 13px;
|
916
942
|
line-height: 18px;
|
917
943
|
color: #bfbfbf;
|
918
944
|
}
|
@@ -932,15 +958,6 @@ textarea[readonly] {
|
|
932
958
|
.inline-inputs {
|
933
959
|
color: #808080;
|
934
960
|
}
|
935
|
-
.inline-inputs span, .inline-inputs input {
|
936
|
-
display: inline-block;
|
937
|
-
}
|
938
|
-
.inline-inputs input.mini {
|
939
|
-
width: 60px;
|
940
|
-
}
|
941
|
-
.inline-inputs input.small {
|
942
|
-
width: 90px;
|
943
|
-
}
|
944
961
|
.inline-inputs span {
|
945
962
|
padding: 0 2px 0 1px;
|
946
963
|
}
|
@@ -1006,6 +1023,7 @@ textarea[readonly] {
|
|
1006
1023
|
float: none;
|
1007
1024
|
width: auto;
|
1008
1025
|
padding: 0;
|
1026
|
+
margin-left: 20px;
|
1009
1027
|
line-height: 18px;
|
1010
1028
|
text-align: left;
|
1011
1029
|
white-space: normal;
|
@@ -1030,6 +1048,8 @@ textarea[readonly] {
|
|
1030
1048
|
}
|
1031
1049
|
.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
|
1032
1050
|
margin-bottom: 0;
|
1051
|
+
margin-left: -20px;
|
1052
|
+
float: left;
|
1033
1053
|
}
|
1034
1054
|
.form-stacked {
|
1035
1055
|
padding-left: 20px;
|
@@ -1084,15 +1104,8 @@ table {
|
|
1084
1104
|
width: 100%;
|
1085
1105
|
margin-bottom: 18px;
|
1086
1106
|
padding: 0;
|
1087
|
-
border-collapse: separate;
|
1088
|
-
*border-collapse: collapse;
|
1089
|
-
/* IE7, collapse table to remove spacing */
|
1090
|
-
|
1091
1107
|
font-size: 13px;
|
1092
|
-
border:
|
1093
|
-
-webkit-border-radius: 4px;
|
1094
|
-
-moz-border-radius: 4px;
|
1095
|
-
border-radius: 4px;
|
1108
|
+
border-collapse: collapse;
|
1096
1109
|
}
|
1097
1110
|
table th, table td {
|
1098
1111
|
padding: 10px 10px 9px;
|
@@ -1103,47 +1116,109 @@ table th {
|
|
1103
1116
|
padding-top: 9px;
|
1104
1117
|
font-weight: bold;
|
1105
1118
|
vertical-align: middle;
|
1106
|
-
border-bottom: 1px solid #ddd;
|
1107
1119
|
}
|
1108
1120
|
table td {
|
1109
1121
|
vertical-align: top;
|
1122
|
+
border-top: 1px solid #ddd;
|
1110
1123
|
}
|
1111
|
-
table
|
1112
|
-
border-left: 1px solid #ddd;
|
1113
|
-
}
|
1114
|
-
table tr + tr td {
|
1124
|
+
table tbody th {
|
1115
1125
|
border-top: 1px solid #ddd;
|
1126
|
+
vertical-align: top;
|
1127
|
+
}
|
1128
|
+
.condensed-table th, .condensed-table td {
|
1129
|
+
padding: 5px 5px 4px;
|
1130
|
+
}
|
1131
|
+
.bordered-table {
|
1132
|
+
border: 1px solid #ddd;
|
1133
|
+
border-collapse: separate;
|
1134
|
+
*border-collapse: collapse;
|
1135
|
+
/* IE7, collapse table to remove spacing */
|
1136
|
+
|
1137
|
+
-webkit-border-radius: 4px;
|
1138
|
+
-moz-border-radius: 4px;
|
1139
|
+
border-radius: 4px;
|
1140
|
+
}
|
1141
|
+
.bordered-table th + th, .bordered-table td + td, .bordered-table th + td {
|
1142
|
+
border-left: 1px solid #ddd;
|
1116
1143
|
}
|
1117
|
-
table tbody tr:first-child td:first-child {
|
1144
|
+
.bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child {
|
1118
1145
|
-webkit-border-radius: 4px 0 0 0;
|
1119
1146
|
-moz-border-radius: 4px 0 0 0;
|
1120
1147
|
border-radius: 4px 0 0 0;
|
1121
1148
|
}
|
1122
|
-
table tbody tr:first-child td:last-child {
|
1149
|
+
.bordered-table thead tr:first-child th:last-child, .bordered-table tbody tr:first-child td:last-child {
|
1123
1150
|
-webkit-border-radius: 0 4px 0 0;
|
1124
1151
|
-moz-border-radius: 0 4px 0 0;
|
1125
1152
|
border-radius: 0 4px 0 0;
|
1126
1153
|
}
|
1127
|
-
table tbody tr:last-child td:first-child {
|
1154
|
+
.bordered-table tbody tr:last-child td:first-child {
|
1128
1155
|
-webkit-border-radius: 0 0 0 4px;
|
1129
1156
|
-moz-border-radius: 0 0 0 4px;
|
1130
1157
|
border-radius: 0 0 0 4px;
|
1131
1158
|
}
|
1132
|
-
table tbody tr:last-child td:last-child {
|
1159
|
+
.bordered-table tbody tr:last-child td:last-child {
|
1133
1160
|
-webkit-border-radius: 0 0 4px 0;
|
1134
1161
|
-moz-border-radius: 0 0 4px 0;
|
1135
1162
|
border-radius: 0 0 4px 0;
|
1136
1163
|
}
|
1137
|
-
.
|
1164
|
+
table .span1 {
|
1165
|
+
width: 20px;
|
1166
|
+
}
|
1167
|
+
table .span2 {
|
1168
|
+
width: 60px;
|
1169
|
+
}
|
1170
|
+
table .span3 {
|
1171
|
+
width: 100px;
|
1172
|
+
}
|
1173
|
+
table .span4 {
|
1174
|
+
width: 140px;
|
1175
|
+
}
|
1176
|
+
table .span5 {
|
1177
|
+
width: 180px;
|
1178
|
+
}
|
1179
|
+
table .span6 {
|
1180
|
+
width: 220px;
|
1181
|
+
}
|
1182
|
+
table .span7 {
|
1183
|
+
width: 260px;
|
1184
|
+
}
|
1185
|
+
table .span8 {
|
1186
|
+
width: 300px;
|
1187
|
+
}
|
1188
|
+
table .span9 {
|
1189
|
+
width: 340px;
|
1190
|
+
}
|
1191
|
+
table .span10 {
|
1192
|
+
width: 380px;
|
1193
|
+
}
|
1194
|
+
table .span11 {
|
1195
|
+
width: 420px;
|
1196
|
+
}
|
1197
|
+
table .span12 {
|
1198
|
+
width: 460px;
|
1199
|
+
}
|
1200
|
+
table .span13 {
|
1201
|
+
width: 500px;
|
1202
|
+
}
|
1203
|
+
table .span14 {
|
1204
|
+
width: 540px;
|
1205
|
+
}
|
1206
|
+
table .span15 {
|
1207
|
+
width: 580px;
|
1208
|
+
}
|
1209
|
+
table .span16 {
|
1210
|
+
width: 620px;
|
1211
|
+
}
|
1212
|
+
.zebra-striped tbody tr:nth-child(odd) td, .zebra-striped tbody tr:nth-child(odd) th {
|
1138
1213
|
background-color: #f9f9f9;
|
1139
1214
|
}
|
1140
|
-
.zebra-striped tbody tr:hover td {
|
1215
|
+
.zebra-striped tbody tr:hover td, .zebra-striped tbody tr:hover th {
|
1141
1216
|
background-color: #f5f5f5;
|
1142
1217
|
}
|
1143
|
-
|
1218
|
+
table .header {
|
1144
1219
|
cursor: pointer;
|
1145
1220
|
}
|
1146
|
-
|
1221
|
+
table .header:after {
|
1147
1222
|
content: "";
|
1148
1223
|
float: right;
|
1149
1224
|
margin-top: 7px;
|
@@ -1152,21 +1227,21 @@ table tbody tr:last-child td:last-child {
|
|
1152
1227
|
border-color: #000 transparent;
|
1153
1228
|
visibility: hidden;
|
1154
1229
|
}
|
1155
|
-
|
1230
|
+
table .headerSortUp, table .headerSortDown {
|
1156
1231
|
background-color: rgba(141, 192, 219, 0.25);
|
1157
1232
|
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
|
1158
1233
|
}
|
1159
|
-
|
1234
|
+
table .header:hover:after {
|
1160
1235
|
visibility: visible;
|
1161
1236
|
}
|
1162
|
-
|
1237
|
+
table .headerSortDown:after, table .headerSortDown:hover:after {
|
1163
1238
|
visibility: visible;
|
1164
1239
|
filter: alpha(opacity=60);
|
1165
1240
|
-khtml-opacity: 0.6;
|
1166
1241
|
-moz-opacity: 0.6;
|
1167
1242
|
opacity: 0.6;
|
1168
1243
|
}
|
1169
|
-
|
1244
|
+
table .headerSortUp:after {
|
1170
1245
|
border-bottom: none;
|
1171
1246
|
border-left: 4px solid transparent;
|
1172
1247
|
border-right: 4px solid transparent;
|
@@ -1238,7 +1313,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
|
|
1238
1313
|
color: #bfbfbf;
|
1239
1314
|
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
1240
1315
|
}
|
1241
|
-
.topbar h3 a:hover, .topbar .brand
|
1316
|
+
.topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active > a {
|
1242
1317
|
background-color: #333;
|
1243
1318
|
background-color: rgba(255, 255, 255, 0.05);
|
1244
1319
|
color: #ffffff;
|
@@ -1522,7 +1597,10 @@ a.menu:after, .dropdown-toggle:after {
|
|
1522
1597
|
color: #808080;
|
1523
1598
|
text-shadow: 0 1px 0 #ffffff;
|
1524
1599
|
}
|
1525
|
-
.topbar .dropdown-menu a:hover,
|
1600
|
+
.topbar .dropdown-menu a:hover,
|
1601
|
+
.dropdown-menu a:hover,
|
1602
|
+
.topbar .dropdown-menu a.hover,
|
1603
|
+
.dropdown-menu a.hover {
|
1526
1604
|
background-color: #dddddd;
|
1527
1605
|
background-repeat: repeat-x;
|
1528
1606
|
background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
|
@@ -1554,7 +1632,7 @@ a.menu:after, .dropdown-toggle:after {
|
|
1554
1632
|
display: block;
|
1555
1633
|
}
|
1556
1634
|
.tabs, .pills {
|
1557
|
-
margin: 0 0
|
1635
|
+
margin: 0 0 18px;
|
1558
1636
|
padding: 0;
|
1559
1637
|
list-style: none;
|
1560
1638
|
zoom: 1;
|
@@ -1566,7 +1644,6 @@ a.menu:after, .dropdown-toggle:after {
|
|
1566
1644
|
display: table;
|
1567
1645
|
content: "";
|
1568
1646
|
zoom: 1;
|
1569
|
-
*display: inline;
|
1570
1647
|
}
|
1571
1648
|
.tabs:after, .pills:after {
|
1572
1649
|
clear: both;
|
@@ -1578,18 +1655,18 @@ a.menu:after, .dropdown-toggle:after {
|
|
1578
1655
|
display: block;
|
1579
1656
|
}
|
1580
1657
|
.tabs {
|
1581
|
-
|
1582
|
-
|
1583
|
-
border-
|
1658
|
+
border-color: #ddd;
|
1659
|
+
border-style: solid;
|
1660
|
+
border-width: 0 0 1px;
|
1584
1661
|
}
|
1585
1662
|
.tabs > li {
|
1586
1663
|
position: relative;
|
1587
|
-
|
1664
|
+
margin-bottom: -1px;
|
1588
1665
|
}
|
1589
1666
|
.tabs > li > a {
|
1590
1667
|
padding: 0 15px;
|
1591
1668
|
margin-right: 2px;
|
1592
|
-
line-height:
|
1669
|
+
line-height: 34px;
|
1593
1670
|
border: 1px solid transparent;
|
1594
1671
|
-webkit-border-radius: 4px 4px 0 0;
|
1595
1672
|
-moz-border-radius: 4px 4px 0 0;
|
@@ -1600,11 +1677,12 @@ a.menu:after, .dropdown-toggle:after {
|
|
1600
1677
|
background-color: #eee;
|
1601
1678
|
border-color: #eee #eee #ddd;
|
1602
1679
|
}
|
1603
|
-
.tabs >
|
1680
|
+
.tabs .active > a, .tabs .active > a:hover {
|
1604
1681
|
color: #808080;
|
1605
1682
|
background-color: #ffffff;
|
1606
1683
|
border: 1px solid #ddd;
|
1607
1684
|
border-bottom-color: transparent;
|
1685
|
+
cursor: default;
|
1608
1686
|
}
|
1609
1687
|
.tabs .menu-dropdown, .tabs .dropdown-menu {
|
1610
1688
|
top: 35px;
|
@@ -1624,38 +1702,41 @@ a.menu:after, .dropdown-toggle:after {
|
|
1624
1702
|
.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
|
1625
1703
|
border-top-color: #555;
|
1626
1704
|
}
|
1627
|
-
.tab-content {
|
1628
|
-
clear: both;
|
1629
|
-
}
|
1630
1705
|
.pills a {
|
1631
1706
|
margin: 5px 3px 5px 0;
|
1632
1707
|
padding: 0 15px;
|
1633
|
-
text-shadow: 0 1px 1px #ffffff;
|
1634
1708
|
line-height: 30px;
|
1709
|
+
text-shadow: 0 1px 1px #ffffff;
|
1635
1710
|
-webkit-border-radius: 15px;
|
1636
1711
|
-moz-border-radius: 15px;
|
1637
1712
|
border-radius: 15px;
|
1638
1713
|
}
|
1639
1714
|
.pills a:hover {
|
1640
|
-
background: #00438a;
|
1641
1715
|
color: #ffffff;
|
1642
1716
|
text-decoration: none;
|
1643
1717
|
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
|
1718
|
+
background-color: #00438a;
|
1644
1719
|
}
|
1645
1720
|
.pills .active a {
|
1646
|
-
background: #0069d6;
|
1647
1721
|
color: #ffffff;
|
1648
1722
|
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
|
1723
|
+
background-color: #0069d6;
|
1724
|
+
}
|
1725
|
+
.pills-vertical > li {
|
1726
|
+
float: none;
|
1649
1727
|
}
|
1650
|
-
.tab-content >
|
1728
|
+
.tab-content > .tab-pane,
|
1729
|
+
.pill-content > .pill-pane,
|
1730
|
+
.tab-content > div,
|
1731
|
+
.pill-content > div {
|
1651
1732
|
display: none;
|
1652
1733
|
}
|
1653
1734
|
.tab-content > .active, .pill-content > .active {
|
1654
1735
|
display: block;
|
1655
1736
|
}
|
1656
1737
|
.breadcrumb {
|
1657
|
-
margin: 0 0 18px;
|
1658
1738
|
padding: 7px 14px;
|
1739
|
+
margin: 0 0 18px;
|
1659
1740
|
background-color: #f5f5f5;
|
1660
1741
|
background-repeat: repeat-x;
|
1661
1742
|
background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
|
@@ -1737,6 +1818,10 @@ footer {
|
|
1737
1818
|
.alert-message.info:hover {
|
1738
1819
|
color: #ffffff;
|
1739
1820
|
}
|
1821
|
+
.btn .close, .alert-message .close {
|
1822
|
+
font-family: Arial, sans-serif;
|
1823
|
+
line-height: 18px;
|
1824
|
+
}
|
1740
1825
|
.btn.danger,
|
1741
1826
|
.alert-message.danger,
|
1742
1827
|
.btn.error,
|
@@ -1840,7 +1925,7 @@ footer {
|
|
1840
1925
|
border-color: #0064cd #0064cd #003f81;
|
1841
1926
|
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
1842
1927
|
}
|
1843
|
-
.btn:active {
|
1928
|
+
.btn.active, .btn :active {
|
1844
1929
|
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
|
1845
1930
|
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
|
1846
1931
|
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
|
@@ -1895,10 +1980,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
1895
1980
|
font-weight: bold;
|
1896
1981
|
line-height: 13.5px;
|
1897
1982
|
text-shadow: 0 1px 0 #ffffff;
|
1898
|
-
filter: alpha(opacity=
|
1899
|
-
-khtml-opacity: 0.
|
1900
|
-
-moz-opacity: 0.
|
1901
|
-
opacity: 0.
|
1983
|
+
filter: alpha(opacity=25);
|
1984
|
+
-khtml-opacity: 0.25;
|
1985
|
+
-moz-opacity: 0.25;
|
1986
|
+
opacity: 0.25;
|
1902
1987
|
}
|
1903
1988
|
.close:hover {
|
1904
1989
|
color: #000000;
|
@@ -1937,9 +2022,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
1937
2022
|
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
|
1938
2023
|
}
|
1939
2024
|
.alert-message .close {
|
1940
|
-
|
1941
|
-
|
1942
|
-
|
2025
|
+
margin-top: 1px;
|
2026
|
+
*margin-top: 0;
|
2027
|
+
}
|
2028
|
+
.alert-message a {
|
2029
|
+
font-weight: bold;
|
2030
|
+
color: #404040;
|
2031
|
+
}
|
2032
|
+
.alert-message.danger p a,
|
2033
|
+
.alert-message.error p a,
|
2034
|
+
.alert-message.success p a,
|
2035
|
+
.alert-message.info p a {
|
2036
|
+
color: #ffffff;
|
1943
2037
|
}
|
1944
2038
|
.alert-message h5 {
|
1945
2039
|
line-height: 18px;
|
@@ -1995,6 +2089,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
1995
2089
|
background-color: #ddf4fb;
|
1996
2090
|
border-color: #c6edf9;
|
1997
2091
|
}
|
2092
|
+
.alert-message.block-message.danger p a,
|
2093
|
+
.alert-message.block-message.error p a,
|
2094
|
+
.alert-message.block-message.success p a,
|
2095
|
+
.alert-message.block-message.info p a {
|
2096
|
+
color: #404040;
|
2097
|
+
}
|
1998
2098
|
.pagination {
|
1999
2099
|
height: 36px;
|
2000
2100
|
margin: 18px 0;
|
@@ -2078,7 +2178,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2078
2178
|
left: 50%;
|
2079
2179
|
z-index: 11000;
|
2080
2180
|
width: 560px;
|
2081
|
-
margin: -250px 0 0 -
|
2181
|
+
margin: -250px 0 0 -280px;
|
2082
2182
|
background-color: #ffffff;
|
2083
2183
|
border: 1px solid #999;
|
2084
2184
|
border: 1px solid rgba(0, 0, 0, 0.3);
|
@@ -2116,6 +2216,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2116
2216
|
.modal-body {
|
2117
2217
|
padding: 15px;
|
2118
2218
|
}
|
2219
|
+
.modal-body form {
|
2220
|
+
margin-bottom: 0;
|
2221
|
+
}
|
2119
2222
|
.modal-footer {
|
2120
2223
|
background-color: #f5f5f5;
|
2121
2224
|
padding: 14px 15px 15px;
|
@@ -2133,7 +2236,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2133
2236
|
display: table;
|
2134
2237
|
content: "";
|
2135
2238
|
zoom: 1;
|
2136
|
-
*display: inline;
|
2137
2239
|
}
|
2138
2240
|
.modal-footer:after {
|
2139
2241
|
clear: both;
|
@@ -2142,6 +2244,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2142
2244
|
float: right;
|
2143
2245
|
margin-left: 5px;
|
2144
2246
|
}
|
2247
|
+
.modal .popover, .modal .twipsy {
|
2248
|
+
z-index: 12000;
|
2249
|
+
}
|
2145
2250
|
.twipsy {
|
2146
2251
|
display: block;
|
2147
2252
|
position: absolute;
|
@@ -2254,8 +2359,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2254
2359
|
height: 0;
|
2255
2360
|
}
|
2256
2361
|
.popover .inner {
|
2257
|
-
background
|
2258
|
-
background
|
2362
|
+
background: #000000;
|
2363
|
+
background: rgba(0, 0, 0, 0.8);
|
2259
2364
|
padding: 3px;
|
2260
2365
|
overflow: hidden;
|
2261
2366
|
width: 280px;
|
@@ -2301,11 +2406,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2301
2406
|
}
|
2302
2407
|
.label {
|
2303
2408
|
padding: 1px 3px 2px;
|
2304
|
-
background-color: #bfbfbf;
|
2305
2409
|
font-size: 9.75px;
|
2306
2410
|
font-weight: bold;
|
2307
2411
|
color: #ffffff;
|
2308
2412
|
text-transform: uppercase;
|
2413
|
+
white-space: nowrap;
|
2414
|
+
background-color: #bfbfbf;
|
2309
2415
|
-webkit-border-radius: 3px;
|
2310
2416
|
-moz-border-radius: 3px;
|
2311
2417
|
border-radius: 3px;
|
@@ -2331,7 +2437,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2331
2437
|
display: table;
|
2332
2438
|
content: "";
|
2333
2439
|
zoom: 1;
|
2334
|
-
*display: inline;
|
2335
2440
|
}
|
2336
2441
|
.media-grid:after {
|
2337
2442
|
clear: both;
|
@@ -2342,7 +2447,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2342
2447
|
.media-grid a {
|
2343
2448
|
float: left;
|
2344
2449
|
padding: 4px;
|
2345
|
-
margin: 0 0
|
2450
|
+
margin: 0 0 18px 20px;
|
2346
2451
|
border: 1px solid #ddd;
|
2347
2452
|
-webkit-border-radius: 4px;
|
2348
2453
|
-moz-border-radius: 4px;
|
@@ -2359,4 +2464,4 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
|
2359
2464
|
-webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
|
2360
2465
|
-moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
|
2361
2466
|
box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
|
2362
|
-
}
|
2467
|
+
}
|