activeadmin 2.14.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (116) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +143 -0
  3. data/CONTRIBUTING.md +0 -7
  4. data/README.md +2 -2
  5. data/app/assets/stylesheets/active_admin/_forms.scss +1 -2
  6. data/app/assets/stylesheets/active_admin/components/_comments.scss +1 -1
  7. data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +7 -4
  8. data/app/assets/stylesheets/active_admin/components/_pagination.scss +5 -2
  9. data/app/assets/stylesheets/active_admin/components/_table_tools.scss +9 -6
  10. data/app/assets/stylesheets/active_admin/components/_tabs.scss +10 -7
  11. data/app/assets/stylesheets/active_admin/mixins/_buttons.scss +2 -2
  12. data/app/assets/stylesheets/active_admin/pages/_logged_out.scss +1 -1
  13. data/app/assets/stylesheets/active_admin/structure/_footer.scss +1 -1
  14. data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +6 -3
  15. data/config/locales/ar.yml +0 -7
  16. data/config/locales/az.yml +0 -7
  17. data/config/locales/bg.yml +0 -7
  18. data/config/locales/bs.yml +0 -7
  19. data/config/locales/ca.yml +0 -7
  20. data/config/locales/cs.yml +0 -7
  21. data/config/locales/da.yml +0 -7
  22. data/config/locales/de-CH.yml +0 -7
  23. data/config/locales/de.yml +0 -8
  24. data/config/locales/el.yml +0 -7
  25. data/config/locales/en-CA.yml +0 -7
  26. data/config/locales/en-GB.yml +0 -7
  27. data/config/locales/en.yml +0 -8
  28. data/config/locales/eo.yml +0 -8
  29. data/config/locales/es-MX.yml +0 -7
  30. data/config/locales/es.yml +0 -8
  31. data/config/locales/fa.yml +0 -7
  32. data/config/locales/fi.yml +0 -7
  33. data/config/locales/fr.yml +0 -8
  34. data/config/locales/he.yml +0 -9
  35. data/config/locales/hr.yml +0 -7
  36. data/config/locales/hu.yml +0 -8
  37. data/config/locales/id.yml +0 -7
  38. data/config/locales/it.yml +0 -8
  39. data/config/locales/ja.yml +0 -8
  40. data/config/locales/ko.yml +0 -7
  41. data/config/locales/lt.yml +0 -8
  42. data/config/locales/lv.yml +0 -7
  43. data/config/locales/mk.yml +0 -8
  44. data/config/locales/nb.yml +0 -8
  45. data/config/locales/nl.yml +0 -8
  46. data/config/locales/pl.yml +0 -8
  47. data/config/locales/pt-BR.yml +0 -8
  48. data/config/locales/pt-PT.yml +0 -7
  49. data/config/locales/ro.yml +0 -7
  50. data/config/locales/ru.yml +0 -6
  51. data/config/locales/sk.yml +0 -8
  52. data/config/locales/sv-SE.yml +58 -39
  53. data/config/locales/tr.yml +0 -11
  54. data/config/locales/uk.yml +0 -6
  55. data/config/locales/vi.yml +0 -8
  56. data/config/locales/zh-CN.yml +0 -8
  57. data/config/locales/zh-TW.yml +0 -7
  58. data/lib/active_admin/csv_builder.rb +23 -2
  59. data/lib/active_admin/engine.rb +4 -0
  60. data/lib/active_admin/filters/active_filter.rb +1 -1
  61. data/lib/active_admin/filters/forms.rb +2 -2
  62. data/lib/active_admin/filters/formtastic_addons.rb +1 -1
  63. data/lib/active_admin/form_builder.rb +5 -6
  64. data/lib/active_admin/inputs/filters/base/search_method_select.rb +2 -2
  65. data/lib/active_admin/inputs/filters/date_range_input.rb +2 -2
  66. data/lib/active_admin/inputs/filters/numeric_input.rb +1 -1
  67. data/lib/active_admin/inputs/filters/select_input.rb +3 -3
  68. data/lib/active_admin/inputs/filters/string_input.rb +1 -1
  69. data/lib/active_admin/menu.rb +1 -0
  70. data/lib/active_admin/namespace.rb +1 -1
  71. data/lib/active_admin/namespace_settings.rb +1 -1
  72. data/lib/active_admin/orm/active_record/comments/comment.rb +8 -0
  73. data/lib/active_admin/pundit_adapter.rb +2 -2
  74. data/lib/active_admin/resource/attributes.rb +8 -1
  75. data/lib/active_admin/resource/belongs_to.rb +0 -1
  76. data/lib/active_admin/resource_controller/decorators.rb +1 -1
  77. data/lib/active_admin/resource_controller/streaming.rb +1 -1
  78. data/lib/active_admin/version.rb +1 -1
  79. data/lib/active_admin/view_helpers/display_helper.rb +10 -3
  80. data/lib/active_admin/views/components/active_admin_form.rb +14 -6
  81. data/lib/active_admin/views/components/paginated_collection.rb +4 -1
  82. data/lib/active_admin/views/index_as_table.rb +7 -6
  83. data/lib/active_admin/views/pages/show.rb +1 -7
  84. data/lib/active_admin.rb +4 -2
  85. data/lib/generators/active_admin/install/templates/active_admin.rb.erb +2 -2
  86. data/vendor/assets/javascripts/jquery-ui/data.js +12 -8
  87. data/vendor/assets/javascripts/jquery-ui/disable-selection.js +10 -7
  88. data/vendor/assets/javascripts/jquery-ui/focusable.js +12 -9
  89. data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js +60 -57
  90. data/vendor/assets/javascripts/jquery-ui/form.js +15 -12
  91. data/vendor/assets/javascripts/jquery-ui/ie.js +5 -2
  92. data/vendor/assets/javascripts/jquery-ui/keycode.js +11 -7
  93. data/vendor/assets/javascripts/jquery-ui/labels.js +46 -40
  94. data/vendor/assets/javascripts/jquery-ui/plugin.js +5 -2
  95. data/vendor/assets/javascripts/jquery-ui/position.js +30 -17
  96. data/vendor/assets/javascripts/jquery-ui/safe-active-element.js +6 -2
  97. data/vendor/assets/javascripts/jquery-ui/safe-blur.js +6 -2
  98. data/vendor/assets/javascripts/jquery-ui/scroll-parent.js +10 -7
  99. data/vendor/assets/javascripts/jquery-ui/tabbable.js +11 -8
  100. data/vendor/assets/javascripts/jquery-ui/unique-id.js +10 -7
  101. data/vendor/assets/javascripts/jquery-ui/version.js +6 -3
  102. data/vendor/assets/javascripts/jquery-ui/widget.js +53 -30
  103. data/vendor/assets/javascripts/jquery-ui/widgets/button.js +87 -24
  104. data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js +276 -273
  105. data/vendor/assets/javascripts/jquery-ui/widgets/controlgroup.js +15 -11
  106. data/vendor/assets/javascripts/jquery-ui/widgets/datepicker.js +182 -62
  107. data/vendor/assets/javascripts/jquery-ui/widgets/dialog.js +53 -36
  108. data/vendor/assets/javascripts/jquery-ui/widgets/draggable.js +28 -19
  109. data/vendor/assets/javascripts/jquery-ui/widgets/mouse.js +22 -11
  110. data/vendor/assets/javascripts/jquery-ui/widgets/resizable.js +47 -26
  111. data/vendor/assets/javascripts/jquery-ui/widgets/sortable.js +186 -125
  112. data/vendor/assets/javascripts/jquery-ui/widgets/tabs.js +20 -20
  113. metadata +30 -36
  114. data/lib/active_admin/deprecation.rb +0 -11
  115. data/lib/ransack_ext.rb +0 -21
  116. data/vendor/assets/javascripts/jquery-ui/escape-selector.js +0 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e192ee32c6a28d748f4fe6a3c82aba50933295ca915ccb3b5d4f283749dd8ae4
4
- data.tar.gz: b3440f204e78159fbff127db9085c81d921a23aacc11828dc1a95c54e1291096
3
+ metadata.gz: e080845beb483b8364c49bb199ac8b4ba61975854316d053df39b39208d863bf
4
+ data.tar.gz: c30bcfde594fb30c2a8796741451f245b77ddeaa66c6a66ecbfbcbec3064918a
5
5
  SHA512:
6
- metadata.gz: b757b6e53f0385ac472b370b92e9cfff96ad10a04551322c27d3fde495b4f5a8f43d6c54ff19d6d32ca7d39db631759c3d8a76a491ad27d7ba38490ecdbce7ab
7
- data.tar.gz: 03a6f3c614b350d6fafc130c1aebf31f0ba854ef06304bac52800cce61ce7dc26a674f07f2ead5032e89740e9f7e016bb1619f91e1e08e944f923ce5c76301c2
6
+ metadata.gz: fe64d783c2ac39dbbc74df16985dabcbee5e300039f8b703df6ccedf7dee24dcda09dd59b154383ba0dc593310f163dd6ca51af5f59d26b11646683158eeae4a
7
+ data.tar.gz: f4e988b7bf89e2cb291822c62d891d958ec48400e3ccee31fc2480b47ee1c8ab80608c939abb80733378c2f27a245044d1f89c68fe04c8fd850264df072ae8d1
data/CHANGELOG.md CHANGED
@@ -2,6 +2,112 @@
2
2
 
3
3
  ## Unreleased
4
4
 
5
+ ## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)
6
+
7
+ ### Enhancements
8
+
9
+ * Improve v3 docs regarding compatibility with vite_rails [#8548] by [@mattbrictson]
10
+ * Backport test against Rails 8.0 [#8556] by [@mgrunberg] and [@tagliala]
11
+ * Test against Ruby 3.4 [#8614] by [@tagliala]
12
+ * Backport Support sortable argument in id_column [#8650] by [@jaynetics]
13
+ * Backport Support title for id_column [#8652] by [@mgrunberg]
14
+
15
+ ### Bug Fixes
16
+
17
+ * Backport Fix attributes passed to form has_many not being set on new record form items [#8551] by [@Fs00]
18
+ * Backport Fix deprecation warning in Ruby 3.4 [#8596] by [@tagliala]
19
+ * Backport Fix circular require warning in belongs_to.rb [#8601] by [@tagliala]
20
+
21
+ ## 3.2.5 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.4..v3.2.5)
22
+
23
+ ### Enhancements
24
+
25
+ * Backport Add favicon to template app to fix Rails 7.2 test suite run [#8468] by [@mgrunberg]
26
+ * Backport Use attribute_types instead of columns_hash to determine type [#8469] by [@mgrunberg]
27
+ * Backport Optimize count query for pagination_total: false option [#8470] by [@mgrunberg]
28
+
29
+ ### Bug Fixes
30
+
31
+ * Restore inner span tag to form inputs legend [#8467] by [@denisahearn]
32
+
33
+ ## 3.2.4 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.3..v3.2.4)
34
+
35
+ ### Enhancements
36
+
37
+ * Test against Rails 7.2 [#8434] by [@mgrunberg]
38
+
39
+ ### Bug Fixes
40
+
41
+ * Backport Improve form f.inputs attributes rendering [#8446] by [@amiel]
42
+
43
+ ## 3.2.3 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.2..v3.2.3)
44
+
45
+ ### Enhancements
46
+
47
+ * Backport better implementation of counter-cache-column check [#8412] by [@plashchynski]
48
+
49
+ ### Bug Fixes
50
+
51
+ * Remove deprecation warnings when building with dart sass >= 1.77.7 [#8405] by [@mgrunberg]
52
+
53
+ ## 3.2.2 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.1..v3.2.2)
54
+
55
+ ### Security Fixes
56
+
57
+ * Backport Fix potential XSS issue when rendering form legends [#8349] by
58
+ [@deivid-rodriguez]
59
+
60
+ ### Enhancements
61
+
62
+ * Update vendored jQuery UI to 1.13.3 [#8329] by [@tagliala]
63
+
64
+ ## 3.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.0..v3.2.1)
65
+
66
+ ### Enhancements
67
+
68
+ * Backport Suppress ruby 3.3 warning [#8310] by [@mgrunberg]
69
+ * Backport Recommend using target="_blank" instead of target="blank" [#8311] by [@mgrunberg]
70
+
71
+ ## 3.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.1.0..v3.2.0)
72
+
73
+ ### Security Fixes
74
+
75
+ * Backport protect against CSV Injection. [#8167] by [@mgrunberg]
76
+
77
+ ### Enhancements
78
+
79
+ * Backport support citext column type in string filter. [#8165] by [@mgrunberg]
80
+ * Backport provide detail in DB statement timeout error for filters. [#8163] by [@mgrunberg]
81
+
82
+ ### Bug Fixes
83
+
84
+ * Backport make sure menu creation does not modify menu options. [#8166] by [@mgrunberg]
85
+ * Backport ransack error with filters when ActiveStorage is used. [#8164] by [@mgrunberg]
86
+
87
+ ## 3.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.0.0..v3.1.0)
88
+
89
+ ### Enhancements
90
+
91
+ * Support Rails 7.1. [#8102] by [@mgrunberg]
92
+ * Remove deprecated usage of ActiveSupport::Deprecation singleton. [#8106] by [@mgrunberg]
93
+ * Replace to_formatted_s with to_s to convert date to string. [#8105] by [@mgrunberg]
94
+ * Remove upper bound dependency limits from gemspec. [#8098] by [@javierjulio]
95
+
96
+ ## 3.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.14.0..v3.0.0)
97
+
98
+ ### Breaking Changes
99
+
100
+ * Remove custom Ransack predicates that were MetaSearch backports. [#8010] by [@javierjulio]
101
+ * Require Ransack v4. [#8009] by [@javierjulio]
102
+
103
+ ### Enhancements
104
+
105
+ * Use display name fallback if blank display name result. [#6342] by [@javierjulio]
106
+
107
+ ### Translation Improvements
108
+
109
+ * Improve Swedish translations. [#7993] by [@carlottostromstedt]
110
+
5
111
  ## 2.14.0 [☰](https://github.com/activeadmin/activeadmin/compare/v2.13.1..v2.14.0)
6
112
 
7
113
  ### Enhancements
@@ -784,6 +890,7 @@ Please check [0-6-stable] for previous changes.
784
890
  [#6315]: https://github.com/activeadmin/activeadmin/pull/6315
785
891
  [#6318]: https://github.com/activeadmin/activeadmin/pull/6318
786
892
  [#6341]: https://github.com/activeadmin/activeadmin/pull/6341
893
+ [#6342]: https://github.com/activeadmin/activeadmin/pull/6342
787
894
  [#6368]: https://github.com/activeadmin/activeadmin/pull/6368
788
895
  [#6393]: https://github.com/activeadmin/activeadmin/pull/6393
789
896
  [#6422]: https://github.com/activeadmin/activeadmin/pull/6422
@@ -845,6 +952,38 @@ Please check [0-6-stable] for previous changes.
845
952
  [#7984]: https://github.com/activeadmin/activeadmin/pull/7984
846
953
  [#7985]: https://github.com/activeadmin/activeadmin/pull/7985
847
954
  [#7986]: https://github.com/activeadmin/activeadmin/pull/7986
955
+ [#7993]: https://github.com/activeadmin/activeadmin/pull/7993
956
+ [#8009]: https://github.com/activeadmin/activeadmin/pull/8009
957
+ [#8010]: https://github.com/activeadmin/activeadmin/pull/8010
958
+ [#8098]: https://github.com/activeadmin/activeadmin/pull/8098
959
+ [#8102]: https://github.com/activeadmin/activeadmin/pull/8102
960
+ [#8105]: https://github.com/activeadmin/activeadmin/pull/8105
961
+ [#8106]: https://github.com/activeadmin/activeadmin/pull/8106
962
+ [#8163]: https://github.com/activeadmin/activeadmin/pull/8163
963
+ [#8164]: https://github.com/activeadmin/activeadmin/pull/8164
964
+ [#8165]: https://github.com/activeadmin/activeadmin/pull/8165
965
+ [#8166]: https://github.com/activeadmin/activeadmin/pull/8166
966
+ [#8167]: https://github.com/activeadmin/activeadmin/pull/8167
967
+ [#8310]: https://github.com/activeadmin/activeadmin/pull/8310
968
+ [#8311]: https://github.com/activeadmin/activeadmin/pull/8311
969
+ [#8329]: https://github.com/activeadmin/activeadmin/pull/8329
970
+ [#8349]: https://github.com/activeadmin/activeadmin/pull/8349
971
+ [#8405]: https://github.com/activeadmin/activeadmin/pull/8405
972
+ [#8412]: https://github.com/activeadmin/activeadmin/pull/8412
973
+ [#8434]: https://github.com/activeadmin/activeadmin/pull/8434
974
+ [#8446]: https://github.com/activeadmin/activeadmin/pull/8446
975
+ [#8467]: https://github.com/activeadmin/activeadmin/pull/8467
976
+ [#8468]: https://github.com/activeadmin/activeadmin/pull/8468
977
+ [#8469]: https://github.com/activeadmin/activeadmin/pull/8469
978
+ [#8470]: https://github.com/activeadmin/activeadmin/pull/8470
979
+ [#8548]: https://github.com/activeadmin/activeadmin/pull/8548
980
+ [#8551]: https://github.com/activeadmin/activeadmin/pull/8551
981
+ [#8556]: https://github.com/activeadmin/activeadmin/pull/8556
982
+ [#8596]: https://github.com/activeadmin/activeadmin/pull/8596
983
+ [#8601]: https://github.com/activeadmin/activeadmin/pull/8601
984
+ [#8614]: https://github.com/activeadmin/activeadmin/pull/8614
985
+ [#8650]: https://github.com/activeadmin/activeadmin/pull/8650
986
+ [#8652]: https://github.com/activeadmin/activeadmin/pull/8652
848
987
 
849
988
  [@1000ship]: https://github.com/1000ship
850
989
  [@5t111111]: https://github.com/5t111111
@@ -865,6 +1004,7 @@ Please check [0-6-stable] for previous changes.
865
1004
  [@brunoarueira]: https://github.com/brunoarueira
866
1005
  [@brunvez]: https://github.com/brunvez
867
1006
  [@buren]: https://github.com/buren
1007
+ [@carlottostromstedt]: https://github.com/carlottostromstedt
868
1008
  [@chancancode]: https://github.com/chancancode
869
1009
  [@chrp]: https://github.com/chrp
870
1010
  [@chumakoff]: https://github.com/chumakoff
@@ -872,6 +1012,7 @@ Please check [0-6-stable] for previous changes.
872
1012
  [@craigmcnamara]: https://github.com/craigmcnamara
873
1013
  [@DanielHeath]: https://github.com/DanielHeath
874
1014
  [@deivid-rodriguez]: https://github.com/deivid-rodriguez
1015
+ [@denisahearn]: https://github.com/denisahearn
875
1016
  [@dennisvdvliet]: https://github.com/dennisvdvliet
876
1017
  [@dhyegofernando]: https://github.com/dhyegofernando
877
1018
  [@dkniffin]: https://github.com/dkniffin
@@ -923,6 +1064,7 @@ Please check [0-6-stable] for previous changes.
923
1064
  [@Looooong]: https://github.com/Looooong
924
1065
  [@lubosch]: https://github.com/lubosch
925
1066
  [@markstory]: https://github.com/markstory
1067
+ [@mattbrictson]: https://github.com/mattbrictson
926
1068
  [@mauriciopasquier]: https://github.com/mauriciopasquier
927
1069
  [@mconiglio]: https://github.com/mconiglio
928
1070
  [@mgrunberg]: https://github.com/mgrunberg
@@ -938,6 +1080,7 @@ Please check [0-6-stable] for previous changes.
938
1080
  [@orkhan]: https://github.com/orkhan
939
1081
  [@panasyuk]: https://github.com/panasyuk
940
1082
  [@PChambino]: https://github.com/PChambino
1083
+ [@plashchynski]: https://github.com/plashchynski
941
1084
  [@potatosalad]: https://github.com/potatosalad
942
1085
  [@pranas]: https://github.com/pranas
943
1086
  [@ray-curran]: https://github.com/ray-curran
data/CONTRIBUTING.md CHANGED
@@ -107,13 +107,6 @@ with the db:
107
107
  bin/rake local db:migrate
108
108
  ```
109
109
 
110
- ### Get the style right
111
-
112
- Your patch should follow the same conventions & pass the same code quality
113
- checks as the rest of the project. `bin/rake lint` will give you feedback in
114
- this regard. You can check & fix style issues by running each linter
115
- individually. Run `bin/rake -T lint` to see the available linters.
116
-
117
110
  ### Make a Pull Request
118
111
 
119
112
  At this point, you should switch back to your master branch and make sure it's
data/README.md CHANGED
@@ -85,8 +85,8 @@ Thanks to [Tidelift][tidelift] and all our Tidelift subscribers.
85
85
  Thanks to [Open Collective][opencollective contributors] and all our Open Collective contributors.
86
86
 
87
87
  [Arbre]: https://github.com/activeadmin/arbre
88
- [Devise]: https://github.com/plataformatec/devise
89
- [Formtastic]: https://github.com/justinfrench/formtastic
88
+ [Devise]: https://github.com/heartcombo/devise
89
+ [Formtastic]: https://github.com/formtastic/formtastic
90
90
  [Inherited Resources]: https://github.com/activeadmin/inherited_resources
91
91
  [Kaminari]: https://github.com/kaminari/kaminari
92
92
  [Ransack]: https://github.com/activerecord-hackery/ransack
@@ -220,9 +220,8 @@ form {
220
220
  /* Buttons */
221
221
 
222
222
  input[type=submit], input[type=button], button {
223
- @include dark-button;
224
223
  cursor: pointer;
225
-
224
+ @include dark-button;
226
225
  }
227
226
 
228
227
  .buttons, .actions {
@@ -2,10 +2,10 @@
2
2
  .comments {
3
3
 
4
4
  .active_admin_comment {
5
- @include clearfix;
6
5
  margin-top: 10px;
7
6
  margin-bottom: 20px;
8
7
  max-width: 700px;
8
+ @include clearfix;
9
9
 
10
10
  .active_admin_comment_meta {
11
11
  width: 130px;
@@ -3,9 +3,12 @@
3
3
 
4
4
  .dropdown_menu_button {
5
5
  @include light-button;
6
- position: relative;
7
- padding-right: 22px !important;
8
- cursor: pointer;
6
+
7
+ & {
8
+ position: relative;
9
+ padding-right: 22px !important;
10
+ cursor: pointer;
11
+ }
9
12
 
10
13
  &:before {
11
14
  content: ' ';
@@ -139,11 +142,11 @@
139
142
  }
140
143
 
141
144
  &:last-child {
145
+ border: none;
142
146
  a {
143
147
  border-bottom-left-radius: 2px;
144
148
  border-bottom-right-radius: 2px;
145
149
  }
146
- border: none;
147
150
  }
148
151
  }
149
152
  }
@@ -38,8 +38,11 @@
38
38
  margin-left: 4px;
39
39
  select {
40
40
  @include light-button;
41
- @include rounded(0px);
42
- padding: 1px 5px;
41
+
42
+ & {
43
+ @include rounded(0px);
44
+ padding: 1px 5px;
45
+ }
43
46
  }
44
47
  }
45
48
 
@@ -1,6 +1,6 @@
1
1
  .table_tools {
2
- @include clearfix;
3
2
  margin-bottom: 16px;
3
+ @include clearfix;
4
4
  }
5
5
 
6
6
  .table_tools .dropdown_menu {
@@ -9,11 +9,14 @@
9
9
 
10
10
  a.table_tools_button, .table_tools .dropdown_menu_button {
11
11
  @include light-button;
12
- @include gradient(#FFFFFF, #F0F0F0);
13
- @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
14
- font-size: 0.9em;
15
- padding: 4px 14px 4px;
16
- margin: 0;
12
+
13
+ & {
14
+ @include gradient(#FFFFFF, #F0F0F0);
15
+ @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
16
+ font-size: 0.9em;
17
+ padding: 4px 14px 4px;
18
+ margin: 0;
19
+ }
17
20
 
18
21
  &:not(.disabled) {
19
22
  &:hover {
@@ -28,13 +28,16 @@
28
28
 
29
29
  a {
30
30
  @include light-button;
31
- @include gradient(#FFFFFF, #F0F0F0);
32
- @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
33
- text-decoration: none;
34
- border-radius: 0;
35
- border-width: 1px .5px 1px .5px;
36
- margin-right: 0;
37
- padding: 4px 14px 4px;
31
+
32
+ & {
33
+ @include gradient(#FFFFFF, #F0F0F0);
34
+ @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
35
+ text-decoration: none;
36
+ border-radius: 0;
37
+ border-width: 1px .5px 1px .5px;
38
+ margin-right: 0;
39
+ padding: 4px 14px 4px;
40
+ }
38
41
 
39
42
  &:not(.disabled) {
40
43
  &:hover {
@@ -17,13 +17,13 @@
17
17
  }
18
18
 
19
19
  @mixin default-button {
20
- @include basic-button;
21
20
  @include gradient(lighten($primary-color, 15%), darken($primary-color, 12%));
22
21
  @include text-shadow(#000);
23
22
  box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0px rgba(255,255,255, 0.2) inset;
24
23
  border: solid 1px #484e53;
25
24
  @include border-colors(#616a71, #484e53, #363b3f);
26
25
  color: #efefef;
26
+ @include basic-button;
27
27
 
28
28
  &:not(.disabled) {
29
29
  &:hover{
@@ -38,13 +38,13 @@
38
38
  }
39
39
 
40
40
  @mixin light-button {
41
- @include basic-button;
42
41
  @include gradient(#FFFFFF, #E7E7E7);
43
42
  box-shadow: 0 1px 1px rgba(0,0,0,0.10), 0 1px 0 0 rgba(255,255,255, 0.8) inset;
44
43
  border: solid 1px #c7c7c7;
45
44
  @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
46
45
  @include text-shadow;
47
46
  color: $primary-color;
47
+ @include basic-button;
48
48
 
49
49
  &:not(.disabled) {
50
50
  &:hover {
@@ -28,13 +28,13 @@ body.logged_out {
28
28
  @include no-shadow;
29
29
  background: none;
30
30
  padding: 0;
31
+ margin-bottom: 0;
31
32
  li { padding: 10px 0; }
32
33
 
33
34
  input[type=text], input[type=email], input[type=password] {
34
35
  width: 70%;
35
36
  }
36
37
  &.buttons { margin-left: 20%; }
37
- margin-bottom: 0;
38
38
  }
39
39
  }
40
40
 
@@ -10,10 +10,10 @@
10
10
 
11
11
  // -------------------------------------- Index Footer (Under Table)
12
12
  #index_footer {
13
- @include clearfix;
14
13
  padding-top: 5px;
15
14
  text-align: right;
16
15
  font-size: 0.85em;
16
+ @include clearfix;
17
17
  }
18
18
 
19
19
  .index_content { clear: both; }
@@ -1,6 +1,5 @@
1
1
  #title_bar {
2
2
  @include section-header;
3
- @include clearfix;
4
3
  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.37);
5
4
  display: table;
6
5
  border-bottom-color: #EEE;
@@ -9,6 +8,7 @@
9
8
  margin: 0;
10
9
  padding: 10px $horizontal-page-margin;
11
10
  z-index: 800;
11
+ @include clearfix;
12
12
 
13
13
  #titlebar_left, #titlebar_right {
14
14
  height: 50px;
@@ -32,8 +32,11 @@
32
32
  span.action_item {
33
33
  & > a, & > .dropdown_menu > a {
34
34
  @include light-button;
35
- padding: 12px 17px 10px;
36
- margin: 0px;
35
+
36
+ & {
37
+ padding: 12px 17px 10px;
38
+ margin: 0px;
39
+ }
37
40
  }
38
41
  }
39
42
  }
@@ -24,13 +24,6 @@ ar:
24
24
  buttons:
25
25
  filter: "تصفية"
26
26
  clear: "تفريغ التصفية"
27
- predicates:
28
- contains: "يحتوي"
29
- equals: "متساوي"
30
- starts_with: "يبدأ بـ"
31
- ends_with: "ينتهي بـ"
32
- greater_than: "أكبر من"
33
- less_than: "أقل من"
34
27
  search_status:
35
28
  headline: "حالات البحث:"
36
29
  current_scope: "المجال:"
@@ -24,13 +24,6 @@ az:
24
24
  buttons:
25
25
  filter: "Filtrlə"
26
26
  clear: "Təmizlə"
27
- predicates:
28
- contains: "Yerləşir"
29
- equals: "Bərabərdir"
30
- starts_with: "Başlayır"
31
- ends_with: "Bitir"
32
- greater_than: "böyük"
33
- less_than: "kiçik"
34
27
  search_status:
35
28
  headline: "Axtarışın statusu:"
36
29
  current_scope: "Sahə:"
@@ -24,13 +24,6 @@ bg:
24
24
  buttons:
25
25
  filter: "Филтриране"
26
26
  clear: "Изчистване"
27
- predicates:
28
- contains: "съдържа"
29
- equals: "равно на"
30
- starts_with: "Започва с"
31
- ends_with: "Завършва с"
32
- greater_than: "по-голямо от"
33
- less_than: "по-малко от"
34
27
  status_tag:
35
28
  "yes": "Да"
36
29
  "no": "не"
@@ -24,13 +24,6 @@ bs:
24
24
  buttons:
25
25
  filter: "Filtriraj"
26
26
  clear: "Ukloni filtere"
27
- predicates:
28
- contains: "Sadrži"
29
- equals: "Jednako"
30
- starts_with: "počinje s"
31
- ends_with: "Završava sa"
32
- greater_than: "Veće od"
33
- less_than: "Manje od"
34
27
  status_tag:
35
28
  "yes": "Da"
36
29
  "no": "Nema"
@@ -24,13 +24,6 @@ ca:
24
24
  buttons:
25
25
  filter: "Filtrar"
26
26
  clear: "Treure filtres"
27
- predicates:
28
- contains: "Conté"
29
- equals: "Igual a"
30
- starts_with: "Comença amb"
31
- ends_with: "Acaba amb"
32
- greater_than: "Més gran que"
33
- less_than: "Més petit que"
34
27
  status_tag:
35
28
  "yes": "Sí"
36
29
  "no": "No"
@@ -24,13 +24,6 @@ cs:
24
24
  buttons:
25
25
  filter: "Filtrovat"
26
26
  clear: "Vyčistit filtry"
27
- predicates:
28
- contains: "Obsahuje"
29
- equals: "Odpovídá"
30
- starts_with: "Začíná na"
31
- ends_with: "Končí na"
32
- greater_than: "Větší než"
33
- less_than: "Menší než"
34
27
  status_tag:
35
28
  "yes": "Ano"
36
29
  "no": "Ne"
@@ -25,13 +25,6 @@ da:
25
25
  buttons:
26
26
  filter: "Filtrer"
27
27
  clear: "Ryd filtre"
28
- predicates:
29
- contains: "Indeholder"
30
- equals: "Lig"
31
- starts_with: "Begynder med"
32
- ends_with: "Slutter med"
33
- greater_than: "Større end"
34
- less_than: "Mindre end"
35
28
  search_status:
36
29
  headline: "Søgestatus:"
37
30
  current_scope: "Perspektiv:"
@@ -24,13 +24,6 @@
24
24
  buttons:
25
25
  filter: "Filtern"
26
26
  clear: "Filter entfernen"
27
- predicates:
28
- contains: "Enthält"
29
- equals: "Gleich"
30
- starts_with: "Beginnt mit"
31
- ends_with: "Endet mit"
32
- greater_than: "Grösser als"
33
- less_than: "Kleiner als"
34
27
  status_tag:
35
28
  "yes": "Ja"
36
29
  "no": "Nicht"
@@ -43,14 +43,6 @@ de:
43
43
  filter: "Filtern"
44
44
  clear: "Filter entfernen"
45
45
  predicates:
46
- contains: "Enthält"
47
- equals: "Gleich"
48
- starts_with: "Beginnt mit"
49
- ends_with: "Endet mit"
50
- greater_than: "Größer als"
51
- less_than: "Kleiner als"
52
- gteq_datetime: "Größer gleich"
53
- lteq_datetime: "Kleiner gleich"
54
46
  from: "Von"
55
47
  to: "Bis"
56
48
  scopes:
@@ -24,13 +24,6 @@ el:
24
24
  buttons:
25
25
  filter: "Φίλτρα"
26
26
  clear: "Καθαρισμός Φίλτρων"
27
- predicates:
28
- contains: "Περιέχει"
29
- equals: "Είναι ίσο με"
30
- starts_with: "Αρχίζει με"
31
- ends_with: "Καταλήγει σε"
32
- greater_than: "Μεγαλύτερο από"
33
- less_than: "Μικρότερο από"
34
27
  status_tag:
35
28
  "yes": "Ναι"
36
29
  "no": "Όχι"
@@ -25,13 +25,6 @@
25
25
  buttons:
26
26
  filter: "Filter"
27
27
  clear: "Clear Filters"
28
- predicates:
29
- contains: "Contains"
30
- equals: "Equals"
31
- starts_with: "Starts with"
32
- ends_with: "Ends with"
33
- greater_than: "Greater than"
34
- less_than: "Less than"
35
28
  search_status:
36
29
  headline: "Search status:"
37
30
  current_scope: "Scope:"
@@ -25,13 +25,6 @@
25
25
  buttons:
26
26
  filter: "Filter"
27
27
  clear: "Clear Filters"
28
- predicates:
29
- contains: "Contains"
30
- equals: "Equals"
31
- starts_with: "Starts with"
32
- ends_with: "Ends with"
33
- greater_than: "Greater than"
34
- less_than: "Less than"
35
28
  search_status:
36
29
  headline: "Search status:"
37
30
  current_scope: "Scope:"
@@ -43,14 +43,6 @@ en:
43
43
  filter: "Filter"
44
44
  clear: "Clear Filters"
45
45
  predicates:
46
- contains: "Contains"
47
- equals: "Equals"
48
- starts_with: "Starts with"
49
- ends_with: "Ends with"
50
- greater_than: "Greater than"
51
- less_than: "Less than"
52
- gteq_datetime: "Greater or equal to"
53
- lteq_datetime: "Lesser or equal to"
54
46
  from: "From"
55
47
  to: "To"
56
48
  scopes:
@@ -27,14 +27,6 @@ eo:
27
27
  filter: "Filtri"
28
28
  clear: "Viŝi filtrilojn"
29
29
  predicates:
30
- contains: "Enhavas"
31
- equals: "Egalas al"
32
- starts_with: "Komenciĝas per"
33
- ends_with: "Finiĝas per"
34
- greater_than: "Pli grandas ol"
35
- less_than: "Malpli grandas ol"
36
- gteq_datetime: "Pli grandas ol aŭ egalas al"
37
- lteq_datetime: "Malpli grandas ol aŭ egalas al"
38
30
  from: "De"
39
31
  to: "Al"
40
32
  search_status:
@@ -24,13 +24,6 @@ es-MX:
24
24
  buttons:
25
25
  filter: "Filtrar"
26
26
  clear: "Quitar Filtros"
27
- predicates:
28
- contains: "Contiene"
29
- equals: "Igual a"
30
- starts_with: "Empieza con"
31
- ends_with: "Termina con"
32
- greater_than: "Mayor que"
33
- less_than: "Menor que"
34
27
  status_tag:
35
28
  "yes": "Sí"
36
29
  "no": "No"