contour 1.1.3 → 1.2.0.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. data/CHANGELOG.rdoc +18 -9
  2. data/README.rdoc +4 -4
  3. data/app/assets/images/twitter-bootstrap/{v2.2.2 → v2.3.0}/glyphicons-halflings-white.png +0 -0
  4. data/app/assets/images/twitter-bootstrap/{v2.2.2 → v2.3.0}/glyphicons-halflings.png +0 -0
  5. data/app/assets/javascripts/contour.js +2 -2
  6. data/app/assets/javascripts/contour/global.js.coffee +14 -8
  7. data/app/assets/javascripts/external/bootstrap-datepicker.js +983 -0
  8. data/app/assets/javascripts/external/bootstrap-timepicker.js +837 -0
  9. data/app/assets/javascripts/external/jquery-ui-1.10.0.custom.min.js +6 -0
  10. data/app/assets/javascripts/twitter-bootstrap/{v2.2.2 → v2.3.0}/bootstrap.js +189 -80
  11. data/app/assets/stylesheets/bootstrap-base-overrides.css +6 -14
  12. data/app/assets/stylesheets/contour.css +5 -3
  13. data/app/assets/stylesheets/datepicker.css +301 -0
  14. data/app/assets/stylesheets/jquery-ui-1.10.0.custom.css +86 -0
  15. data/app/assets/stylesheets/timepicker.css +82 -0
  16. data/app/assets/stylesheets/twitter-bootstrap/{v2.2.2 → v2.3.0}/bootstrap-responsive.css +24 -7
  17. data/app/assets/stylesheets/twitter-bootstrap/{v2.2.2 → v2.3.0}/bootstrap.css +238 -119
  18. data/app/controllers/contour/authentications_controller.rb +1 -2
  19. data/app/views/contour/authentications/_login_table.html.erb +1 -1
  20. data/app/views/contour/layouts/_menu.html.erb +5 -0
  21. data/contour.gemspec +3 -3
  22. data/lib/contour.rb +10 -0
  23. data/lib/contour/version.rb +3 -3
  24. data/lib/generators/contour/install/templates/contour.rb +9 -0
  25. data/lib/generators/contour/scaffold/templates/_paginate.html.erb +1 -1
  26. data/lib/generators/contour/scaffold/templates/index.html.erb +1 -1
  27. data/test/dummy/app/models/user.rb +0 -1
  28. data/test/dummy/db/development.sqlite3 +0 -0
  29. data/test/dummy/db/test.sqlite3 +0 -0
  30. data/test/dummy/log/development.log +129 -0
  31. data/test/dummy/log/test.log +2059 -47940
  32. metadata +26 -18
  33. data/app/assets/javascripts/external/jquery-ui-1.8.22.custom.min.js +0 -93
  34. data/app/assets/stylesheets/jquery-ui-1.8.22.custom.css +0 -381
@@ -0,0 +1,82 @@
1
+ .bootstrap-timepicker.dropdown-menu {
2
+ border-radius: 4px 4px 4px 4px;
3
+ display: none;
4
+ left: 0;
5
+ margin-top: 1px;
6
+ padding: 4px;
7
+ top: 0;
8
+ min-width: 10px;
9
+ z-index: 99999;
10
+ }
11
+ .bootstrap-timepicker.dropdown-menu.open {
12
+ display: inline-block;
13
+ }
14
+ .bootstrap-timepicker.dropdown-menu:before {
15
+ border-bottom: 7px solid rgba(0, 0, 0, 0.2);
16
+ border-left: 7px solid transparent;
17
+ border-right: 7px solid transparent;
18
+ content: "";
19
+ left: 6px;
20
+ position: absolute;
21
+ top: -7px;
22
+ }
23
+ .bootstrap-timepicker.dropdown-menu:after {
24
+ border-bottom: 6px solid #FFFFFF;
25
+ border-left: 6px solid transparent;
26
+ border-right: 6px solid transparent;
27
+ content: "";
28
+ left: 7px;
29
+ position: absolute;
30
+ top: -6px;
31
+ }
32
+ .bootstrap-timepicker.modal {
33
+ margin-left: -100px;
34
+ margin-top: 0;
35
+ top: 30%;
36
+ width: 200px;
37
+ }
38
+ .bootstrap-timepicker.modal .modal-content {
39
+ padding: 0;
40
+ }
41
+ .bootstrap-timepicker table {
42
+ margin: 0;
43
+ width: 100%;
44
+ }
45
+ .bootstrap-timepicker table td {
46
+ height: 30px;
47
+ margin: 0;
48
+ padding: 2px;
49
+ text-align: center;
50
+ }
51
+ .bootstrap-timepicker table td span {
52
+ width: 100%;
53
+ }
54
+ .bootstrap-timepicker table td a {
55
+ border: 1px solid transparent;
56
+ display: inline-block;
57
+ margin: 0;
58
+ outline: 0 none;
59
+ padding: 8px 0;
60
+ width: 3em;
61
+ }
62
+ .bootstrap-timepicker table td a:hover {
63
+ background-color: #EEEEEE;
64
+ border-color: #DDDDDD;
65
+ border-radius: 4px 4px 4px 4px;
66
+ }
67
+ .bootstrap-timepicker table td a i {
68
+ margin-top: 2px;
69
+ }
70
+ .bootstrap-timepicker table td input {
71
+ margin: 0;
72
+ text-align: center;
73
+ width: 25px;
74
+ }
75
+ .bootstrap-timepicker-component .add-on {
76
+ cursor: pointer;
77
+ }
78
+ .bootstrap-timepicker-component .add-on i {
79
+ display: block;
80
+ height: 16px;
81
+ width: 16px;
82
+ }
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.2.2
2
+ * Bootstrap Responsive v2.3.0
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -8,10 +8,6 @@
8
8
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
9
9
  */
10
10
 
11
- @-ms-viewport {
12
- width: device-width;
13
- }
14
-
15
11
  .clearfix {
16
12
  *zoom: 1;
17
13
  }
@@ -44,6 +40,10 @@
44
40
  box-sizing: border-box;
45
41
  }
46
42
 
43
+ @-ms-viewport {
44
+ width: device-width;
45
+ }
46
+
47
47
  .hidden {
48
48
  display: none;
49
49
  visibility: hidden;
@@ -95,6 +95,19 @@
95
95
  }
96
96
  }
97
97
 
98
+ .visible-print {
99
+ display: none !important;
100
+ }
101
+
102
+ @media print {
103
+ .visible-print {
104
+ display: inherit !important;
105
+ }
106
+ .hidden-print {
107
+ display: none !important;
108
+ }
109
+ }
110
+
98
111
  @media (min-width: 1200px) {
99
112
  .row {
100
113
  margin-left: -30px;
@@ -1003,7 +1016,9 @@
1003
1016
  margin-bottom: 2px;
1004
1017
  }
1005
1018
  .nav-collapse .nav > li > a:hover,
1006
- .nav-collapse .dropdown-menu a:hover {
1019
+ .nav-collapse .nav > li > a:focus,
1020
+ .nav-collapse .dropdown-menu a:hover,
1021
+ .nav-collapse .dropdown-menu a:focus {
1007
1022
  background-color: #f2f2f2;
1008
1023
  }
1009
1024
  .navbar-inverse .nav-collapse .nav > li > a,
@@ -1011,7 +1026,9 @@
1011
1026
  color: #999999;
1012
1027
  }
1013
1028
  .navbar-inverse .nav-collapse .nav > li > a:hover,
1014
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
1029
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
1030
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
1031
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
1015
1032
  background-color: #111111;
1016
1033
  }
1017
1034
  .nav-collapse.in .btn-group {
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.2.2
2
+ * Bootstrap v2.3.0
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -8,6 +8,38 @@
8
8
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
9
9
  */
10
10
 
11
+ .clearfix {
12
+ *zoom: 1;
13
+ }
14
+
15
+ .clearfix:before,
16
+ .clearfix:after {
17
+ display: table;
18
+ line-height: 0;
19
+ content: "";
20
+ }
21
+
22
+ .clearfix:after {
23
+ clear: both;
24
+ }
25
+
26
+ .hide-text {
27
+ font: 0/0 a;
28
+ color: transparent;
29
+ text-shadow: none;
30
+ background-color: transparent;
31
+ border: 0;
32
+ }
33
+
34
+ .input-block-level {
35
+ display: block;
36
+ width: 100%;
37
+ min-height: 30px;
38
+ -webkit-box-sizing: border-box;
39
+ -moz-box-sizing: border-box;
40
+ box-sizing: border-box;
41
+ }
42
+
11
43
  article,
12
44
  aside,
13
45
  details,
@@ -189,38 +221,6 @@ textarea {
189
221
  }
190
222
  }
191
223
 
192
- .clearfix {
193
- *zoom: 1;
194
- }
195
-
196
- .clearfix:before,
197
- .clearfix:after {
198
- display: table;
199
- line-height: 0;
200
- content: "";
201
- }
202
-
203
- .clearfix:after {
204
- clear: both;
205
- }
206
-
207
- .hide-text {
208
- font: 0/0 a;
209
- color: transparent;
210
- text-shadow: none;
211
- background-color: transparent;
212
- border: 0;
213
- }
214
-
215
- .input-block-level {
216
- display: block;
217
- width: 100%;
218
- min-height: 30px;
219
- -webkit-box-sizing: border-box;
220
- -moz-box-sizing: border-box;
221
- box-sizing: border-box;
222
- }
223
-
224
224
  body {
225
225
  margin: 0;
226
226
  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -235,7 +235,8 @@ a {
235
235
  text-decoration: none;
236
236
  }
237
237
 
238
- a:hover {
238
+ a:hover,
239
+ a:focus {
239
240
  color: #005580;
240
241
  text-decoration: underline;
241
242
  }
@@ -678,7 +679,8 @@ cite {
678
679
  color: #999999;
679
680
  }
680
681
 
681
- a.muted:hover {
682
+ a.muted:hover,
683
+ a.muted:focus {
682
684
  color: #808080;
683
685
  }
684
686
 
@@ -686,7 +688,8 @@ a.muted:hover {
686
688
  color: #c09853;
687
689
  }
688
690
 
689
- a.text-warning:hover {
691
+ a.text-warning:hover,
692
+ a.text-warning:focus {
690
693
  color: #a47e3c;
691
694
  }
692
695
 
@@ -694,7 +697,8 @@ a.text-warning:hover {
694
697
  color: #b94a48;
695
698
  }
696
699
 
697
- a.text-error:hover {
700
+ a.text-error:hover,
701
+ a.text-error:focus {
698
702
  color: #953b39;
699
703
  }
700
704
 
@@ -702,7 +706,8 @@ a.text-error:hover {
702
706
  color: #3a87ad;
703
707
  }
704
708
 
705
- a.text-info:hover {
709
+ a.text-info:hover,
710
+ a.text-info:focus {
706
711
  color: #2d6987;
707
712
  }
708
713
 
@@ -710,10 +715,23 @@ a.text-info:hover {
710
715
  color: #468847;
711
716
  }
712
717
 
713
- a.text-success:hover {
718
+ a.text-success:hover,
719
+ a.text-success:focus {
714
720
  color: #356635;
715
721
  }
716
722
 
723
+ .text-left {
724
+ text-align: left;
725
+ }
726
+
727
+ .text-right {
728
+ text-align: right;
729
+ }
730
+
731
+ .text-center {
732
+ text-align: center;
733
+ }
734
+
717
735
  h1,
718
736
  h2,
719
737
  h3,
@@ -823,8 +841,10 @@ ol.inline {
823
841
  ul.inline > li,
824
842
  ol.inline > li {
825
843
  display: inline-block;
844
+ *display: inline;
826
845
  padding-right: 5px;
827
846
  padding-left: 5px;
847
+ *zoom: 1;
828
848
  }
829
849
 
830
850
  dl {
@@ -899,9 +919,9 @@ blockquote {
899
919
 
900
920
  blockquote p {
901
921
  margin-bottom: 0;
902
- font-size: 16px;
922
+ font-size: 17.5px;
903
923
  font-weight: 300;
904
- line-height: 25px;
924
+ line-height: 1.25;
905
925
  }
906
926
 
907
927
  blockquote small {
@@ -1646,9 +1666,11 @@ select:focus:invalid:focus {
1646
1666
 
1647
1667
  .input-append,
1648
1668
  .input-prepend {
1649
- margin-bottom: 5px;
1669
+ display: inline-block;
1670
+ margin-bottom: 10px;
1650
1671
  font-size: 0;
1651
1672
  white-space: nowrap;
1673
+ vertical-align: middle;
1652
1674
  }
1653
1675
 
1654
1676
  .input-append input,
@@ -1658,7 +1680,9 @@ select:focus:invalid:focus {
1658
1680
  .input-append .uneditable-input,
1659
1681
  .input-prepend .uneditable-input,
1660
1682
  .input-append .dropdown-menu,
1661
- .input-prepend .dropdown-menu {
1683
+ .input-prepend .dropdown-menu,
1684
+ .input-append .popover,
1685
+ .input-prepend .popover {
1662
1686
  font-size: 14px;
1663
1687
  }
1664
1688
 
@@ -2049,14 +2073,16 @@ table {
2049
2073
  }
2050
2074
 
2051
2075
  .table-bordered thead:first-child tr:first-child > th:first-child,
2052
- .table-bordered tbody:first-child tr:first-child > td:first-child {
2076
+ .table-bordered tbody:first-child tr:first-child > td:first-child,
2077
+ .table-bordered tbody:first-child tr:first-child > th:first-child {
2053
2078
  -webkit-border-top-left-radius: 4px;
2054
2079
  border-top-left-radius: 4px;
2055
2080
  -moz-border-radius-topleft: 4px;
2056
2081
  }
2057
2082
 
2058
2083
  .table-bordered thead:first-child tr:first-child > th:last-child,
2059
- .table-bordered tbody:first-child tr:first-child > td:last-child {
2084
+ .table-bordered tbody:first-child tr:first-child > td:last-child,
2085
+ .table-bordered tbody:first-child tr:first-child > th:last-child {
2060
2086
  -webkit-border-top-right-radius: 4px;
2061
2087
  border-top-right-radius: 4px;
2062
2088
  -moz-border-radius-topright: 4px;
@@ -2064,7 +2090,9 @@ table {
2064
2090
 
2065
2091
  .table-bordered thead:last-child tr:last-child > th:first-child,
2066
2092
  .table-bordered tbody:last-child tr:last-child > td:first-child,
2067
- .table-bordered tfoot:last-child tr:last-child > td:first-child {
2093
+ .table-bordered tbody:last-child tr:last-child > th:first-child,
2094
+ .table-bordered tfoot:last-child tr:last-child > td:first-child,
2095
+ .table-bordered tfoot:last-child tr:last-child > th:first-child {
2068
2096
  -webkit-border-bottom-left-radius: 4px;
2069
2097
  border-bottom-left-radius: 4px;
2070
2098
  -moz-border-radius-bottomleft: 4px;
@@ -2072,7 +2100,9 @@ table {
2072
2100
 
2073
2101
  .table-bordered thead:last-child tr:last-child > th:last-child,
2074
2102
  .table-bordered tbody:last-child tr:last-child > td:last-child,
2075
- .table-bordered tfoot:last-child tr:last-child > td:last-child {
2103
+ .table-bordered tbody:last-child tr:last-child > th:last-child,
2104
+ .table-bordered tfoot:last-child tr:last-child > td:last-child,
2105
+ .table-bordered tfoot:last-child tr:last-child > th:last-child {
2076
2106
  -webkit-border-bottom-right-radius: 4px;
2077
2107
  border-bottom-right-radius: 4px;
2078
2108
  -moz-border-radius-bottomright: 4px;
@@ -2113,8 +2143,8 @@ table {
2113
2143
  background-color: #f9f9f9;
2114
2144
  }
2115
2145
 
2116
- .table-hover tbody tr:hover td,
2117
- .table-hover tbody tr:hover th {
2146
+ .table-hover tbody tr:hover > td,
2147
+ .table-hover tbody tr:hover > th {
2118
2148
  background-color: #f5f5f5;
2119
2149
  }
2120
2150
 
@@ -2211,35 +2241,35 @@ table th[class*="span"],
2211
2241
  margin-left: 0;
2212
2242
  }
2213
2243
 
2214
- .table tbody tr.success td {
2244
+ .table tbody tr.success > td {
2215
2245
  background-color: #dff0d8;
2216
2246
  }
2217
2247
 
2218
- .table tbody tr.error td {
2248
+ .table tbody tr.error > td {
2219
2249
  background-color: #f2dede;
2220
2250
  }
2221
2251
 
2222
- .table tbody tr.warning td {
2252
+ .table tbody tr.warning > td {
2223
2253
  background-color: #fcf8e3;
2224
2254
  }
2225
2255
 
2226
- .table tbody tr.info td {
2256
+ .table tbody tr.info > td {
2227
2257
  background-color: #d9edf7;
2228
2258
  }
2229
2259
 
2230
- .table-hover tbody tr.success:hover td {
2260
+ .table-hover tbody tr.success:hover > td {
2231
2261
  background-color: #d0e9c6;
2232
2262
  }
2233
2263
 
2234
- .table-hover tbody tr.error:hover td {
2264
+ .table-hover tbody tr.error:hover > td {
2235
2265
  background-color: #ebcccc;
2236
2266
  }
2237
2267
 
2238
- .table-hover tbody tr.warning:hover td {
2268
+ .table-hover tbody tr.warning:hover > td {
2239
2269
  background-color: #faf2cc;
2240
2270
  }
2241
2271
 
2242
- .table-hover tbody tr.info:hover td {
2272
+ .table-hover tbody tr.info:hover > td {
2243
2273
  background-color: #c4e3f3;
2244
2274
  }
2245
2275
 
@@ -2257,7 +2287,7 @@ table th[class*="span"],
2257
2287
  background-repeat: no-repeat;
2258
2288
  }
2259
2289
 
2260
- /* White icons with optional class, or on hover/active states of certain elements */
2290
+ /* White icons with optional class, or on hover/focus/active states of certain elements */
2261
2291
 
2262
2292
  .icon-white,
2263
2293
  .nav-pills > .active > a > [class^="icon-"],
@@ -2267,11 +2297,15 @@ table th[class*="span"],
2267
2297
  .navbar-inverse .nav > .active > a > [class^="icon-"],
2268
2298
  .navbar-inverse .nav > .active > a > [class*=" icon-"],
2269
2299
  .dropdown-menu > li > a:hover > [class^="icon-"],
2300
+ .dropdown-menu > li > a:focus > [class^="icon-"],
2270
2301
  .dropdown-menu > li > a:hover > [class*=" icon-"],
2302
+ .dropdown-menu > li > a:focus > [class*=" icon-"],
2271
2303
  .dropdown-menu > .active > a > [class^="icon-"],
2272
2304
  .dropdown-menu > .active > a > [class*=" icon-"],
2273
2305
  .dropdown-submenu:hover > a > [class^="icon-"],
2274
- .dropdown-submenu:hover > a > [class*=" icon-"] {
2306
+ .dropdown-submenu:focus > a > [class^="icon-"],
2307
+ .dropdown-submenu:hover > a > [class*=" icon-"],
2308
+ .dropdown-submenu:focus > a > [class*=" icon-"] {
2275
2309
  background-image: url("../img/glyphicons-halflings-white.png");
2276
2310
  }
2277
2311
 
@@ -2741,6 +2775,7 @@ table th[class*="span"],
2741
2775
  }
2742
2776
 
2743
2777
  .icon-folder-close {
2778
+ width: 16px;
2744
2779
  background-position: -384px -120px;
2745
2780
  }
2746
2781
 
@@ -2909,7 +2944,7 @@ table th[class*="span"],
2909
2944
  border-bottom: 1px solid #ffffff;
2910
2945
  }
2911
2946
 
2912
- .dropdown-menu li > a {
2947
+ .dropdown-menu > li > a {
2913
2948
  display: block;
2914
2949
  padding: 3px 20px;
2915
2950
  clear: both;
@@ -2919,9 +2954,10 @@ table th[class*="span"],
2919
2954
  white-space: nowrap;
2920
2955
  }
2921
2956
 
2922
- .dropdown-menu li > a:hover,
2923
- .dropdown-menu li > a:focus,
2924
- .dropdown-submenu:hover > a {
2957
+ .dropdown-menu > li > a:hover,
2958
+ .dropdown-menu > li > a:focus,
2959
+ .dropdown-submenu:hover > a,
2960
+ .dropdown-submenu:focus > a {
2925
2961
  color: #ffffff;
2926
2962
  text-decoration: none;
2927
2963
  background-color: #0081c2;
@@ -2934,8 +2970,9 @@ table th[class*="span"],
2934
2970
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
2935
2971
  }
2936
2972
 
2937
- .dropdown-menu .active > a,
2938
- .dropdown-menu .active > a:hover {
2973
+ .dropdown-menu > .active > a,
2974
+ .dropdown-menu > .active > a:hover,
2975
+ .dropdown-menu > .active > a:focus {
2939
2976
  color: #ffffff;
2940
2977
  text-decoration: none;
2941
2978
  background-color: #0081c2;
@@ -2949,12 +2986,14 @@ table th[class*="span"],
2949
2986
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
2950
2987
  }
2951
2988
 
2952
- .dropdown-menu .disabled > a,
2953
- .dropdown-menu .disabled > a:hover {
2989
+ .dropdown-menu > .disabled > a,
2990
+ .dropdown-menu > .disabled > a:hover,
2991
+ .dropdown-menu > .disabled > a:focus {
2954
2992
  color: #999999;
2955
2993
  }
2956
2994
 
2957
- .dropdown-menu .disabled > a:hover {
2995
+ .dropdown-menu > .disabled > a:hover,
2996
+ .dropdown-menu > .disabled > a:focus {
2958
2997
  text-decoration: none;
2959
2998
  cursor: default;
2960
2999
  background-color: transparent;
@@ -3130,7 +3169,8 @@ table th[class*="span"],
3130
3169
  filter: alpha(opacity=20);
3131
3170
  }
3132
3171
 
3133
- .close:hover {
3172
+ .close:hover,
3173
+ .close:focus {
3134
3174
  color: #000000;
3135
3175
  text-decoration: none;
3136
3176
  cursor: pointer;
@@ -3167,11 +3207,11 @@ button.close {
3167
3207
  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
3168
3208
  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
3169
3209
  background-repeat: repeat-x;
3170
- border: 1px solid #bbbbbb;
3210
+ border: 1px solid #cccccc;
3171
3211
  *border: 0;
3172
3212
  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
3173
3213
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3174
- border-bottom-color: #a2a2a2;
3214
+ border-bottom-color: #b3b3b3;
3175
3215
  -webkit-border-radius: 4px;
3176
3216
  -moz-border-radius: 4px;
3177
3217
  border-radius: 4px;
@@ -3184,6 +3224,7 @@ button.close {
3184
3224
  }
3185
3225
 
3186
3226
  .btn:hover,
3227
+ .btn:focus,
3187
3228
  .btn:active,
3188
3229
  .btn.active,
3189
3230
  .btn.disabled,
@@ -3202,7 +3243,8 @@ button.close {
3202
3243
  *margin-left: 0;
3203
3244
  }
3204
3245
 
3205
- .btn:hover {
3246
+ .btn:hover,
3247
+ .btn:focus {
3206
3248
  color: #333333;
3207
3249
  text-decoration: none;
3208
3250
  background-position: 0 -15px;
@@ -3306,11 +3348,6 @@ input[type="button"].btn-block {
3306
3348
  color: rgba(255, 255, 255, 0.75);
3307
3349
  }
3308
3350
 
3309
- .btn {
3310
- border-color: #c5c5c5;
3311
- border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
3312
- }
3313
-
3314
3351
  .btn-primary {
3315
3352
  color: #ffffff;
3316
3353
  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -3329,6 +3366,7 @@ input[type="button"].btn-block {
3329
3366
  }
3330
3367
 
3331
3368
  .btn-primary:hover,
3369
+ .btn-primary:focus,
3332
3370
  .btn-primary:active,
3333
3371
  .btn-primary.active,
3334
3372
  .btn-primary.disabled,
@@ -3361,6 +3399,7 @@ input[type="button"].btn-block {
3361
3399
  }
3362
3400
 
3363
3401
  .btn-warning:hover,
3402
+ .btn-warning:focus,
3364
3403
  .btn-warning:active,
3365
3404
  .btn-warning.active,
3366
3405
  .btn-warning.disabled,
@@ -3393,6 +3432,7 @@ input[type="button"].btn-block {
3393
3432
  }
3394
3433
 
3395
3434
  .btn-danger:hover,
3435
+ .btn-danger:focus,
3396
3436
  .btn-danger:active,
3397
3437
  .btn-danger.active,
3398
3438
  .btn-danger.disabled,
@@ -3425,6 +3465,7 @@ input[type="button"].btn-block {
3425
3465
  }
3426
3466
 
3427
3467
  .btn-success:hover,
3468
+ .btn-success:focus,
3428
3469
  .btn-success:active,
3429
3470
  .btn-success.active,
3430
3471
  .btn-success.disabled,
@@ -3457,6 +3498,7 @@ input[type="button"].btn-block {
3457
3498
  }
3458
3499
 
3459
3500
  .btn-info:hover,
3501
+ .btn-info:focus,
3460
3502
  .btn-info:active,
3461
3503
  .btn-info.active,
3462
3504
  .btn-info.disabled,
@@ -3489,6 +3531,7 @@ input[type="button"].btn-block {
3489
3531
  }
3490
3532
 
3491
3533
  .btn-inverse:hover,
3534
+ .btn-inverse:focus,
3492
3535
  .btn-inverse:active,
3493
3536
  .btn-inverse.active,
3494
3537
  .btn-inverse.disabled,
@@ -3552,13 +3595,15 @@ input[type="submit"].btn.btn-mini {
3552
3595
  border-radius: 0;
3553
3596
  }
3554
3597
 
3555
- .btn-link:hover {
3598
+ .btn-link:hover,
3599
+ .btn-link:focus {
3556
3600
  color: #005580;
3557
3601
  text-decoration: underline;
3558
3602
  background-color: transparent;
3559
3603
  }
3560
3604
 
3561
- .btn-link[disabled]:hover {
3605
+ .btn-link[disabled]:hover,
3606
+ .btn-link[disabled]:focus {
3562
3607
  color: #333333;
3563
3608
  text-decoration: none;
3564
3609
  }
@@ -3744,8 +3789,6 @@ input[type="submit"].btn.btn-mini {
3744
3789
  margin-left: 0;
3745
3790
  }
3746
3791
 
3747
- .btn-mini .caret,
3748
- .btn-small .caret,
3749
3792
  .btn-large .caret {
3750
3793
  margin-top: 6px;
3751
3794
  }
@@ -3756,6 +3799,11 @@ input[type="submit"].btn.btn-mini {
3756
3799
  border-left-width: 5px;
3757
3800
  }
3758
3801
 
3802
+ .btn-mini .caret,
3803
+ .btn-small .caret {
3804
+ margin-top: 8px;
3805
+ }
3806
+
3759
3807
  .dropup .btn-large .caret {
3760
3808
  border-bottom-width: 5px;
3761
3809
  }
@@ -3899,7 +3947,8 @@ input[type="submit"].btn.btn-mini {
3899
3947
  display: block;
3900
3948
  }
3901
3949
 
3902
- .nav > li > a:hover {
3950
+ .nav > li > a:hover,
3951
+ .nav > li > a:focus {
3903
3952
  text-decoration: none;
3904
3953
  background-color: #eeeeee;
3905
3954
  }
@@ -3945,7 +3994,8 @@ input[type="submit"].btn.btn-mini {
3945
3994
  }
3946
3995
 
3947
3996
  .nav-list > .active > a,
3948
- .nav-list > .active > a:hover {
3997
+ .nav-list > .active > a:hover,
3998
+ .nav-list > .active > a:focus {
3949
3999
  color: #ffffff;
3950
4000
  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
3951
4001
  background-color: #0088cc;
@@ -4016,12 +4066,14 @@ input[type="submit"].btn.btn-mini {
4016
4066
  border-radius: 4px 4px 0 0;
4017
4067
  }
4018
4068
 
4019
- .nav-tabs > li > a:hover {
4069
+ .nav-tabs > li > a:hover,
4070
+ .nav-tabs > li > a:focus {
4020
4071
  border-color: #eeeeee #eeeeee #dddddd;
4021
4072
  }
4022
4073
 
4023
4074
  .nav-tabs > .active > a,
4024
- .nav-tabs > .active > a:hover {
4075
+ .nav-tabs > .active > a:hover,
4076
+ .nav-tabs > .active > a:focus {
4025
4077
  color: #555555;
4026
4078
  cursor: default;
4027
4079
  background-color: #ffffff;
@@ -4040,7 +4092,8 @@ input[type="submit"].btn.btn-mini {
4040
4092
  }
4041
4093
 
4042
4094
  .nav-pills > .active > a,
4043
- .nav-pills > .active > a:hover {
4095
+ .nav-pills > .active > a:hover,
4096
+ .nav-pills > .active > a:focus {
4044
4097
  color: #ffffff;
4045
4098
  background-color: #0088cc;
4046
4099
  }
@@ -4082,7 +4135,8 @@ input[type="submit"].btn.btn-mini {
4082
4135
  -moz-border-radius-bottomleft: 4px;
4083
4136
  }
4084
4137
 
4085
- .nav-tabs.nav-stacked > li > a:hover {
4138
+ .nav-tabs.nav-stacked > li > a:hover,
4139
+ .nav-tabs.nav-stacked > li > a:focus {
4086
4140
  z-index: 2;
4087
4141
  border-color: #ddd;
4088
4142
  }
@@ -4113,7 +4167,8 @@ input[type="submit"].btn.btn-mini {
4113
4167
  border-bottom-color: #0088cc;
4114
4168
  }
4115
4169
 
4116
- .nav .dropdown-toggle:hover .caret {
4170
+ .nav .dropdown-toggle:hover .caret,
4171
+ .nav .dropdown-toggle:focus .caret {
4117
4172
  border-top-color: #005580;
4118
4173
  border-bottom-color: #005580;
4119
4174
  }
@@ -4134,13 +4189,15 @@ input[type="submit"].btn.btn-mini {
4134
4189
  border-bottom-color: #555555;
4135
4190
  }
4136
4191
 
4137
- .nav > .dropdown.active > a:hover {
4192
+ .nav > .dropdown.active > a:hover,
4193
+ .nav > .dropdown.active > a:focus {
4138
4194
  cursor: pointer;
4139
4195
  }
4140
4196
 
4141
4197
  .nav-tabs .open .dropdown-toggle,
4142
4198
  .nav-pills .open .dropdown-toggle,
4143
- .nav > li.dropdown.open.active > a:hover {
4199
+ .nav > li.dropdown.open.active > a:hover,
4200
+ .nav > li.dropdown.open.active > a:focus {
4144
4201
  color: #ffffff;
4145
4202
  background-color: #999999;
4146
4203
  border-color: #999999;
@@ -4148,14 +4205,16 @@ input[type="submit"].btn.btn-mini {
4148
4205
 
4149
4206
  .nav li.dropdown.open .caret,
4150
4207
  .nav li.dropdown.open.active .caret,
4151
- .nav li.dropdown.open a:hover .caret {
4208
+ .nav li.dropdown.open a:hover .caret,
4209
+ .nav li.dropdown.open a:focus .caret {
4152
4210
  border-top-color: #ffffff;
4153
4211
  border-bottom-color: #ffffff;
4154
4212
  opacity: 1;
4155
4213
  filter: alpha(opacity=100);
4156
4214
  }
4157
4215
 
4158
- .tabs-stacked .open > a:hover {
4216
+ .tabs-stacked .open > a:hover,
4217
+ .tabs-stacked .open > a:focus {
4159
4218
  border-color: #999999;
4160
4219
  }
4161
4220
 
@@ -4209,13 +4268,15 @@ input[type="submit"].btn.btn-mini {
4209
4268
  border-radius: 0 0 4px 4px;
4210
4269
  }
4211
4270
 
4212
- .tabs-below > .nav-tabs > li > a:hover {
4271
+ .tabs-below > .nav-tabs > li > a:hover,
4272
+ .tabs-below > .nav-tabs > li > a:focus {
4213
4273
  border-top-color: #ddd;
4214
4274
  border-bottom-color: transparent;
4215
4275
  }
4216
4276
 
4217
4277
  .tabs-below > .nav-tabs > .active > a,
4218
- .tabs-below > .nav-tabs > .active > a:hover {
4278
+ .tabs-below > .nav-tabs > .active > a:hover,
4279
+ .tabs-below > .nav-tabs > .active > a:focus {
4219
4280
  border-color: transparent #ddd #ddd #ddd;
4220
4281
  }
4221
4282
 
@@ -4244,12 +4305,14 @@ input[type="submit"].btn.btn-mini {
4244
4305
  border-radius: 4px 0 0 4px;
4245
4306
  }
4246
4307
 
4247
- .tabs-left > .nav-tabs > li > a:hover {
4308
+ .tabs-left > .nav-tabs > li > a:hover,
4309
+ .tabs-left > .nav-tabs > li > a:focus {
4248
4310
  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
4249
4311
  }
4250
4312
 
4251
4313
  .tabs-left > .nav-tabs .active > a,
4252
- .tabs-left > .nav-tabs .active > a:hover {
4314
+ .tabs-left > .nav-tabs .active > a:hover,
4315
+ .tabs-left > .nav-tabs .active > a:focus {
4253
4316
  border-color: #ddd transparent #ddd #ddd;
4254
4317
  *border-right-color: #ffffff;
4255
4318
  }
@@ -4267,12 +4330,14 @@ input[type="submit"].btn.btn-mini {
4267
4330
  border-radius: 0 4px 4px 0;
4268
4331
  }
4269
4332
 
4270
- .tabs-right > .nav-tabs > li > a:hover {
4333
+ .tabs-right > .nav-tabs > li > a:hover,
4334
+ .tabs-right > .nav-tabs > li > a:focus {
4271
4335
  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
4272
4336
  }
4273
4337
 
4274
4338
  .tabs-right > .nav-tabs .active > a,
4275
- .tabs-right > .nav-tabs .active > a:hover {
4339
+ .tabs-right > .nav-tabs .active > a:hover,
4340
+ .tabs-right > .nav-tabs .active > a:focus {
4276
4341
  border-color: #ddd #ddd #ddd transparent;
4277
4342
  *border-left-color: #ffffff;
4278
4343
  }
@@ -4281,7 +4346,8 @@ input[type="submit"].btn.btn-mini {
4281
4346
  color: #999999;
4282
4347
  }
4283
4348
 
4284
- .nav > .disabled > a:hover {
4349
+ .nav > .disabled > a:hover,
4350
+ .nav > .disabled > a:focus {
4285
4351
  text-decoration: none;
4286
4352
  cursor: default;
4287
4353
  background-color: transparent;
@@ -4347,7 +4413,8 @@ input[type="submit"].btn.btn-mini {
4347
4413
  text-shadow: 0 1px 0 #ffffff;
4348
4414
  }
4349
4415
 
4350
- .navbar .brand:hover {
4416
+ .navbar .brand:hover,
4417
+ .navbar .brand:focus {
4351
4418
  text-decoration: none;
4352
4419
  }
4353
4420
 
@@ -4361,7 +4428,8 @@ input[type="submit"].btn.btn-mini {
4361
4428
  color: #777777;
4362
4429
  }
4363
4430
 
4364
- .navbar-link:hover {
4431
+ .navbar-link:hover,
4432
+ .navbar-link:focus {
4365
4433
  color: #333333;
4366
4434
  }
4367
4435
 
@@ -4379,7 +4447,9 @@ input[type="submit"].btn.btn-mini {
4379
4447
 
4380
4448
  .navbar .btn-group .btn,
4381
4449
  .navbar .input-prepend .btn,
4382
- .navbar .input-append .btn {
4450
+ .navbar .input-append .btn,
4451
+ .navbar .input-prepend .btn-group,
4452
+ .navbar .input-append .btn-group {
4383
4453
  margin-top: 0;
4384
4454
  }
4385
4455
 
@@ -4587,6 +4657,7 @@ input[type="submit"].btn.btn-mini {
4587
4657
  }
4588
4658
 
4589
4659
  .navbar .btn-navbar:hover,
4660
+ .navbar .btn-navbar:focus,
4590
4661
  .navbar .btn-navbar:active,
4591
4662
  .navbar .btn-navbar.active,
4592
4663
  .navbar .btn-navbar.disabled,
@@ -4656,9 +4727,10 @@ input[type="submit"].btn.btn-mini {
4656
4727
  border-bottom: 0;
4657
4728
  }
4658
4729
 
4659
- .navbar .nav li.dropdown > a:hover .caret {
4660
- border-top-color: #555555;
4661
- border-bottom-color: #555555;
4730
+ .navbar .nav li.dropdown > a:hover .caret,
4731
+ .navbar .nav li.dropdown > a:focus .caret {
4732
+ border-top-color: #333333;
4733
+ border-bottom-color: #333333;
4662
4734
  }
4663
4735
 
4664
4736
  .navbar .nav li.dropdown.open > .dropdown-toggle,
@@ -4728,7 +4800,9 @@ input[type="submit"].btn.btn-mini {
4728
4800
  }
4729
4801
 
4730
4802
  .navbar-inverse .brand:hover,
4731
- .navbar-inverse .nav > li > a:hover {
4803
+ .navbar-inverse .nav > li > a:hover,
4804
+ .navbar-inverse .brand:focus,
4805
+ .navbar-inverse .nav > li > a:focus {
4732
4806
  color: #ffffff;
4733
4807
  }
4734
4808
 
@@ -4757,7 +4831,8 @@ input[type="submit"].btn.btn-mini {
4757
4831
  color: #999999;
4758
4832
  }
4759
4833
 
4760
- .navbar-inverse .navbar-link:hover {
4834
+ .navbar-inverse .navbar-link:hover,
4835
+ .navbar-inverse .navbar-link:focus {
4761
4836
  color: #ffffff;
4762
4837
  }
4763
4838
 
@@ -4773,7 +4848,8 @@ input[type="submit"].btn.btn-mini {
4773
4848
  background-color: #111111;
4774
4849
  }
4775
4850
 
4776
- .navbar-inverse .nav li.dropdown > a:hover .caret {
4851
+ .navbar-inverse .nav li.dropdown > a:hover .caret,
4852
+ .navbar-inverse .nav li.dropdown > a:focus .caret {
4777
4853
  border-top-color: #ffffff;
4778
4854
  border-bottom-color: #ffffff;
4779
4855
  }
@@ -4846,6 +4922,7 @@ input[type="submit"].btn.btn-mini {
4846
4922
  }
4847
4923
 
4848
4924
  .navbar-inverse .btn-navbar:hover,
4925
+ .navbar-inverse .btn-navbar:focus,
4849
4926
  .navbar-inverse .btn-navbar:active,
4850
4927
  .navbar-inverse .btn-navbar.active,
4851
4928
  .navbar-inverse .btn-navbar.disabled,
@@ -4920,6 +4997,7 @@ input[type="submit"].btn.btn-mini {
4920
4997
  }
4921
4998
 
4922
4999
  .pagination ul > li > a:hover,
5000
+ .pagination ul > li > a:focus,
4923
5001
  .pagination ul > .active > a,
4924
5002
  .pagination ul > .active > span {
4925
5003
  background-color: #f5f5f5;
@@ -4933,7 +5011,8 @@ input[type="submit"].btn.btn-mini {
4933
5011
 
4934
5012
  .pagination ul > .disabled > span,
4935
5013
  .pagination ul > .disabled > a,
4936
- .pagination ul > .disabled > a:hover {
5014
+ .pagination ul > .disabled > a:hover,
5015
+ .pagination ul > .disabled > a:focus {
4937
5016
  color: #999999;
4938
5017
  cursor: default;
4939
5018
  background-color: transparent;
@@ -5063,7 +5142,8 @@ input[type="submit"].btn.btn-mini {
5063
5142
  border-radius: 15px;
5064
5143
  }
5065
5144
 
5066
- .pager li > a:hover {
5145
+ .pager li > a:hover,
5146
+ .pager li > a:focus {
5067
5147
  text-decoration: none;
5068
5148
  background-color: #f5f5f5;
5069
5149
  }
@@ -5080,6 +5160,7 @@ input[type="submit"].btn.btn-mini {
5080
5160
 
5081
5161
  .pager .disabled > a,
5082
5162
  .pager .disabled > a:hover,
5163
+ .pager .disabled > a:focus,
5083
5164
  .pager .disabled > span {
5084
5165
  color: #999999;
5085
5166
  cursor: default;
@@ -5209,8 +5290,8 @@ input[type="submit"].btn.btn-mini {
5209
5290
  position: absolute;
5210
5291
  z-index: 1030;
5211
5292
  display: block;
5212
- padding: 5px;
5213
5293
  font-size: 11px;
5294
+ line-height: 1.4;
5214
5295
  opacity: 0;
5215
5296
  filter: alpha(opacity=0);
5216
5297
  visibility: visible;
@@ -5222,24 +5303,28 @@ input[type="submit"].btn.btn-mini {
5222
5303
  }
5223
5304
 
5224
5305
  .tooltip.top {
5306
+ padding: 5px 0;
5225
5307
  margin-top: -3px;
5226
5308
  }
5227
5309
 
5228
5310
  .tooltip.right {
5311
+ padding: 0 5px;
5229
5312
  margin-left: 3px;
5230
5313
  }
5231
5314
 
5232
5315
  .tooltip.bottom {
5316
+ padding: 5px 0;
5233
5317
  margin-top: 3px;
5234
5318
  }
5235
5319
 
5236
5320
  .tooltip.left {
5321
+ padding: 0 5px;
5237
5322
  margin-left: -3px;
5238
5323
  }
5239
5324
 
5240
5325
  .tooltip-inner {
5241
5326
  max-width: 200px;
5242
- padding: 3px 8px;
5327
+ padding: 8px;
5243
5328
  color: #ffffff;
5244
5329
  text-align: center;
5245
5330
  text-decoration: none;
@@ -5295,7 +5380,7 @@ input[type="submit"].btn.btn-mini {
5295
5380
  left: 0;
5296
5381
  z-index: 1010;
5297
5382
  display: none;
5298
- width: 236px;
5383
+ max-width: 276px;
5299
5384
  padding: 1px;
5300
5385
  text-align: left;
5301
5386
  white-space: normal;
@@ -5342,6 +5427,10 @@ input[type="submit"].btn.btn-mini {
5342
5427
  border-radius: 5px 5px 0 0;
5343
5428
  }
5344
5429
 
5430
+ .popover-title:empty {
5431
+ display: none;
5432
+ }
5433
+
5345
5434
  .popover-content {
5346
5435
  padding: 9px 14px;
5347
5436
  }
@@ -5473,7 +5562,8 @@ input[type="submit"].btn.btn-mini {
5473
5562
  transition: all 0.2s ease-in-out;
5474
5563
  }
5475
5564
 
5476
- a.thumbnail:hover {
5565
+ a.thumbnail:hover,
5566
+ a.thumbnail:focus {
5477
5567
  border-color: #0088cc;
5478
5568
  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
5479
5569
  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
@@ -5516,11 +5606,11 @@ a.thumbnail:hover {
5516
5606
  margin: 0 0 5px;
5517
5607
  }
5518
5608
 
5519
- .media .pull-left {
5609
+ .media > .pull-left {
5520
5610
  margin-right: 10px;
5521
5611
  }
5522
5612
 
5523
- .media .pull-right {
5613
+ .media > .pull-right {
5524
5614
  margin-left: 10px;
5525
5615
  }
5526
5616
 
@@ -5563,7 +5653,9 @@ a.thumbnail:hover {
5563
5653
  }
5564
5654
 
5565
5655
  a.label:hover,
5566
- a.badge:hover {
5656
+ a.label:focus,
5657
+ a.badge:hover,
5658
+ a.badge:focus {
5567
5659
  color: #ffffff;
5568
5660
  text-decoration: none;
5569
5661
  cursor: pointer;
@@ -5889,7 +5981,8 @@ a.badge:hover {
5889
5981
  transition: 0.6s ease-in-out left;
5890
5982
  }
5891
5983
 
5892
- .carousel-inner > .item > img {
5984
+ .carousel-inner > .item > img,
5985
+ .carousel-inner > .item > a > img {
5893
5986
  display: block;
5894
5987
  line-height: 1;
5895
5988
  }
@@ -5958,13 +6051,39 @@ a.badge:hover {
5958
6051
  left: auto;
5959
6052
  }
5960
6053
 
5961
- .carousel-control:hover {
6054
+ .carousel-control:hover,
6055
+ .carousel-control:focus {
5962
6056
  color: #ffffff;
5963
6057
  text-decoration: none;
5964
6058
  opacity: 0.9;
5965
6059
  filter: alpha(opacity=90);
5966
6060
  }
5967
6061
 
6062
+ .carousel-indicators {
6063
+ position: absolute;
6064
+ top: 15px;
6065
+ right: 15px;
6066
+ z-index: 5;
6067
+ margin: 0;
6068
+ list-style: none;
6069
+ }
6070
+
6071
+ .carousel-indicators li {
6072
+ display: block;
6073
+ float: left;
6074
+ width: 10px;
6075
+ height: 10px;
6076
+ margin-left: 5px;
6077
+ text-indent: -999px;
6078
+ background-color: #ccc;
6079
+ background-color: rgba(255, 255, 255, 0.25);
6080
+ border-radius: 5px;
6081
+ }
6082
+
6083
+ .carousel-indicators .active {
6084
+ background-color: #fff;
6085
+ }
6086
+
5968
6087
  .carousel-caption {
5969
6088
  position: absolute;
5970
6089
  right: 0;