spiderfw 0.6.39 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (144) hide show
  1. checksums.yaml +8 -8
  2. data/CHANGELOG +2 -0
  3. data/Rakefile +4 -3
  4. data/VERSION +1 -1
  5. data/apps/core/admin/public/css/sass/admin.css +61 -12
  6. data/apps/core/admin/public/sass/admin.scss +51 -0
  7. data/apps/core/admin/views/login.layout.shtml +1 -1
  8. data/apps/core/components/assets.rb +34 -2
  9. data/apps/core/components/po/it/spider_components.po +2 -2
  10. data/apps/core/components/public/bootstrap/scss/_aggiunte_bootstrap_3.scss +54 -0
  11. data/apps/core/components/public/bootstrap/scss/_pagination.scss +1 -1
  12. data/apps/core/components/public/bootstrap/scss/_variables.scss +2 -0
  13. data/apps/core/components/public/bootstrap/scss/bootstrap.css +48 -2
  14. data/apps/core/components/public/bootstrap/scss/bootstrap.scss +4 -1
  15. data/apps/core/components/public/bootstrap_3/img/glyphicons-halflings-regular.eot +0 -0
  16. data/apps/core/components/public/bootstrap_3/img/glyphicons-halflings-regular.svg +272 -213
  17. data/apps/core/components/public/bootstrap_3/img/glyphicons-halflings-regular.ttf +0 -0
  18. data/apps/core/components/public/bootstrap_3/img/glyphicons-halflings-regular.woff +0 -0
  19. data/apps/core/components/public/bootstrap_3/img/glyphicons-halflings-regular.woff2 +0 -0
  20. data/apps/core/components/public/bootstrap_3/js/affix.js +48 -26
  21. data/apps/core/components/public/bootstrap_3/js/alert.js +8 -6
  22. data/apps/core/components/public/bootstrap_3/js/button.js +27 -17
  23. data/apps/core/components/public/bootstrap_3/js/carousel.js +66 -39
  24. data/apps/core/components/public/bootstrap_3/js/collapse.js +73 -42
  25. data/apps/core/components/public/bootstrap_3/js/dropdown.js +54 -40
  26. data/apps/core/components/public/bootstrap_3/js/modal.js +102 -42
  27. data/apps/core/components/public/bootstrap_3/js/popover.js +6 -11
  28. data/apps/core/components/public/bootstrap_3/js/scrollspy.js +47 -33
  29. data/apps/core/components/public/bootstrap_3/js/tab.js +48 -21
  30. data/apps/core/components/public/bootstrap_3/js/tooltip.js +118 -60
  31. data/apps/core/components/public/bootstrap_3/js/transition.js +15 -4
  32. data/apps/core/components/public/bootstrap_3/scss/_alerts.scss +8 -2
  33. data/apps/core/components/public/bootstrap_3/scss/_badges.scss +14 -3
  34. data/apps/core/components/public/bootstrap_3/scss/_button-groups.scss +23 -19
  35. data/apps/core/components/public/bootstrap_3/scss/_buttons.scss +22 -13
  36. data/apps/core/components/public/bootstrap_3/scss/_carousel.scss +28 -2
  37. data/apps/core/components/public/bootstrap_3/scss/_close.scss +1 -0
  38. data/apps/core/components/public/bootstrap_3/scss/_code.scss +7 -0
  39. data/apps/core/components/public/bootstrap_3/scss/_component-animations.scss +3 -1
  40. data/apps/core/components/public/bootstrap_3/scss/_dropdowns.scss +11 -9
  41. data/apps/core/components/public/bootstrap_3/scss/_forms.scss +190 -68
  42. data/apps/core/components/public/bootstrap_3/scss/_glyphicons.scss +83 -13
  43. data/apps/core/components/public/bootstrap_3/scss/_grid.scss +4 -4
  44. data/apps/core/components/public/bootstrap_3/scss/_input-groups.scss +1 -0
  45. data/apps/core/components/public/bootstrap_3/scss/_jumbotron.scss +8 -4
  46. data/apps/core/components/public/bootstrap_3/scss/_list-group.scss +13 -12
  47. data/apps/core/components/public/bootstrap_3/scss/_media.scss +40 -30
  48. data/apps/core/components/public/bootstrap_3/scss/_mixins.scss +1 -0
  49. data/apps/core/components/public/bootstrap_3/scss/_modals.scss +7 -4
  50. data/apps/core/components/public/bootstrap_3/scss/_navbar.scss +36 -32
  51. data/apps/core/components/public/bootstrap_3/scss/_navs.scss +3 -3
  52. data/apps/core/components/public/bootstrap_3/scss/_normalize.scss +12 -13
  53. data/apps/core/components/public/bootstrap_3/scss/_pager.scss +2 -3
  54. data/apps/core/components/public/bootstrap_3/scss/_pagination.scss +4 -3
  55. data/apps/core/components/public/bootstrap_3/scss/_panels.scss +38 -7
  56. data/apps/core/components/public/bootstrap_3/scss/_popovers.scss +5 -7
  57. data/apps/core/components/public/bootstrap_3/scss/_print.scss +96 -96
  58. data/apps/core/components/public/bootstrap_3/scss/_progress-bars.scss +20 -22
  59. data/apps/core/components/public/bootstrap_3/scss/_responsive-embed.scss +10 -9
  60. data/apps/core/components/public/bootstrap_3/scss/_responsive-utilities.scss +8 -3
  61. data/apps/core/components/public/bootstrap_3/scss/_scaffolding.scss +15 -4
  62. data/apps/core/components/public/bootstrap_3/scss/_tables.scss +15 -14
  63. data/apps/core/components/public/bootstrap_3/scss/_theme.scss +57 -13
  64. data/apps/core/components/public/bootstrap_3/scss/_thumbnails.scss +2 -2
  65. data/apps/core/components/public/bootstrap_3/scss/_tooltip.scss +13 -7
  66. data/apps/core/components/public/bootstrap_3/scss/_type.scss +21 -21
  67. data/apps/core/components/public/bootstrap_3/scss/_utilities.scss +3 -4
  68. data/apps/core/components/public/bootstrap_3/scss/_variables.scss +54 -32
  69. data/apps/core/components/public/bootstrap_3/scss/bootstrap.css +8772 -0
  70. data/apps/core/components/public/bootstrap_3/scss/bootstrap.scss +6 -0
  71. data/apps/core/components/public/bootstrap_3/scss/mixins/_background-variant.scss +2 -1
  72. data/apps/core/components/public/bootstrap_3/scss/mixins/_buttons.scss +19 -1
  73. data/apps/core/components/public/bootstrap_3/scss/mixins/_forms.scss +5 -1
  74. data/apps/core/components/public/bootstrap_3/scss/mixins/_gradients.scss +1 -1
  75. data/apps/core/components/public/bootstrap_3/scss/mixins/_grid-framework.scss +4 -10
  76. data/apps/core/components/public/bootstrap_3/scss/mixins/_grid.scss +7 -7
  77. data/apps/core/components/public/bootstrap_3/scss/mixins/_hide-text.scss +3 -3
  78. data/apps/core/components/public/bootstrap_3/scss/mixins/_labels.scss +1 -1
  79. data/apps/core/components/public/bootstrap_3/scss/mixins/_list-group.scss +3 -2
  80. data/apps/core/components/public/bootstrap_3/scss/mixins/_opacity.scss +1 -1
  81. data/apps/core/components/public/bootstrap_3/scss/mixins/_pagination.scss +2 -1
  82. data/apps/core/components/public/bootstrap_3/scss/mixins/_panels.scss +4 -0
  83. data/apps/core/components/public/bootstrap_3/scss/mixins/_progress-bar.scss +3 -1
  84. data/apps/core/components/public/bootstrap_3/scss/mixins/_reset-text.scss +18 -0
  85. data/apps/core/components/public/bootstrap_3/scss/mixins/_responsive-visibility.scss +1 -1
  86. data/apps/core/components/public/bootstrap_3/scss/mixins/_text-emphasis.scss +2 -1
  87. data/apps/core/components/public/bootstrap_3/scss/mixins/_vendor-prefixes.scss +11 -13
  88. data/apps/core/components/public/css/table_base.css +46 -1
  89. data/apps/core/components/public/fontawesome_4/fonts/font-awesome/fontawesome-webfont.eot +0 -0
  90. data/apps/core/components/public/fontawesome_4/fonts/font-awesome/fontawesome-webfont.svg +565 -0
  91. data/apps/core/components/public/fontawesome_4/fonts/font-awesome/fontawesome-webfont.ttf +0 -0
  92. data/apps/core/components/public/fontawesome_4/fonts/font-awesome/fontawesome-webfont.woff +0 -0
  93. data/apps/core/components/public/fontawesome_4/fonts/font-awesome/fontawesome-webfont.woff2 +0 -0
  94. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome.css +2893 -0
  95. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_animated.scss +34 -0
  96. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_bordered-pulled.scss +16 -0
  97. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_core.scss +12 -0
  98. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_extras.scss +44 -0
  99. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_fixed-width.scss +6 -0
  100. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_icons.scss +596 -0
  101. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_larger.scss +13 -0
  102. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_list.scss +19 -0
  103. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_mixins.scss +26 -0
  104. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_path.scss +14 -0
  105. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_rotated-flipped.scss +20 -0
  106. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_stacked.scss +20 -0
  107. data/apps/core/components/public/fontawesome_4/stylesheets/font-awesome/_variables.scss +608 -0
  108. data/apps/core/components/public/fontawesome_4/stylesheets/font_awesome.css +2893 -0
  109. data/apps/core/components/public/fontawesome_4/stylesheets/font_awesome.scss +17 -0
  110. data/apps/core/components/public/js/paginatore.js +307 -0
  111. data/apps/core/components/public/js/spin.js +399 -0
  112. data/apps/core/components/public/mmenu/js/jquery.mmenu.js +133 -0
  113. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.borderstyle.scss +33 -0
  114. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.effects.scss +199 -0
  115. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.fullscreen.scss +24 -0
  116. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.iconbar.scss +26 -0
  117. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.multiline.scss +15 -0
  118. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.pagedim.scss +36 -0
  119. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.pageshadow.scss +36 -0
  120. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.positioning.scss +87 -0
  121. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.themes.scss +76 -0
  122. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.tileview.scss +98 -0
  123. data/apps/core/components/public/mmenu/scss/extensions/_jquery.mmenu.widescreen.scss +61 -0
  124. data/apps/core/components/public/mmenu/scss/inc/_colors.scss +175 -0
  125. data/apps/core/components/public/mmenu/scss/inc/_mixins.scss +135 -0
  126. data/apps/core/components/public/mmenu/scss/inc/_sizing.scss +86 -0
  127. data/apps/core/components/public/mmenu/scss/inc/_variables.scss +61 -0
  128. data/apps/core/components/public/mmenu/scss/jquery.mmenu.scss +478 -0
  129. data/apps/core/components/widgets/table/table.rb +7 -0
  130. data/apps/core/components/widgets/table/table.shtml +50 -17
  131. data/apps/core/forms/tags/row.erb +1 -1
  132. data/lib/spiderfw/cmd/cmd.rb +2 -0
  133. data/lib/spiderfw/cmd/commands/assets.rb +12 -0
  134. data/lib/spiderfw/controller/mixins/visual.rb +1 -0
  135. data/lib/spiderfw/create.rb +0 -1
  136. data/lib/spiderfw/i18n/gettext.rb +33 -0
  137. data/lib/spiderfw/i18n/javascript_parser.rb +2 -2
  138. data/lib/spiderfw/i18n/shtml_parser.rb +2 -2
  139. data/lib/spiderfw/model/model.rb +2 -1
  140. data/lib/spiderfw/setup/app_manager.rb +8 -0
  141. data/lib/spiderfw/spider.rb +9 -1
  142. data/lib/spiderfw/templates/layout.rb +47 -39
  143. data/lib/spiderfw/templates/template.rb +12 -4
  144. metadata +46 -1
@@ -6,11 +6,17 @@
6
6
  // Bar animations
7
7
  // -------------------------
8
8
 
9
- @keyframes progress-bar-stripes {
9
+ // WebKit
10
+ @-webkit-keyframes progress-bar-stripes {
10
11
  from { background-position: 40px 0; }
11
12
  to { background-position: 0 0; }
12
13
  }
13
14
 
15
+ // Spec and IE10+
16
+ @keyframes progress-bar-stripes {
17
+ from { background-position: 40px 0; }
18
+ to { background-position: 0 0; }
19
+ }
14
20
 
15
21
 
16
22
  // Bar itself
@@ -22,7 +28,7 @@
22
28
  height: $line-height-computed;
23
29
  margin-bottom: $line-height-computed;
24
30
  background-color: $progress-bg;
25
- border-radius: $border-radius-base;
31
+ border-radius: $progress-border-radius;
26
32
  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
27
33
  }
28
34
 
@@ -41,33 +47,25 @@
41
47
  }
42
48
 
43
49
  // Striped bars
44
- .progress-striped .progress-bar {
45
- @include gradient-striped();
50
+ //
51
+ // `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the
52
+ // `.progress-bar-striped` class, which you just add to an existing
53
+ // `.progress-bar`.
54
+ .progress-striped .progress-bar,
55
+ .progress-bar-striped {
56
+ @include gradient-striped;
46
57
  background-size: 40px 40px;
47
58
  }
48
59
 
49
60
  // Call animation for the active one
50
- .progress.active .progress-bar {
61
+ //
62
+ // `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
63
+ // `.progress-bar.active` approach.
64
+ .progress.active .progress-bar,
65
+ .progress-bar.active {
51
66
  @include animation(progress-bar-stripes 2s linear infinite);
52
67
  }
53
68
 
54
- // Account for lower percentages
55
- .progress-bar {
56
- &[aria-valuenow="1"],
57
- &[aria-valuenow="2"] {
58
- min-width: 30px;
59
- }
60
-
61
- &[aria-valuenow="0"] {
62
- color: $gray-light;
63
- min-width: 30px;
64
- background-color: transparent;
65
- background-image: none;
66
- box-shadow: none;
67
- }
68
- }
69
-
70
-
71
69
 
72
70
  // Variations
73
71
  // -------------------------
@@ -12,7 +12,8 @@
12
12
  .embed-responsive-item,
13
13
  iframe,
14
14
  embed,
15
- object {
15
+ object,
16
+ video {
16
17
  position: absolute;
17
18
  top: 0;
18
19
  left: 0;
@@ -21,14 +22,14 @@
21
22
  width: 100%;
22
23
  border: 0;
23
24
  }
25
+ }
24
26
 
25
- // Modifier class for 16:9 aspect ratio
26
- &.embed-responsive-16by9 {
27
- padding-bottom: 56.25%;
28
- }
27
+ // Modifier class for 16:9 aspect ratio
28
+ .embed-responsive-16by9 {
29
+ padding-bottom: 56.25%;
30
+ }
29
31
 
30
- // Modifier class for 4:3 aspect ratio
31
- &.embed-responsive-4by3 {
32
- padding-bottom: 75%;
33
- }
32
+ // Modifier class for 4:3 aspect ratio
33
+ .embed-responsive-4by3 {
34
+ padding-bottom: 75%;
34
35
  }
@@ -18,15 +18,20 @@
18
18
  // Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
19
19
  // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
20
20
 
21
- @-ms-viewport {
22
- width: device-width;
21
+ @at-root {
22
+ @-ms-viewport {
23
+ width: device-width;
24
+ }
23
25
  }
24
26
 
25
27
 
26
28
  // Visibility utilities
27
29
  // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
28
30
 
29
- @include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
31
+ @include responsive-invisibility('.visible-xs');
32
+ @include responsive-invisibility('.visible-sm');
33
+ @include responsive-invisibility('.visible-md');
34
+ @include responsive-invisibility('.visible-lg');
30
35
 
31
36
  .visible-xs-block,
32
37
  .visible-xs-inline,
@@ -20,7 +20,7 @@
20
20
  // Body reset
21
21
 
22
22
  html {
23
- font-size: 62.5%;
23
+ font-size: 10px;
24
24
  -webkit-tap-highlight-color: rgba(0,0,0,0);
25
25
  }
26
26
 
@@ -52,11 +52,11 @@ a {
52
52
  &:hover,
53
53
  &:focus {
54
54
  color: $link-hover-color;
55
- text-decoration: underline;
55
+ text-decoration: $link-hover-decoration;
56
56
  }
57
57
 
58
58
  &:focus {
59
- @include tab-focus();
59
+ @include tab-focus;
60
60
  }
61
61
  }
62
62
 
@@ -79,7 +79,7 @@ img {
79
79
 
80
80
  // Responsive images (ensure images don't scale beyond their parents)
81
81
  .img-responsive {
82
- @include img-responsive();
82
+ @include img-responsive;
83
83
  }
84
84
 
85
85
  // Rounded corners
@@ -148,3 +148,14 @@ hr {
148
148
  clip: auto;
149
149
  }
150
150
  }
151
+
152
+
153
+ // iOS "clickable elements" fix for role="button"
154
+ //
155
+ // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
156
+ // for traditionally non-focusable elements with role="button"
157
+ // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
158
+
159
+ [role="button"] {
160
+ cursor: pointer;
161
+ }
@@ -4,9 +4,14 @@
4
4
 
5
5
 
6
6
  table {
7
- max-width: 100%;
8
7
  background-color: $table-bg;
9
8
  }
9
+ caption {
10
+ padding-top: $table-cell-padding;
11
+ padding-bottom: $table-cell-padding;
12
+ color: $text-muted;
13
+ text-align: left;
14
+ }
10
15
  th {
11
16
  text-align: left;
12
17
  }
@@ -16,6 +21,7 @@ th {
16
21
 
17
22
  .table {
18
23
  width: 100%;
24
+ max-width: 100%;
19
25
  margin-bottom: $line-height-computed;
20
26
  // Cells
21
27
  > thead,
@@ -105,11 +111,8 @@ th {
105
111
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
106
112
 
107
113
  .table-striped {
108
- > tbody > tr:nth-child(odd) {
109
- > td,
110
- > th {
111
- background-color: $table-bg-accent;
112
- }
114
+ > tbody > tr:nth-of-type(odd) {
115
+ background-color: $table-bg-accent;
113
116
  }
114
117
  }
115
118
 
@@ -120,10 +123,7 @@ th {
120
123
 
121
124
  .table-hover {
122
125
  > tbody > tr:hover {
123
- > td,
124
- > th {
125
- background-color: $table-bg-hover;
126
- }
126
+ background-color: $table-bg-hover;
127
127
  }
128
128
  }
129
129
 
@@ -133,7 +133,7 @@ th {
133
133
  // Reset default table behavior
134
134
 
135
135
  table col[class*="col-"] {
136
- position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
136
+ position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
137
137
  float: none;
138
138
  display: table-column;
139
139
  }
@@ -141,7 +141,7 @@ table {
141
141
  td,
142
142
  th {
143
143
  &[class*="col-"] {
144
- position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
144
+ position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
145
145
  float: none;
146
146
  display: table-cell;
147
147
  }
@@ -169,14 +169,15 @@ table {
169
169
  // will display normally.
170
170
 
171
171
  .table-responsive {
172
+ overflow-x: auto;
173
+ min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
174
+
172
175
  @media screen and (max-width: $screen-xs-max) {
173
176
  width: 100%;
174
177
  margin-bottom: ($line-height-computed * 0.75);
175
178
  overflow-y: hidden;
176
- overflow-x: scroll;
177
179
  -ms-overflow-style: -ms-autohiding-scrollbar;
178
180
  border: 1px solid $table-border-color;
179
- -webkit-overflow-scrolling: touch;
180
181
 
181
182
  // Tighten up spacing
182
183
  > .table {
@@ -1,3 +1,8 @@
1
+ /*!
2
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
3
+ * Copyright 2011-2015 Twitter, Inc.
4
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
5
+ */
1
6
 
2
7
  //
3
8
  // Load core variables and mixins
@@ -7,7 +12,6 @@
7
12
  @import "mixins";
8
13
 
9
14
 
10
-
11
15
  //
12
16
  // Buttons
13
17
  // --------------------------------------------------
@@ -28,12 +32,22 @@
28
32
  &.active {
29
33
  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
30
34
  }
35
+
36
+ &.disabled,
37
+ &[disabled],
38
+ fieldset[disabled] & {
39
+ @include box-shadow(none);
40
+ }
41
+
42
+ .badge {
43
+ text-shadow: none;
44
+ }
31
45
  }
32
46
 
33
47
  // Mixin for generating new styles
34
48
  @mixin btn-styles($btn-color: #555) {
35
49
  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
36
- @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
50
+ @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
37
51
  background-repeat: repeat-x;
38
52
  border-color: darken($btn-color, 14%);
39
53
 
@@ -48,6 +62,20 @@
48
62
  background-color: darken($btn-color, 12%);
49
63
  border-color: darken($btn-color, 14%);
50
64
  }
65
+
66
+ &.disabled,
67
+ &[disabled],
68
+ fieldset[disabled] & {
69
+ &,
70
+ &:hover,
71
+ &:focus,
72
+ &.focus,
73
+ &:active,
74
+ &.active {
75
+ background-color: darken($btn-color, 12%);
76
+ background-image: none;
77
+ }
78
+ }
51
79
  }
52
80
 
53
81
  // Common styles
@@ -68,7 +96,6 @@
68
96
  .btn-danger { @include btn-styles($btn-danger-bg); }
69
97
 
70
98
 
71
-
72
99
  //
73
100
  // Images
74
101
  // --------------------------------------------------
@@ -79,7 +106,6 @@
79
106
  }
80
107
 
81
108
 
82
-
83
109
  //
84
110
  // Dropdowns
85
111
  // --------------------------------------------------
@@ -97,7 +123,6 @@
97
123
  }
98
124
 
99
125
 
100
-
101
126
  //
102
127
  // Navbar
103
128
  // --------------------------------------------------
@@ -105,13 +130,14 @@
105
130
  // Default navbar
106
131
  .navbar-default {
107
132
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
108
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
133
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
109
134
  border-radius: $navbar-border-radius;
110
135
  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
111
136
  @include box-shadow($shadow);
112
137
 
138
+ .navbar-nav > .open > a,
113
139
  .navbar-nav > .active > a {
114
- @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
140
+ @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
115
141
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
116
142
  }
117
143
  }
@@ -123,10 +149,11 @@
123
149
  // Inverted navbar
124
150
  .navbar-inverse {
125
151
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
126
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
127
-
152
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
153
+ border-radius: $navbar-border-radius;
154
+ .navbar-nav > .open > a,
128
155
  .navbar-nav > .active > a {
129
- @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
156
+ @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
130
157
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
131
158
  }
132
159
 
@@ -143,6 +170,17 @@
143
170
  border-radius: 0;
144
171
  }
145
172
 
173
+ // Fix active state of dropdown items in collapsed mode
174
+ @media (max-width: $grid-float-breakpoint-max) {
175
+ .navbar .navbar-nav .open .dropdown-menu > .active > a {
176
+ &,
177
+ &:hover,
178
+ &:focus {
179
+ color: #fff;
180
+ @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
181
+ }
182
+ }
183
+ }
146
184
 
147
185
 
148
186
  //
@@ -169,7 +207,6 @@
169
207
  .alert-danger { @include alert-styles($alert-danger-bg); }
170
208
 
171
209
 
172
-
173
210
  //
174
211
  // Progress bars
175
212
  // --------------------------------------------------
@@ -191,6 +228,11 @@
191
228
  .progress-bar-warning { @include progress-bar-styles($progress-bar-warning-bg); }
192
229
  .progress-bar-danger { @include progress-bar-styles($progress-bar-danger-bg); }
193
230
 
231
+ // Reset the striped class because our mixins don't do multiple gradients and
232
+ // the above custom styles override the new `.progress-bar-striped` in v3.2.0.
233
+ .progress-bar-striped {
234
+ @include gradient-striped;
235
+ }
194
236
 
195
237
 
196
238
  //
@@ -207,8 +249,11 @@
207
249
  text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
208
250
  @include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
209
251
  border-color: darken($list-group-active-border, 7.5%);
210
- }
211
252
 
253
+ .badge {
254
+ text-shadow: none;
255
+ }
256
+ }
212
257
 
213
258
 
214
259
  //
@@ -234,7 +279,6 @@
234
279
  .panel-danger > .panel-heading { @include panel-heading-styles($panel-danger-heading-bg); }
235
280
 
236
281
 
237
-
238
282
  //
239
283
  // Wells
240
284
  // --------------------------------------------------
@@ -12,11 +12,11 @@
12
12
  background-color: $thumbnail-bg;
13
13
  border: 1px solid $thumbnail-border;
14
14
  border-radius: $thumbnail-border-radius;
15
- @include transition(all .2s ease-in-out);
15
+ @include transition(border .2s ease-in-out);
16
16
 
17
17
  > img,
18
18
  a > img {
19
- @include img-responsive();
19
+ @include img-responsive;
20
20
  margin-left: auto;
21
21
  margin-right: auto;
22
22
  }
@@ -8,9 +8,11 @@
8
8
  position: absolute;
9
9
  z-index: $zindex-tooltip;
10
10
  display: block;
11
- visibility: visible;
11
+ // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
12
+ // So reset our font and text properties to avoid inheriting weird values.
13
+ @include reset-text;
12
14
  font-size: $font-size-small;
13
- line-height: 1.4;
15
+
14
16
  @include opacity(0);
15
17
 
16
18
  &.in { @include opacity($tooltip-opacity); }
@@ -26,7 +28,6 @@
26
28
  padding: 3px 8px;
27
29
  color: $tooltip-color;
28
30
  text-align: center;
29
- text-decoration: none;
30
31
  background-color: $tooltip-bg;
31
32
  border-radius: $border-radius-base;
32
33
  }
@@ -39,6 +40,7 @@
39
40
  border-color: transparent;
40
41
  border-style: solid;
41
42
  }
43
+ // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
42
44
  .tooltip {
43
45
  &.top .tooltip-arrow {
44
46
  bottom: 0;
@@ -49,13 +51,15 @@
49
51
  }
50
52
  &.top-left .tooltip-arrow {
51
53
  bottom: 0;
52
- left: $tooltip-arrow-width;
54
+ right: $tooltip-arrow-width;
55
+ margin-bottom: -$tooltip-arrow-width;
53
56
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
54
57
  border-top-color: $tooltip-arrow-color;
55
58
  }
56
59
  &.top-right .tooltip-arrow {
57
60
  bottom: 0;
58
- right: $tooltip-arrow-width;
61
+ left: $tooltip-arrow-width;
62
+ margin-bottom: -$tooltip-arrow-width;
59
63
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
60
64
  border-top-color: $tooltip-arrow-color;
61
65
  }
@@ -82,13 +86,15 @@
82
86
  }
83
87
  &.bottom-left .tooltip-arrow {
84
88
  top: 0;
85
- left: $tooltip-arrow-width;
89
+ right: $tooltip-arrow-width;
90
+ margin-top: -$tooltip-arrow-width;
86
91
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
87
92
  border-bottom-color: $tooltip-arrow-color;
88
93
  }
89
94
  &.bottom-right .tooltip-arrow {
90
95
  top: 0;
91
- right: $tooltip-arrow-width;
96
+ left: $tooltip-arrow-width;
97
+ margin-top: -$tooltip-arrow-width;
92
98
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
93
99
  border-bottom-color: $tooltip-arrow-color;
94
100
  }