card 1.15.pre → 1.15.pre2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (212) hide show
  1. checksums.yaml +4 -4
  2. data/VERSION +1 -1
  3. data/db/bootstrap/card_actions.yml +1039 -668
  4. data/db/bootstrap/card_acts.yml +1 -1
  5. data/db/bootstrap/card_changes.yml +3614 -2523
  6. data/db/bootstrap/card_references.yml +1401 -1163
  7. data/db/bootstrap/cards.yml +2832 -1848
  8. data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb +58 -4
  9. data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb +37 -0
  10. data/db/migrate_core_cards/data/1.12_stylesheets/traditional.scss +1 -1
  11. data/db/migrate_core_cards/data/bootstrap_layout.json +39 -24
  12. data/db/migrate_core_cards/data/skin_images.json +91 -0
  13. data/db/schema.rb +1 -1
  14. data/db/version_core_cards.txt +1 -1
  15. data/lib/card/format.rb +6 -6
  16. data/lib/card/migration.rb +7 -2
  17. data/mod/01_core/chunk/include.rb +10 -0
  18. data/mod/01_core/format/html_format.rb +2 -8
  19. data/mod/01_core/set/all/collection.rb +4 -0
  20. data/mod/01_core/set/all/states.rb +1 -1
  21. data/mod/01_core/set/all/utils.rb +3 -2
  22. data/mod/01_core/set_pattern/02_all_plus.rb +1 -1
  23. data/mod/01_core/set_pattern/04_star.rb +2 -2
  24. data/mod/01_core/set_pattern/05_rstar.rb +2 -2
  25. data/mod/01_core/set_pattern/07_type_plus_right.rb +1 -1
  26. data/mod/01_core/spec/format/html_format_spec.rb +23 -24
  27. data/mod/01_history/set/all/history.rb +6 -7
  28. data/mod/02_basic_types/set/all/all_css.rb +1 -1
  29. data/mod/02_basic_types/set/all/all_csv.rb +2 -2
  30. data/mod/02_basic_types/set/all/json.rb +1 -1
  31. data/mod/02_basic_types/set/type/plain_text.rb +1 -1
  32. data/mod/02_basic_types/set/type/pointer.rb +25 -29
  33. data/mod/03_machines/lib/javascript/wagn.js.coffee +7 -6
  34. data/mod/03_machines/lib/javascript/wagn_mod.js.coffee +2 -1
  35. data/mod/03_machines/lib/stylesheets/style_bootstrap_compatible.css +154 -0
  36. data/mod/03_machines/lib/stylesheets/{standard.scss → style_cards.scss} +260 -166
  37. data/mod/03_machines/set/self/style_bootstrap_compatible.rb +9 -0
  38. data/mod/03_machines/set/self/{style_functional.rb → style_cards.rb} +1 -1
  39. data/mod/03_machines/spec/set/type/scss_spec.rb +1 -1
  40. data/mod/04_settings/set/type/setting.rb +1 -1
  41. data/mod/05_email/set/all/notify.rb +1 -1
  42. data/mod/05_email/set/self/follow_defaults.rb +3 -3
  43. data/mod/05_standard/file/{790/icon-6419.png → credit/icon-image.png} +0 -0
  44. data/mod/05_standard/file/{790/large-6419.png → credit/large-image.png} +0 -0
  45. data/mod/05_standard/file/{790/medium-6419.png → credit/medium-image.png} +0 -0
  46. data/mod/05_standard/file/{790/original-6419.png → credit/original-image.png} +0 -0
  47. data/mod/05_standard/file/{790/small-6419.png → credit/small-image.png} +0 -0
  48. data/mod/05_standard/file/{103/icon-6566.ico → favicon/icon-image.ico} +0 -0
  49. data/mod/05_standard/file/{103/large-6566.ico → favicon/large-image.ico} +0 -0
  50. data/mod/05_standard/file/{103/medium-6566.ico → favicon/medium-image.ico} +0 -0
  51. data/mod/05_standard/file/{103/original-6566.ico → favicon/original-image.ico} +0 -0
  52. data/mod/05_standard/file/{103/small-6566.ico → favicon/small-image.ico} +0 -0
  53. data/mod/05_standard/file/{79/icon-6556.png → logo/icon-image.png} +0 -0
  54. data/mod/05_standard/file/{79/large-6556.png → logo/large-image.png} +0 -0
  55. data/mod/05_standard/file/{79/medium-6556.png → logo/medium-image.png} +0 -0
  56. data/mod/05_standard/file/{79/original-6556.png → logo/original-image.png} +0 -0
  57. data/mod/05_standard/file/{79/small-6556.png → logo/small-image.png} +0 -0
  58. data/mod/05_standard/set/all/attach.rb +8 -10
  59. data/mod/05_standard/set/all/comment.rb +1 -1
  60. data/mod/05_standard/set/all/error.rb +1 -1
  61. data/mod/05_standard/set/all/rich_html/content.rb +14 -2
  62. data/mod/05_standard/set/all/rich_html/editing.rb +19 -18
  63. data/mod/05_standard/set/all/rich_html/form.rb +38 -47
  64. data/mod/05_standard/set/all/rich_html/header.rb +37 -14
  65. data/mod/05_standard/set/all/rich_html/wrapper.rb +3 -3
  66. data/mod/05_standard/set/rstar/rules.rb +18 -18
  67. data/mod/05_standard/set/self/account_links.rb +6 -18
  68. data/mod/05_standard/set/self/navbox.rb +23 -10
  69. data/mod/05_standard/set/self/recent.rb +1 -1
  70. data/mod/05_standard/set/self/signin.rb +6 -3
  71. data/mod/05_standard/set/type/cardtype.rb +1 -1
  72. data/mod/05_standard/set/type/html.rb +1 -1
  73. data/mod/05_standard/set/type/search_type.rb +76 -54
  74. data/mod/05_standard/set/type/signup.rb +5 -5
  75. data/mod/05_standard/set/type/user.rb +4 -4
  76. data/mod/05_standard/spec/set/all/rich_html/wrapper_spec.rb +2 -2
  77. data/mod/05_standard/spec/set/self/account_links_spec.rb +1 -1
  78. data/mod/06_bootstrap/file/cerulean_skin/icon-image.png +0 -0
  79. data/mod/06_bootstrap/file/cerulean_skin/large-image.png +0 -0
  80. data/mod/06_bootstrap/file/cerulean_skin/medium-image.png +0 -0
  81. data/mod/06_bootstrap/file/cerulean_skin/original-image.png +0 -0
  82. data/mod/06_bootstrap/file/cerulean_skin/small-image.png +0 -0
  83. data/mod/06_bootstrap/file/cosmo_skin/icon-image.png +0 -0
  84. data/mod/06_bootstrap/file/cosmo_skin/large-image.png +0 -0
  85. data/mod/06_bootstrap/file/cosmo_skin/medium-image.png +0 -0
  86. data/mod/06_bootstrap/file/cosmo_skin/original-image.png +0 -0
  87. data/mod/06_bootstrap/file/cosmo_skin/small-image.png +0 -0
  88. data/mod/06_bootstrap/file/cyborg_skin/icon-image.png +0 -0
  89. data/mod/06_bootstrap/file/cyborg_skin/large-image.png +0 -0
  90. data/mod/06_bootstrap/file/cyborg_skin/medium-image.png +0 -0
  91. data/mod/06_bootstrap/file/cyborg_skin/original-image.png +0 -0
  92. data/mod/06_bootstrap/file/cyborg_skin/small-image.png +0 -0
  93. data/mod/06_bootstrap/file/darkly_skin/icon-image.png +0 -0
  94. data/mod/06_bootstrap/file/darkly_skin/large-image.png +0 -0
  95. data/mod/06_bootstrap/file/darkly_skin/medium-image.png +0 -0
  96. data/mod/06_bootstrap/file/darkly_skin/original-image.png +0 -0
  97. data/mod/06_bootstrap/file/darkly_skin/small-image.png +0 -0
  98. data/mod/06_bootstrap/file/flatly_skin/icon-image.png +0 -0
  99. data/mod/06_bootstrap/file/flatly_skin/large-image.png +0 -0
  100. data/mod/06_bootstrap/file/flatly_skin/medium-image.png +0 -0
  101. data/mod/06_bootstrap/file/flatly_skin/original-image.png +0 -0
  102. data/mod/06_bootstrap/file/flatly_skin/small-image.png +0 -0
  103. data/mod/06_bootstrap/file/journal_skin/icon-image.png +0 -0
  104. data/mod/06_bootstrap/file/journal_skin/large-image.png +0 -0
  105. data/mod/06_bootstrap/file/journal_skin/medium-image.png +0 -0
  106. data/mod/06_bootstrap/file/journal_skin/original-image.png +0 -0
  107. data/mod/06_bootstrap/file/journal_skin/small-image.png +0 -0
  108. data/mod/06_bootstrap/file/lumen_skin/icon-image.png +0 -0
  109. data/mod/06_bootstrap/file/lumen_skin/large-image.png +0 -0
  110. data/mod/06_bootstrap/file/lumen_skin/medium-image.png +0 -0
  111. data/mod/06_bootstrap/file/lumen_skin/original-image.png +0 -0
  112. data/mod/06_bootstrap/file/lumen_skin/small-image.png +0 -0
  113. data/mod/06_bootstrap/file/paper_skin/icon-image.png +0 -0
  114. data/mod/06_bootstrap/file/paper_skin/large-image.png +0 -0
  115. data/mod/06_bootstrap/file/paper_skin/medium-image.png +0 -0
  116. data/mod/06_bootstrap/file/paper_skin/original-image.png +0 -0
  117. data/mod/06_bootstrap/file/paper_skin/small-image.png +0 -0
  118. data/mod/06_bootstrap/file/readable_skin/icon-image.png +0 -0
  119. data/mod/06_bootstrap/file/readable_skin/large-image.png +0 -0
  120. data/mod/06_bootstrap/file/readable_skin/medium-image.png +0 -0
  121. data/mod/06_bootstrap/file/readable_skin/original-image.png +0 -0
  122. data/mod/06_bootstrap/file/readable_skin/small-image.png +0 -0
  123. data/mod/06_bootstrap/file/sandstone_skin/icon-image.png +0 -0
  124. data/mod/06_bootstrap/file/sandstone_skin/large-image.png +0 -0
  125. data/mod/06_bootstrap/file/sandstone_skin/medium-image.png +0 -0
  126. data/mod/06_bootstrap/file/sandstone_skin/original-image.png +0 -0
  127. data/mod/06_bootstrap/file/sandstone_skin/small-image.png +0 -0
  128. data/mod/06_bootstrap/file/simplex_skin/icon-image.png +0 -0
  129. data/mod/06_bootstrap/file/simplex_skin/large-image.png +0 -0
  130. data/mod/06_bootstrap/file/simplex_skin/medium-image.png +0 -0
  131. data/mod/06_bootstrap/file/simplex_skin/original-image.png +0 -0
  132. data/mod/06_bootstrap/file/simplex_skin/small-image.png +0 -0
  133. data/mod/06_bootstrap/file/slate_skin/icon-image.png +0 -0
  134. data/mod/06_bootstrap/file/slate_skin/large-image.png +0 -0
  135. data/mod/06_bootstrap/file/slate_skin/medium-image.png +0 -0
  136. data/mod/06_bootstrap/file/slate_skin/original-image.png +0 -0
  137. data/mod/06_bootstrap/file/slate_skin/small-image.png +0 -0
  138. data/mod/06_bootstrap/file/spacelab_skin/icon-image.png +0 -0
  139. data/mod/06_bootstrap/file/spacelab_skin/large-image.png +0 -0
  140. data/mod/06_bootstrap/file/spacelab_skin/medium-image.png +0 -0
  141. data/mod/06_bootstrap/file/spacelab_skin/original-image.png +0 -0
  142. data/mod/06_bootstrap/file/spacelab_skin/small-image.png +0 -0
  143. data/mod/06_bootstrap/file/superhero_skin/icon-image.png +0 -0
  144. data/mod/06_bootstrap/file/superhero_skin/large-image.png +0 -0
  145. data/mod/06_bootstrap/file/superhero_skin/medium-image.png +0 -0
  146. data/mod/06_bootstrap/file/superhero_skin/original-image.png +0 -0
  147. data/mod/06_bootstrap/file/superhero_skin/small-image.png +0 -0
  148. data/mod/06_bootstrap/file/united_skin/icon-image.png +0 -0
  149. data/mod/06_bootstrap/file/united_skin/large-image.png +0 -0
  150. data/mod/06_bootstrap/file/united_skin/medium-image.png +0 -0
  151. data/mod/06_bootstrap/file/united_skin/original-image.png +0 -0
  152. data/mod/06_bootstrap/file/united_skin/small-image.png +0 -0
  153. data/mod/06_bootstrap/file/yeti_skin/icon-image.png +0 -0
  154. data/mod/06_bootstrap/file/yeti_skin/large-image.png +0 -0
  155. data/mod/06_bootstrap/file/yeti_skin/medium-image.png +0 -0
  156. data/mod/06_bootstrap/file/yeti_skin/original-image.png +0 -0
  157. data/mod/06_bootstrap/file/yeti_skin/small-image.png +0 -0
  158. data/mod/06_bootstrap/lib/stylesheets/bootstrap_cards.scss +199 -0
  159. data/mod/06_bootstrap/lib/stylesheets/{bootstrap.css → bootstrap_css.css} +0 -0
  160. data/mod/06_bootstrap/lib/stylesheets/theme_amelia.css +5871 -0
  161. data/mod/06_bootstrap/lib/stylesheets/{bootstrap-theme.css → theme_bootstrap_default.css} +0 -0
  162. data/mod/06_bootstrap/lib/stylesheets/theme_cerulean.css +5893 -0
  163. data/mod/06_bootstrap/lib/stylesheets/theme_cosmo.css +5898 -0
  164. data/mod/06_bootstrap/lib/stylesheets/theme_cyborg.css +5876 -0
  165. data/mod/06_bootstrap/lib/stylesheets/theme_darkly.css +5986 -0
  166. data/mod/06_bootstrap/lib/stylesheets/{darkly.css → theme_flatly.css} +574 -327
  167. data/mod/06_bootstrap/lib/stylesheets/theme_holo.css +183 -0
  168. data/mod/06_bootstrap/lib/stylesheets/theme_journal.css +6647 -0
  169. data/mod/06_bootstrap/lib/stylesheets/theme_lumen.css +6097 -0
  170. data/mod/06_bootstrap/lib/stylesheets/theme_paper.css +6647 -0
  171. data/mod/06_bootstrap/lib/stylesheets/theme_readable.css +5896 -0
  172. data/mod/06_bootstrap/lib/stylesheets/theme_sandstone.css +6733 -0
  173. data/mod/06_bootstrap/lib/stylesheets/theme_simplex.css +5886 -0
  174. data/mod/06_bootstrap/lib/stylesheets/theme_slate.css +7057 -0
  175. data/mod/06_bootstrap/lib/stylesheets/theme_spacelab.css +5935 -0
  176. data/mod/06_bootstrap/lib/stylesheets/theme_superhero.css +5964 -0
  177. data/mod/06_bootstrap/lib/stylesheets/theme_united.css +6588 -0
  178. data/mod/06_bootstrap/lib/stylesheets/theme_yeti.css +6088 -0
  179. data/mod/06_bootstrap/set/all/rich_bootstrap.rb +0 -16
  180. data/mod/06_bootstrap/set/self/bootstrap_cards.rb +9 -0
  181. data/mod/06_bootstrap/set/self/bootstrap_css.rb +5 -3
  182. data/mod/06_bootstrap/set/self/theme_bootstrap_default.rb +2 -0
  183. data/mod/06_bootstrap/set/self/theme_cerulean.rb +2 -0
  184. data/mod/06_bootstrap/set/self/theme_cosmo.rb +2 -0
  185. data/mod/06_bootstrap/set/self/theme_cyborg.rb +2 -0
  186. data/mod/06_bootstrap/set/self/theme_darkly.rb +2 -0
  187. data/mod/06_bootstrap/set/self/theme_flatly.rb +2 -0
  188. data/mod/06_bootstrap/set/self/theme_journal.rb +2 -0
  189. data/mod/06_bootstrap/set/self/theme_lumen.rb +2 -0
  190. data/mod/06_bootstrap/set/self/theme_paper.rb +2 -0
  191. data/mod/06_bootstrap/set/self/theme_readable.rb +2 -0
  192. data/mod/06_bootstrap/set/self/theme_sandstone.rb +2 -0
  193. data/mod/06_bootstrap/set/self/theme_simplex.rb +2 -0
  194. data/mod/06_bootstrap/set/self/theme_slate.rb +2 -0
  195. data/mod/06_bootstrap/set/self/theme_spacelab.rb +2 -0
  196. data/mod/06_bootstrap/set/self/theme_superhero.rb +2 -0
  197. data/mod/06_bootstrap/set/self/theme_united.rb +2 -0
  198. data/mod/06_bootstrap/set/self/theme_yeti.rb +2 -0
  199. data/test/fixtures/card_actions.yml +1951 -1580
  200. data/test/fixtures/card_acts.yml +282 -282
  201. data/test/fixtures/card_changes.yml +6769 -5678
  202. data/test/fixtures/card_references.yml +2086 -1848
  203. data/test/fixtures/cards.yml +4167 -3183
  204. metadata +142 -30
  205. data/mod/03_machines/lib/stylesheets/functional.scss +0 -184
  206. data/mod/03_machines/set/self/style_standard.rb +0 -8
  207. data/mod/03_machines/spec/set/self/style_functional_spec.rb +0 -5
  208. data/mod/03_machines/spec/set/self/style_standard_spec.rb +0 -5
  209. data/mod/06_bootstrap/set/all/bootstrap/header.rb +0 -29
  210. data/mod/06_bootstrap/set/self/bootstrap_theme_css.rb +0 -7
  211. data/mod/06_bootstrap/set/self/navbox.rb +0 -32
  212. data/mod/06_bootstrap/set/type/search_type.rb +0 -79
@@ -1,6 +1,169 @@
1
+ /*!
2
+ * Wagn: [[http://wagn.org]]
3
+ * Copyright 2015 Grass Commons and other contributors; Licensed GPL
4
+ */
1
5
 
2
6
  /*
3
- This "standard" CSS provides styles for aspects of wagn sites not usually prioritized by skin designers.
7
+ This minimal CSS is needed for basic Wagn functionality.
8
+
9
+ Without the following, menus will be barely usable, "closed" view will not appear on one line,
10
+ and certain hidden information will show up.
11
+
12
+ Note that this CSS is taken from code so that it will be updated automatically with releases.
13
+ If you don't want certain rules, you may:
14
+ (a) override them, or
15
+ (b) choose not to include this card in your Skin
16
+
17
+ Choosing (b) will mean your CSS will not be affected by automated updates.
18
+ */
19
+
20
+ /* -- resets -- */
21
+
22
+ .card-frame,
23
+ .card-body,
24
+ .ALL {
25
+ overflow: auto;
26
+ white-space: normal;
27
+ }
28
+
29
+ /* NOTE: we recommend against styling ".card-slot", which is heavily used by javascript */
30
+
31
+
32
+ /* -- hidden info -- */
33
+
34
+ .ui-loader,
35
+ .card-notice,
36
+ .new-current-revision-id,
37
+ .editor .revision-navigation,
38
+ .editor .autosave-alert,
39
+ .edit_name-view .alert,
40
+ .btn.renamer-updater,
41
+ .confirm_update_all-view,
42
+ .follow-updater,
43
+ .admin-error-message,
44
+ .labeled-view .card-menu-link {
45
+ display: none
46
+ }
47
+
48
+
49
+ /* -- card-headers and menus--*/
50
+
51
+ .card-header {
52
+ .card-header-title {
53
+ display: inline-block;
54
+ overflow: hidden;
55
+ }
56
+ .toggler {
57
+ display: inline-block;
58
+ position: relative;
59
+ }
60
+ }
61
+ .card-menu {
62
+ display: none;
63
+ position: absolute;
64
+ z-index: 1005;
65
+ li {
66
+ white-space: nowrap;
67
+ }
68
+ }
69
+ .card-menu-link {
70
+ margin-left: 5px;
71
+ display: inline-block;
72
+ float: right;
73
+ }
74
+
75
+
76
+ /*-- closed and labeled views --*/
77
+
78
+ .closed-view {
79
+ white-space: nowrap !important;
80
+ overflow: hidden;
81
+ .card-header {
82
+ display: inline-block;
83
+ }
84
+ }
85
+ .closed-content {
86
+ display: inline;
87
+ white-space: nowrap !important;
88
+
89
+ table, thead, tbody, tr, th, td, p, h1, h2, h3, h4, h5, h6, ul, li, pre, ol, div, span, a, blockquote, img, label, i {
90
+ display: inline !important;
91
+ white-space: nowrap !important;
92
+ float: none !important;
93
+ }
94
+ br, hr, input, textarea, object {
95
+ display: none !important;
96
+ }
97
+ }
98
+
99
+ .labeled-view:hover .card-menu-link {
100
+ display: inline-block;
101
+ }
102
+
103
+ /* -- change view --*/
104
+
105
+ .change-view {
106
+ clear: both;
107
+ .last-update {
108
+ float:right;
109
+ text-align: right;
110
+ a {
111
+ white-space: nowrap;
112
+ }
113
+ }
114
+ }
115
+
116
+
117
+
118
+ /* -- template-editor (editing template rule inclusions inline) -- */
119
+
120
+ .template_editor-view > div {
121
+ float: left;
122
+ }
123
+ .template-editor-close {
124
+ float: right;
125
+ }
126
+ .template_link-view {
127
+ display: inline;
128
+ }
129
+
130
+
131
+ .navbox-item-label {
132
+ float: left;
133
+ position: relative;
134
+ }
135
+
136
+
137
+ /*-- misc --*/
138
+ .card-editor {
139
+ white-space: normal;
140
+ padding-bottom: 15px;
141
+ }
142
+ pre,
143
+ .TYPE-plain_text.card-content,
144
+ .SELF-Xhead.card-content {
145
+ white-space: pre-wrap; /* css-3 */
146
+ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
147
+ white-space: -pre-wrap; /* Opera 4-6 */
148
+ white-space: -o-pre-wrap; /* Opera 7 */
149
+ word-wrap: break-word; /* Internet Explorer 5.5+ */
150
+ }
151
+ .missing-view a {
152
+ display: inline;
153
+ }
154
+
155
+ .SELF-Xstat > .card-content {
156
+ table {
157
+ width: 100%;
158
+ }
159
+ tr:nth-child(even) {
160
+ background: #eee;
161
+ }
162
+ }
163
+
164
+
165
+ /*
166
+ The below provides styles for aspects of wagn sites not usually prioritized by skin designers.
4
167
 
5
168
  It includes basic styling for:
6
169
 
@@ -108,7 +271,7 @@ in your skin. Choosing (b) will mean your CSS will not be affected by automated
108
271
  /*- ONE-LINE VIEWS - */
109
272
  /*-------------------- */
110
273
 
111
- .closed-view {
274
+ .closed-view.panel {
112
275
  margin: 0;
113
276
  width: 100%;
114
277
  }
@@ -154,39 +317,6 @@ a.missing-labeled {
154
317
  /*- EDIT INTERFACE - */
155
318
  /*-------------------- */
156
319
 
157
- fieldset {
158
- margin: 5px 1px;
159
- border: 0;
160
-
161
- > .button-area {
162
- width: 70%;
163
- padding: 0 3px;
164
- input,
165
- button {
166
- margin-right: 2%;
167
- }
168
- }
169
-
170
- > .editor {
171
- width: 70%;
172
- padding: 3px;
173
- > input {
174
- margin-left: 0;
175
- }
176
- }
177
-
178
- > legend {
179
- text-align:right;
180
- width: 25%;
181
- padding: 3px;
182
- margin: 0;
183
- > .instruction {
184
- text-align: right;
185
- padding: 3px 0;
186
- }
187
- }
188
- }
189
-
190
320
  textarea,
191
321
  .content-editor > input[type=text],
192
322
  .content-editor > input[type=password],
@@ -277,24 +407,6 @@ textarea {
277
407
  /*- SEARCH & POINTER - */
278
408
  /*-------------------- */
279
409
 
280
- .pointer-radio {
281
- display: inline-block;
282
- width: 100%;
283
- .form-control {
284
- box-shadow: none;
285
- }
286
- input {
287
- float: left;
288
- width: auto;
289
- margin: 0;
290
- }
291
- label {
292
- float: left;
293
- width: auto;
294
- margin: 6px 8px;
295
- }
296
- }
297
-
298
410
 
299
411
  div.pointer-list,
300
412
  div.search-result-list {
@@ -333,7 +445,6 @@ $diff-green: #41ad41;
333
445
  $diff-red: #ff5050;
334
446
  $action-white: #fdfdfd;
335
447
  $act-gray: #b7b7b7;
336
- $act-background: #f3f3f3;
337
448
 
338
449
  .history-slot {
339
450
  overflow: hidden;
@@ -341,111 +452,107 @@ $act-background: #f3f3f3;
341
452
  }
342
453
 
343
454
  .history-header {
344
- padding: 10px 10px 10px 10px;
455
+ padding: 10px;
456
+ background: $action-white;
345
457
  }
346
458
  .history-legend {
347
- text-align: right;
348
- float: right;
459
+ text-align: right;
349
460
  }
350
461
  .history-header nav.pagination {
351
- display: inline;
352
- text-align: left;
462
+ display: inline;
463
+ float: left;
353
464
  }
354
465
 
355
- .act {
356
- padding: 10px 10px 10px 10px;
357
- background-color: $act-background;
358
- margin-bottom: 5px;
359
-
360
- .head {
361
- float: left;
362
- margin-right:10px;
363
- min-width: 175px;
364
- }
365
- .nr {
366
- float: left;
367
- }
368
- .title {
369
- float: left;
370
- margin-left: 10px;
371
- }
372
- .actor {
373
- float: left;
374
- }
375
- .time {
376
- font-size: 8pt;
377
- float:left;
378
- clear:left;
379
- }
380
-
381
- .action-container {
382
- overflow: hidden;
383
- }
384
- .action {
385
- background-color: $action-white;
386
- margin: 5px 5px 2px 2px;
387
- padding: 6px 5px 6px 5px;
388
- overflow: hidden;
389
- }
390
- .ampel {
391
- margin: 2px 0 0 4px;
392
- }
393
- .arrow {
394
- margin: 0px 10px 0px 10px;
395
- color: green;
396
- }
397
- .toggle {
398
- float: right;
399
- margin: 12px 10px 0px 10px;
400
- width: 20px;
401
- }
402
-
403
- .name-diff {
404
- border-style: solid;
405
- border-width: 1px;
406
- border-color: #E4E4E4;
407
- padding: 3px 8px 3px 8px;
408
- background-color: #EEEEEE;
409
- margin-left: 3px;
410
- }
411
- .type-diff {
412
- padding: 1px 0px 1px 3px;
413
- }
414
- .content-diff {
415
- overflow: hidden;
416
- }
466
+ .act {
467
+ .head {
468
+ float: left;
469
+ margin-right:10px;
470
+ min-width: 175px;
471
+ }
472
+ .nr {
473
+ float: left;
474
+ }
475
+ .title {
476
+ float: left;
477
+ margin-left: 10px;
478
+ }
479
+ .actor {
480
+ float: left;
481
+ }
482
+ .time {
483
+ font-size: 8pt;
484
+ float:left;
485
+ clear:left;
486
+ }
487
+
488
+ .action-container {
489
+ overflow: hidden;
490
+ }
491
+ .action {
492
+ background-color: $action-white;
493
+ margin: 5px 5px 2px 2px;
494
+ padding: 6px 5px 6px 5px;
495
+ overflow: hidden;
496
+ }
497
+ .ampel {
498
+ margin: 2px 0 0 4px;
499
+ }
500
+ .arrow {
501
+ margin: 0px 10px 0px 10px;
502
+ color: green;
503
+ }
504
+ .toggle {
505
+ float: right;
506
+ margin: 12px 10px 0px 10px;
507
+ width: 20px;
508
+ }
509
+ /*
510
+ .name-diff {
511
+ color: #000;
512
+ border-style: solid;
513
+ border-width: 1px;
514
+ border-color: #E4E4E4;
515
+ padding: 3px 8px 3px 8px;
516
+ background-color: #EEEEEE;
517
+ margin-left: 3px;
518
+ }
519
+ */
520
+ .type-diff {
521
+ padding: 1px 0px 1px 3px;
522
+ }
523
+ .content-diff {
524
+ overflow: hidden;
525
+ }
417
526
 
418
- .action {
419
- .expanded {
420
- clear:left;
421
- padding: 14px 10px 14px 24px;
422
- }
423
- .summary {
424
- padding: 6px 0px;
425
- }
426
- }
427
-
428
- .arrow-down {
429
- width: 0;
430
- height: 0;
431
- border-left: 7px solid transparent;
432
- border-right: 7px solid transparent;
433
- border-top: 11px solid $act-gray;
434
- display: block;
527
+ .action {
528
+ .expanded {
529
+ clear:left;
530
+ padding: 14px 10px 14px 24px;
435
531
  }
436
- .arrow-right {
437
- width: 0;
438
- height: 0;
439
- border-top: 7px solid transparent;
440
- border-bottom: 7px solid transparent;
441
- border-left: 11px solid $act-gray;
442
- display: block;
443
- }
444
-
445
- .info {
446
- font-style: italic;
447
- color: #888;
532
+ .summary {
533
+ padding: 6px 0px;
448
534
  }
535
+ }
536
+
537
+ .arrow-down {
538
+ width: 0;
539
+ height: 0;
540
+ border-left: 7px solid transparent;
541
+ border-right: 7px solid transparent;
542
+ border-top: 11px solid $act-gray;
543
+ display: block;
544
+ }
545
+ .arrow-right {
546
+ width: 0;
547
+ height: 0;
548
+ border-top: 7px solid transparent;
549
+ border-bottom: 7px solid transparent;
550
+ border-left: 11px solid $act-gray;
551
+ display: block;
552
+ }
553
+ .info {
554
+ font-style: italic;
555
+ }
449
556
  }
450
557
 
451
558
  .diff-red {
@@ -486,11 +593,6 @@ $act-background: #f3f3f3;
486
593
  border-right: 2px solid #888;
487
594
  color: #333;
488
595
  }
489
- .render-error {
490
- background-color: #eaa !important; /* NOTGREY - red for error */
491
- padding: 1px 20px;
492
- font-style: italic;
493
- }
494
596
 
495
597
  .card-notice {
496
598
  background: #fff;
@@ -653,7 +755,7 @@ td.missing-rule {
653
755
  .open-rule .card-body {
654
756
  clear: both;
655
757
  }
656
- .open-rule .instruction {
758
+ .open-rule .rule-instruction {
657
759
  float: right;
658
760
  text-align: left;
659
761
  max-width: 68%;
@@ -662,8 +764,6 @@ td.missing-rule {
662
764
  .set-editor {
663
765
  ul {
664
766
  list-style-type: none;
665
- margin: 0;
666
- padding: 0;
667
767
  }
668
768
  .current-set-label {
669
769
  font-weight: bold;
@@ -730,14 +830,6 @@ h2.set-label {
730
830
  background-image: url([[/assets/smoothness/ui-icons_454545_256x240.png]])
731
831
  }
732
832
 
733
- .instruction {
734
- text-align: center;
735
- padding: 4px 10px;
736
- ol,
737
- ul {
738
- text-align: left;
739
- }
740
- }
741
833
 
742
834
  table.show-cache td {
743
835
  padding: 10px;
@@ -758,3 +850,5 @@ html>body .open-view {
758
850
  font-style: italic;
759
851
  font-size: .85em;
760
852
  }
853
+
854
+