padrino-admin 0.12.2 → 0.12.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (135) hide show
  1. checksums.yaml +4 -4
  2. data/lib/padrino-admin.rb +9 -17
  3. data/lib/padrino-admin/access_control.rb +1 -0
  4. data/lib/padrino-admin/bootstrap-less/alerts.less +1 -1
  5. data/lib/padrino-admin/bootstrap-less/badges.less +10 -6
  6. data/lib/padrino-admin/bootstrap-less/bootstrap.less +0 -10
  7. data/lib/padrino-admin/bootstrap-less/breadcrumbs.less +6 -3
  8. data/lib/padrino-admin/bootstrap-less/button-groups.less +22 -44
  9. data/lib/padrino-admin/bootstrap-less/buttons.less +12 -17
  10. data/lib/padrino-admin/bootstrap-less/carousel.less +33 -10
  11. data/lib/padrino-admin/bootstrap-less/code.less +15 -8
  12. data/lib/padrino-admin/bootstrap-less/dropdowns.less +31 -11
  13. data/lib/padrino-admin/bootstrap-less/font-awesome/bordered-pulled.less +16 -0
  14. data/lib/padrino-admin/bootstrap-less/font-awesome/core.less +9 -126
  15. data/lib/padrino-admin/bootstrap-less/font-awesome/fixed-width.less +6 -0
  16. data/lib/padrino-admin/bootstrap-less/font-awesome/font-awesome.less +14 -30
  17. data/lib/padrino-admin/bootstrap-less/font-awesome/icons.less +409 -378
  18. data/lib/padrino-admin/bootstrap-less/font-awesome/larger.less +13 -0
  19. data/lib/padrino-admin/bootstrap-less/font-awesome/list.less +19 -0
  20. data/lib/padrino-admin/bootstrap-less/font-awesome/mixins.less +14 -42
  21. data/lib/padrino-admin/bootstrap-less/font-awesome/path.less +6 -6
  22. data/lib/padrino-admin/bootstrap-less/font-awesome/rotated-flipped.less +9 -0
  23. data/lib/padrino-admin/bootstrap-less/font-awesome/spinning.less +30 -0
  24. data/lib/padrino-admin/bootstrap-less/font-awesome/stacked.less +20 -0
  25. data/lib/padrino-admin/bootstrap-less/font-awesome/variables.less +377 -731
  26. data/lib/padrino-admin/bootstrap-less/forms.less +105 -39
  27. data/lib/padrino-admin/bootstrap-less/glyphicons.less +16 -15
  28. data/lib/padrino-admin/bootstrap-less/grid.less +59 -305
  29. data/lib/padrino-admin/bootstrap-less/input-groups.less +43 -13
  30. data/lib/padrino-admin/bootstrap-less/jumbotron.less +12 -8
  31. data/lib/padrino-admin/bootstrap-less/labels.less +6 -0
  32. data/lib/padrino-admin/bootstrap-less/list-group.less +37 -15
  33. data/lib/padrino-admin/bootstrap-less/mixins.less +283 -80
  34. data/lib/padrino-admin/bootstrap-less/modals.less +19 -22
  35. data/lib/padrino-admin/bootstrap-less/navbar.less +73 -78
  36. data/lib/padrino-admin/bootstrap-less/navs.less +45 -32
  37. data/lib/padrino-admin/bootstrap-less/normalize.less +148 -121
  38. data/lib/padrino-admin/bootstrap-less/padrino-admin.less +3 -1
  39. data/lib/padrino-admin/bootstrap-less/pager.less +5 -5
  40. data/lib/padrino-admin/bootstrap-less/pagination.less +8 -3
  41. data/lib/padrino-admin/bootstrap-less/panels.less +102 -20
  42. data/lib/padrino-admin/bootstrap-less/print.less +6 -5
  43. data/lib/padrino-admin/bootstrap-less/progress-bars.less +4 -19
  44. data/lib/padrino-admin/bootstrap-less/responsive-utilities.less +32 -159
  45. data/lib/padrino-admin/bootstrap-less/scaffolding.less +18 -14
  46. data/lib/padrino-admin/bootstrap-less/tables.less +47 -50
  47. data/lib/padrino-admin/bootstrap-less/theme.less +33 -18
  48. data/lib/padrino-admin/bootstrap-less/thumbnails.less +23 -18
  49. data/lib/padrino-admin/bootstrap-less/tooltip.less +9 -9
  50. data/lib/padrino-admin/bootstrap-less/type.less +139 -81
  51. data/lib/padrino-admin/bootstrap-less/utilities.less +15 -1
  52. data/lib/padrino-admin/bootstrap-less/variables.less +398 -191
  53. data/lib/padrino-admin/bootstrap-less/wells.less +1 -1
  54. data/lib/padrino-admin/generators/admin_app.rb +1 -1
  55. data/lib/padrino-admin/generators/templates/account/minirecord.rb.tt +1 -1
  56. data/lib/padrino-admin/generators/templates/assets/images/font/FontAwesome.otf +0 -0
  57. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.eot +0 -0
  58. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.svg +23 -8
  59. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.ttf +0 -0
  60. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.woff +0 -0
  61. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/affix.js +36 -25
  62. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/alert.js +7 -17
  63. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/bootstrap.min.js +6 -6
  64. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/button.js +26 -28
  65. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/carousel.js +22 -34
  66. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/collapse.js +9 -18
  67. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/dropdown.js +25 -32
  68. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/modal.js +27 -30
  69. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/popover.js +16 -23
  70. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/scrollspy.js +19 -24
  71. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/tab.js +10 -20
  72. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/tooltip.js +54 -41
  73. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/transition.js +13 -21
  74. data/lib/padrino-admin/generators/templates/assets/javascripts/jquery-1.11.0.min.js +4 -0
  75. data/lib/padrino-admin/generators/templates/assets/stylesheets/bootstrap.css +4 -1238
  76. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/FontAwesome.otf +0 -0
  77. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.eot +0 -0
  78. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.svg +414 -0
  79. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.ttf +0 -0
  80. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.woff +0 -0
  81. data/lib/padrino-admin/generators/templates/erb/app/base/index.erb.tt +5 -5
  82. data/lib/padrino-admin/generators/templates/erb/app/errors/403.erb.tt +1 -1
  83. data/lib/padrino-admin/generators/templates/erb/app/errors/404.erb.tt +1 -1
  84. data/lib/padrino-admin/generators/templates/erb/app/errors/500.erb.tt +1 -1
  85. data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt +2 -2
  86. data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt +1 -1
  87. data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt +5 -5
  88. data/lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt +5 -5
  89. data/lib/padrino-admin/generators/templates/haml/app/errors/403.haml.tt +1 -1
  90. data/lib/padrino-admin/generators/templates/haml/app/errors/404.haml.tt +1 -1
  91. data/lib/padrino-admin/generators/templates/haml/app/errors/500.haml.tt +1 -1
  92. data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt +2 -2
  93. data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt +2 -1
  94. data/lib/padrino-admin/generators/templates/haml/page/index.haml.tt +4 -4
  95. data/lib/padrino-admin/generators/templates/slim/app/base/index.slim.tt +5 -5
  96. data/lib/padrino-admin/generators/templates/slim/app/errors/403.slim.tt +1 -1
  97. data/lib/padrino-admin/generators/templates/slim/app/errors/404.slim.tt +1 -1
  98. data/lib/padrino-admin/generators/templates/slim/app/errors/500.slim.tt +1 -1
  99. data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt +2 -2
  100. data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt +1 -1
  101. data/lib/padrino-admin/generators/templates/slim/page/index.slim.tt +4 -4
  102. data/lib/padrino-admin/helpers/view_helpers.rb +1 -1
  103. data/lib/padrino-admin/locale/admin/zh_tw.yml +22 -22
  104. data/lib/padrino-admin/locale/orm/cs.yml +0 -25
  105. data/lib/padrino-admin/locale/orm/da.yml +0 -25
  106. data/lib/padrino-admin/locale/orm/de.yml +0 -25
  107. data/lib/padrino-admin/locale/orm/en.yml +0 -25
  108. data/lib/padrino-admin/locale/orm/es.yml +0 -25
  109. data/lib/padrino-admin/locale/orm/fr.yml +0 -25
  110. data/lib/padrino-admin/locale/orm/hu.yml +0 -25
  111. data/lib/padrino-admin/locale/orm/it.yml +0 -25
  112. data/lib/padrino-admin/locale/orm/ja.yml +0 -25
  113. data/lib/padrino-admin/locale/orm/lv.yml +0 -25
  114. data/lib/padrino-admin/locale/orm/nl.yml +0 -25
  115. data/lib/padrino-admin/locale/orm/no.yml +1 -26
  116. data/lib/padrino-admin/locale/orm/pt_br.yml +0 -25
  117. data/lib/padrino-admin/locale/orm/ro.yml +0 -25
  118. data/lib/padrino-admin/locale/orm/ru.yml +0 -25
  119. data/lib/padrino-admin/locale/orm/sv.yml +0 -25
  120. data/lib/padrino-admin/locale/orm/tr.yml +0 -25
  121. data/lib/padrino-admin/locale/orm/uk.yml +0 -25
  122. data/lib/padrino-admin/locale/orm/zh_cn.yml +0 -25
  123. data/lib/padrino-admin/locale/orm/zh_tw.yml +0 -25
  124. data/test/fixtures/data_mapper.rb +0 -41
  125. data/test/generators/test_admin_app_generator.rb +3 -6
  126. data/test/test_locale.rb +0 -33
  127. metadata +19 -14
  128. data/lib/padrino-admin/bootstrap-less/accordion.less +0 -31
  129. data/lib/padrino-admin/bootstrap-less/font-awesome-ie7.less +0 -1953
  130. data/lib/padrino-admin/bootstrap-less/font-awesome.less +0 -33
  131. data/lib/padrino-admin/bootstrap-less/font-awesome/bootstrap.less +0 -84
  132. data/lib/padrino-admin/bootstrap-less/font-awesome/extras.less +0 -93
  133. data/lib/padrino-admin/bootstrap-less/font-awesome/font-awesome-ie7.less +0 -1953
  134. data/lib/padrino-admin/generators/templates/assets/javascripts/jquery-1.9.0.min.js +0 -4
  135. data/lib/padrino-admin/utils/crypt.rb +0 -41
@@ -4,8 +4,13 @@
4
4
 
5
5
 
6
6
  // Reset the box-sizing
7
-
8
- *,
7
+ //
8
+ // Heads up! This reset may cause conflicts with some third-party widgets.
9
+ // For recommendations on resolving such conflicts, see
10
+ // http://getbootstrap.com/getting-started/#third-box-sizing
11
+ * {
12
+ .box-sizing(border-box);
13
+ }
9
14
  *:before,
10
15
  *:after {
11
16
  .box-sizing(border-box);
@@ -37,17 +42,6 @@ textarea {
37
42
  line-height: inherit;
38
43
  }
39
44
 
40
- // Reset unusual Firefox-on-Android default style.
41
- //
42
- // See https://github.com/necolas/normalize.css/issues/214
43
-
44
- button,
45
- input,
46
- select[multiple],
47
- textarea {
48
- background-image: none;
49
- }
50
-
51
45
 
52
46
  // Links
53
47
 
@@ -67,6 +61,16 @@ a {
67
61
  }
68
62
 
69
63
 
64
+ // Figures
65
+ //
66
+ // We reset this here because previously Normalize had no `figure` margins. This
67
+ // ensures we don't break anyone's use of the element.
68
+
69
+ figure {
70
+ margin: 0;
71
+ }
72
+
73
+
70
74
  // Images
71
75
 
72
76
  img {
@@ -125,6 +129,6 @@ hr {
125
129
  margin: -1px;
126
130
  padding: 0;
127
131
  overflow: hidden;
128
- clip: rect(0 0 0 0);
132
+ clip: rect(0,0,0,0);
129
133
  border: 0;
130
134
  }
@@ -18,9 +18,9 @@ th {
18
18
  width: 100%;
19
19
  margin-bottom: @line-height-computed;
20
20
  // Cells
21
- thead,
22
- tbody,
23
- tfoot {
21
+ > thead,
22
+ > tbody,
23
+ > tfoot {
24
24
  > tr {
25
25
  > th,
26
26
  > td {
@@ -32,22 +32,23 @@ th {
32
32
  }
33
33
  }
34
34
  // Bottom align for column headings
35
- thead > tr > th {
35
+ > thead > tr > th {
36
36
  vertical-align: bottom;
37
37
  border-bottom: 2px solid @table-border-color;
38
38
  }
39
39
  // Remove top border from thead by default
40
- caption + thead,
41
- colgroup + thead,
42
- thead:first-child {
43
- tr:first-child {
44
- th, td {
40
+ > caption + thead,
41
+ > colgroup + thead,
42
+ > thead:first-child {
43
+ > tr:first-child {
44
+ > th,
45
+ > td {
45
46
  border-top: 0;
46
47
  }
47
48
  }
48
49
  }
49
50
  // Account for multiple tbody instances
50
- tbody + tbody {
51
+ > tbody + tbody {
51
52
  border-top: 2px solid @table-border-color;
52
53
  }
53
54
 
@@ -61,9 +62,9 @@ th {
61
62
  // Condensed table w/ half padding
62
63
 
63
64
  .table-condensed {
64
- thead,
65
- tbody,
66
- tfoot {
65
+ > thead,
66
+ > tbody,
67
+ > tfoot {
67
68
  > tr {
68
69
  > th,
69
70
  > td {
@@ -90,12 +91,10 @@ th {
90
91
  }
91
92
  }
92
93
  }
93
- > thead {
94
- > tr {
95
- > th,
96
- > td {
97
- border-bottom-width: 2px;
98
- }
94
+ > thead > tr {
95
+ > th,
96
+ > td {
97
+ border-bottom-width: 2px;
99
98
  }
100
99
  }
101
100
  }
@@ -106,12 +105,10 @@ th {
106
105
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
107
106
 
108
107
  .table-striped {
109
- > tbody {
110
- > tr:nth-child(odd) {
111
- > td,
112
- > th {
113
- background-color: @table-bg-accent;
114
- }
108
+ > tbody > tr:nth-child(odd) {
109
+ > td,
110
+ > th {
111
+ background-color: @table-bg-accent;
115
112
  }
116
113
  }
117
114
  }
@@ -122,12 +119,10 @@ th {
122
119
  // Placed here since it has to come after the potential zebra striping
123
120
 
124
121
  .table-hover {
125
- > tbody {
126
- > tr:hover {
127
- > td,
128
- > th {
129
- background-color: @table-bg-hover;
130
- }
122
+ > tbody > tr:hover {
123
+ > td,
124
+ > th {
125
+ background-color: @table-bg-hover;
131
126
  }
132
127
  }
133
128
  }
@@ -138,6 +133,7 @@ th {
138
133
  // Reset default table behavior
139
134
 
140
135
  table col[class*="col-"] {
136
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
141
137
  float: none;
142
138
  display: table-column;
143
139
  }
@@ -145,6 +141,7 @@ table {
145
141
  td,
146
142
  th {
147
143
  &[class*="col-"] {
144
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
148
145
  float: none;
149
146
  display: table-cell;
150
147
  }
@@ -157,41 +154,33 @@ table {
157
154
  // Exact selectors below required to override `.table-striped` and prevent
158
155
  // inheritance to nested tables.
159
156
 
160
- .table > thead > tr,
161
- .table > tbody > tr,
162
- .table > tfoot > tr {
163
- > td.active,
164
- > th.active,
165
- &.active > td,
166
- &.active > th {
167
- background-color: @table-bg-active;
168
- }
169
- }
170
-
171
157
  // Generate the contextual variants
172
- .table-row-variant(success; @state-success-bg; @state-success-border);
173
- .table-row-variant(danger; @state-danger-bg; @state-danger-border);
174
- .table-row-variant(warning; @state-warning-bg; @state-warning-border);
158
+ .table-row-variant(active; @table-bg-active);
159
+ .table-row-variant(success; @state-success-bg);
160
+ .table-row-variant(info; @state-info-bg);
161
+ .table-row-variant(warning; @state-warning-bg);
162
+ .table-row-variant(danger; @state-danger-bg);
175
163
 
176
164
 
177
165
  // Responsive tables
178
166
  //
179
- // Wrap your tables in `.table-scrollable` and we'll make them mobile friendly
167
+ // Wrap your tables in `.table-responsive` and we'll make them mobile friendly
180
168
  // by enabling horizontal scrolling. Only applies <768px. Everything above that
181
169
  // will display normally.
182
170
 
183
- @media (max-width: @screen-sm) {
171
+ @media (max-width: @screen-xs-max) {
184
172
  .table-responsive {
185
173
  width: 100%;
186
- margin-bottom: 15px;
174
+ margin-bottom: (@line-height-computed * 0.75);
187
175
  overflow-y: hidden;
188
176
  overflow-x: scroll;
177
+ -ms-overflow-style: -ms-autohiding-scrollbar;
189
178
  border: 1px solid @table-border-color;
179
+ -webkit-overflow-scrolling: touch;
190
180
 
191
- // Tighten up spacing and give a background color
181
+ // Tighten up spacing
192
182
  > .table {
193
183
  margin-bottom: 0;
194
- background-color: #fff;
195
184
 
196
185
  // Ensure the content doesn't wrap
197
186
  > thead,
@@ -224,6 +213,13 @@ table {
224
213
  border-right: 0;
225
214
  }
226
215
  }
216
+ }
217
+
218
+ // Only nuke the last row's bottom-border in `tbody` and `tfoot` since
219
+ // chances are there will be only one `tr` in a `thead` and that would
220
+ // remove the border altogether.
221
+ > tbody,
222
+ > tfoot {
227
223
  > tr:last-child {
228
224
  > th,
229
225
  > td {
@@ -231,6 +227,7 @@ table {
231
227
  }
232
228
  }
233
229
  }
230
+
234
231
  }
235
232
  }
236
233
  }
@@ -31,14 +31,22 @@
31
31
  }
32
32
 
33
33
  // Mixin for generating new styles
34
- .btn-styles(@btn-color: #555;) {
35
- #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 10%));
36
- border-color: darken(@btn-color, 12%);
34
+ .btn-styles(@btn-color: #555) {
35
+ #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));
36
+ .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
37
+ background-repeat: repeat-x;
38
+ border-color: darken(@btn-color, 14%);
39
+
40
+ &:hover,
41
+ &:focus {
42
+ background-color: darken(@btn-color, 12%);
43
+ background-position: 0 -15px;
44
+ }
37
45
 
38
46
  &:active,
39
47
  &.active {
40
- background-color: darken(@btn-color, 10%);
41
- border-color: darken(@btn-color, 12%);
48
+ background-color: darken(@btn-color, 12%);
49
+ border-color: darken(@btn-color, 14%);
42
50
  }
43
51
  }
44
52
 
@@ -52,12 +60,12 @@
52
60
  }
53
61
 
54
62
  // Apply the mixin to the buttons
55
- .btn-default { .btn-styles(@btn-default-bg;); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
63
+ .btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
56
64
  .btn-primary { .btn-styles(@btn-primary-bg); }
57
65
  .btn-success { .btn-styles(@btn-success-bg); }
66
+ .btn-info { .btn-styles(@btn-info-bg); }
58
67
  .btn-warning { .btn-styles(@btn-warning-bg); }
59
68
  .btn-danger { .btn-styles(@btn-danger-bg); }
60
- .btn-info { .btn-styles(@btn-info-bg); }
61
69
 
62
70
 
63
71
 
@@ -77,12 +85,15 @@
77
85
  // --------------------------------------------------
78
86
 
79
87
  .dropdown-menu > li > a:hover,
80
- .dropdown-menu > li > a:focus,
88
+ .dropdown-menu > li > a:focus {
89
+ #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
90
+ background-color: darken(@dropdown-link-hover-bg, 5%);
91
+ }
81
92
  .dropdown-menu > .active > a,
82
93
  .dropdown-menu > .active > a:hover,
83
94
  .dropdown-menu > .active > a:focus {
84
- #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
85
- background-color: darken(@dropdown-link-hover-bg, 5%);
95
+ #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
96
+ background-color: darken(@dropdown-link-active-bg, 5%);
86
97
  }
87
98
 
88
99
 
@@ -91,15 +102,17 @@
91
102
  // Navbar
92
103
  // --------------------------------------------------
93
104
 
94
- // Basic navbar
95
- .navbar {
96
- #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;);
105
+ // Default navbar
106
+ .navbar-default {
107
+ #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);
108
+ .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
97
109
  border-radius: @navbar-border-radius;
98
110
  @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
99
111
  .box-shadow(@shadow);
100
112
 
101
113
  .navbar-nav > .active > a {
102
- background-color: @navbar-default-bg;
114
+ #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));
115
+ .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
103
116
  }
104
117
  }
105
118
  .navbar-brand,
@@ -109,10 +122,12 @@
109
122
 
110
123
  // Inverted navbar
111
124
  .navbar-inverse {
112
- #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg;);
125
+ #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);
126
+ .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
113
127
 
114
128
  .navbar-nav > .active > a {
115
- background-color: @navbar-inverse-bg;
129
+ #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));
130
+ .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
116
131
  }
117
132
 
118
133
  .navbar-brand,
@@ -161,7 +176,7 @@
161
176
 
162
177
  // Give the progress background some depth
163
178
  .progress {
164
- #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg;)
179
+ #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg)
165
180
  }
166
181
 
167
182
  // Mixin for generating new styles
@@ -225,7 +240,7 @@
225
240
  // --------------------------------------------------
226
241
 
227
242
  .well {
228
- #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg;);
243
+ #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg);
229
244
  border-color: darken(@well-bg, 10%);
230
245
  @shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);
231
246
  .box-shadow(@shadow);
@@ -5,27 +5,32 @@
5
5
 
6
6
  // Mixin and adjust the regular image class
7
7
  .thumbnail {
8
- .img-thumbnail();
9
- display: block; // Override the inline-block from `.img-thumbnail`
8
+ display: block;
9
+ padding: @thumbnail-padding;
10
+ margin-bottom: @line-height-computed;
11
+ line-height: @line-height-base;
12
+ background-color: @thumbnail-bg;
13
+ border: 1px solid @thumbnail-border;
14
+ border-radius: @thumbnail-border-radius;
15
+ .transition(all .2s ease-in-out);
10
16
 
11
- > img {
17
+ > img,
18
+ a > img {
12
19
  .img-responsive();
20
+ margin-left: auto;
21
+ margin-right: auto;
13
22
  }
14
- }
15
-
16
23
 
17
- // Add a hover state for linked versions only
18
- a.thumbnail:hover,
19
- a.thumbnail:focus {
20
- border-color: @link-color;
21
- }
24
+ // Add a hover state for linked versions only
25
+ a&:hover,
26
+ a&:focus,
27
+ a&.active {
28
+ border-color: @link-color;
29
+ }
22
30
 
23
- // Images and captions
24
- .thumbnail > img {
25
- margin-left: auto;
26
- margin-right: auto;
27
- }
28
- .thumbnail .caption {
29
- padding: @thumbnail-caption-padding;
30
- color: @thumbnail-caption-color;
31
+ // Image captions
32
+ .caption {
33
+ padding: @thumbnail-caption-padding;
34
+ color: @thumbnail-caption-color;
35
+ }
31
36
  }
@@ -13,11 +13,11 @@
13
13
  line-height: 1.4;
14
14
  .opacity(0);
15
15
 
16
- &.in { .opacity(.9); }
17
- &.top { margin-top: -3px; padding: 5px 0; }
18
- &.right { margin-left: 3px; padding: 0 5px; }
19
- &.bottom { margin-top: 3px; padding: 5px 0; }
20
- &.left { margin-left: -3px; padding: 0 5px; }
16
+ &.in { .opacity(@tooltip-opacity); }
17
+ &.top { margin-top: -3px; padding: @tooltip-arrow-width 0; }
18
+ &.right { margin-left: 3px; padding: 0 @tooltip-arrow-width; }
19
+ &.bottom { margin-top: 3px; padding: @tooltip-arrow-width 0; }
20
+ &.left { margin-left: -3px; padding: 0 @tooltip-arrow-width; }
21
21
  }
22
22
 
23
23
  // Wrapper for the tooltip content
@@ -49,13 +49,13 @@
49
49
  }
50
50
  &.top-left .tooltip-arrow {
51
51
  bottom: 0;
52
- left: 5px;
52
+ left: @tooltip-arrow-width;
53
53
  border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
54
54
  border-top-color: @tooltip-arrow-color;
55
55
  }
56
56
  &.top-right .tooltip-arrow {
57
57
  bottom: 0;
58
- right: 5px;
58
+ right: @tooltip-arrow-width;
59
59
  border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
60
60
  border-top-color: @tooltip-arrow-color;
61
61
  }
@@ -82,13 +82,13 @@
82
82
  }
83
83
  &.bottom-left .tooltip-arrow {
84
84
  top: 0;
85
- left: 5px;
85
+ left: @tooltip-arrow-width;
86
86
  border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
87
87
  border-bottom-color: @tooltip-arrow-color;
88
88
  }
89
89
  &.bottom-right .tooltip-arrow {
90
90
  top: 0;
91
- right: 5px;
91
+ right: @tooltip-arrow-width;
92
92
  border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
93
93
  border-bottom-color: @tooltip-arrow-color;
94
94
  }