trusty-cms 4.0.1 → 4.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (217) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -3
  3. data/Gemfile.lock +106 -106
  4. data/Rakefile +7 -7
  5. data/app/assets/images/admin/spinner.gif +0 -0
  6. data/app/assets/javascripts/admin.js +3 -0
  7. data/app/assets/javascripts/admin/more-or-less.js +2 -2
  8. data/app/assets/javascripts/admin/tabcontrol.js.erb +1 -2
  9. data/app/assets/stylesheets/admin/_base.scss +22 -6
  10. data/app/assets/stylesheets/admin/_multi_site_main.scss +28 -29
  11. data/app/assets/stylesheets/admin/_reset.scss +5 -4
  12. data/app/assets/stylesheets/admin/_site_chooser.scss +44 -69
  13. data/app/assets/stylesheets/admin/assets.scss +138 -141
  14. data/app/assets/stylesheets/admin/main.scss +10 -12
  15. data/app/assets/stylesheets/admin/modules/_boxes.scss +0 -3
  16. data/app/assets/stylesheets/admin/modules/_buttons.scss +30 -0
  17. data/app/assets/stylesheets/admin/modules/_links.scss +1 -1
  18. data/app/assets/stylesheets/admin/partials/_actions.scss +29 -46
  19. data/app/assets/stylesheets/admin/partials/_avatars.scss +3 -2
  20. data/app/assets/stylesheets/admin/partials/_content.scss +15 -38
  21. data/app/assets/stylesheets/admin/partials/_dateinput.scss +23 -14
  22. data/app/assets/stylesheets/admin/partials/_drawer.scss +78 -0
  23. data/app/assets/stylesheets/admin/partials/_dropdown.scss +9 -12
  24. data/app/assets/stylesheets/admin/partials/_footer.scss +4 -3
  25. data/app/assets/stylesheets/admin/partials/_forms.scss +64 -491
  26. data/app/assets/stylesheets/admin/partials/_header.scss +9 -118
  27. data/app/assets/stylesheets/admin/partials/_layout.scss +26 -2
  28. data/app/assets/stylesheets/admin/partials/_login_form.scss +28 -0
  29. data/app/assets/stylesheets/admin/partials/_messages.scss +10 -5
  30. data/app/assets/stylesheets/admin/partials/_popup.scss +61 -50
  31. data/app/assets/stylesheets/admin/partials/_preferences.scss +37 -0
  32. data/app/assets/stylesheets/admin/partials/_sidebar.scss +55 -0
  33. data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +24 -36
  34. data/app/assets/stylesheets/admin/partials/{_index.scss → _table.scss} +53 -84
  35. data/app/assets/stylesheets/admin/partials/_toolbar.scss +11 -6
  36. data/app/assets/stylesheets/admin/partials/_treetable.scss +1 -71
  37. data/app/assets/stylesheets/admin/partials/_typography.scss +30 -55
  38. data/app/assets/stylesheets/admin/partials/_validations.scss +6 -5
  39. data/app/assets/stylesheets/rad_social/rad_screen.scss +65 -64
  40. data/app/controllers/admin/assets_controller.rb +21 -31
  41. data/app/controllers/admin/configuration_controller.rb +9 -11
  42. data/app/controllers/admin/extensions_controller.rb +3 -3
  43. data/app/controllers/admin/layouts_controller.rb +3 -4
  44. data/app/controllers/admin/page_attachments_controller.rb +5 -5
  45. data/app/controllers/admin/page_fields_controller.rb +3 -4
  46. data/app/controllers/admin/page_parts_controller.rb +4 -5
  47. data/app/controllers/admin/pages_controller.rb +55 -56
  48. data/app/controllers/admin/references_controller.rb +1 -1
  49. data/app/controllers/admin/resource_controller.rb +132 -128
  50. data/app/controllers/admin/sites_controller.rb +4 -4
  51. data/app/controllers/admin/snippets_controller.rb +3 -4
  52. data/app/controllers/admin/users_controller.rb +16 -16
  53. data/app/controllers/application_controller.rb +47 -48
  54. data/app/controllers/site_controller.rb +51 -48
  55. data/app/controllers/social_mailer_controller.rb +13 -16
  56. data/app/helpers/admin/configuration_helper.rb +19 -20
  57. data/app/helpers/admin/layouts_helper.rb +0 -1
  58. data/app/helpers/admin/node_helper.rb +27 -24
  59. data/app/helpers/admin/pages_helper.rb +2 -2
  60. data/app/helpers/admin/preferences_helper.rb +0 -1
  61. data/app/helpers/admin/references_helper.rb +9 -10
  62. data/app/helpers/admin/regions_helper.rb +3 -3
  63. data/app/helpers/application_helper.rb +34 -35
  64. data/app/helpers/rad_social_helper.rb +8 -11
  65. data/app/helpers/scoped_helper.rb +1 -3
  66. data/app/helpers/sites_helper.rb +4 -4
  67. data/app/mailers/devise_mailer.rb +3 -4
  68. data/app/mailers/rad_social_mailer.rb +8 -8
  69. data/app/models/asset.rb +62 -63
  70. data/app/models/asset_type.rb +38 -39
  71. data/app/models/deprecated_tags.rb +3 -4
  72. data/app/models/file_not_found_page.rb +1 -3
  73. data/app/models/haml_filter.rb +1 -1
  74. data/app/models/layout.rb +4 -5
  75. data/app/models/legacy_user.rb +2 -2
  76. data/app/models/menu_renderer.rb +16 -18
  77. data/app/models/page.rb +96 -93
  78. data/app/models/page_attachment.rb +1 -2
  79. data/app/models/page_context.rb +11 -12
  80. data/app/models/page_part.rb +3 -4
  81. data/app/models/rails_page.rb +10 -12
  82. data/app/models/site.rb +22 -21
  83. data/app/models/snippet.rb +6 -8
  84. data/app/models/snippet_finder.rb +3 -3
  85. data/app/models/snippet_tags.rb +4 -4
  86. data/app/models/standard_tags.rb +258 -252
  87. data/app/models/status.rb +8 -8
  88. data/app/models/trusty_cms/config.rb +25 -25
  89. data/app/models/trusty_cms/page_response_cache_director.rb +2 -3
  90. data/app/models/user.rb +15 -14
  91. data/app/models/user_action_observer.rb +3 -3
  92. data/app/users/_choose_site.html.haml +3 -7
  93. data/app/views/admin/assets/_form.html.haml +2 -1
  94. data/app/views/admin/assets/_search.html.haml +2 -1
  95. data/app/views/admin/assets/edit.html.haml +2 -10
  96. data/app/views/admin/assets/index.html.haml +4 -2
  97. data/app/views/admin/assets/new.html.haml +4 -8
  98. data/app/views/admin/assets/remove.html.haml +2 -1
  99. data/app/views/admin/configuration/edit.html.haml +7 -7
  100. data/app/views/admin/configuration/show.html.haml +6 -8
  101. data/app/views/admin/layouts/_choose_site.html.haml +2 -3
  102. data/app/views/admin/layouts/_form.html.haml +13 -12
  103. data/app/views/admin/layouts/_site_chooser.html.haml +2 -2
  104. data/app/views/admin/layouts/index.html.haml +11 -4
  105. data/app/views/admin/layouts/remove.html.haml +6 -5
  106. data/app/views/admin/page_attachments/_attachment.html.haml +2 -2
  107. data/app/views/admin/page_fields/_page_field.html.haml +3 -3
  108. data/app/views/admin/page_parts/_page_part.html.haml +5 -6
  109. data/app/views/admin/pages/_asset_popups.html.haml +15 -16
  110. data/app/views/admin/pages/_assets.html.haml +8 -7
  111. data/app/views/admin/pages/_fields.html.haml +16 -13
  112. data/app/views/admin/pages/_node.html.haml +3 -3
  113. data/app/views/admin/pages/_popups.html.haml +11 -11
  114. data/app/views/admin/pages/edit.html.haml +2 -2
  115. data/app/views/admin/pages/index.html.haml +5 -2
  116. data/app/views/admin/pages/new.html.haml +3 -3
  117. data/app/views/admin/pages/remove.html.haml +4 -3
  118. data/app/views/admin/preferences/edit.html.haml +5 -5
  119. data/app/views/admin/references/filters.haml +1 -1
  120. data/app/views/admin/references/tags.haml +3 -3
  121. data/app/views/admin/removed/_assets_bucket.html.haml +3 -3
  122. data/app/views/admin/removed/_assets_container.html.haml +18 -18
  123. data/app/views/admin/removed/_bucket.html.haml +1 -1
  124. data/app/views/admin/removed/_bucket_asset.html.haml +3 -3
  125. data/app/views/admin/removed/_show_bucket_link.html.haml +1 -1
  126. data/app/views/admin/removed/_upload_to_page.html.haml +5 -5
  127. data/app/views/admin/sites/_form.haml +18 -18
  128. data/app/views/admin/sites/edit.haml +1 -1
  129. data/app/views/admin/sites/index.haml +8 -4
  130. data/app/views/admin/sites/new.haml +1 -1
  131. data/app/views/admin/snippets/_choose_site.html.haml +4 -5
  132. data/app/views/admin/snippets/_form.html.haml +8 -9
  133. data/app/views/admin/snippets/edit.html.haml +1 -1
  134. data/app/views/admin/snippets/index.html.haml +11 -4
  135. data/app/views/admin/snippets/new.html.haml +1 -1
  136. data/app/views/admin/snippets/remove.html.haml +7 -6
  137. data/app/views/admin/users/_avatar.html.haml +2 -2
  138. data/app/views/admin/users/_choose_site.html.haml +3 -7
  139. data/app/views/admin/users/_form.html.haml +18 -21
  140. data/app/views/admin/users/_password_fields.html.haml +6 -6
  141. data/app/views/admin/users/index.html.haml +13 -6
  142. data/app/views/admin/users/remove.html.haml +4 -4
  143. data/app/views/admin/welcome/login.html.haml +8 -8
  144. data/app/views/devise/passwords/edit.html.haml +6 -6
  145. data/app/views/devise/passwords/new.html.haml +3 -3
  146. data/app/views/devise/sessions/new.html.haml +8 -8
  147. data/app/views/devise/shared/_links.html.haml +2 -2
  148. data/app/views/layouts/application.html.haml +24 -19
  149. data/app/views/rad_social_mailer/social_mail_form.html.haml +15 -15
  150. data/app/views/widget/_email_form.html.haml +14 -14
  151. data/app/views/widget/_horizontal_widget.html.haml +5 -5
  152. data/bin/rails +4 -4
  153. data/bin/trusty_cms +3 -5
  154. data/config.ru +1 -1
  155. data/config/application.rb +14 -15
  156. data/config/boot.rb +1 -2
  157. data/config/environment.rb +1 -1
  158. data/config/environments/production.rb +0 -1
  159. data/config/environments/test.rb +1 -2
  160. data/config/initializers/devise.rb +1 -1
  161. data/config/initializers/kraken.rb +2 -2
  162. data/config/initializers/tmp.rb +1 -1
  163. data/config/initializers/trusty_cms_config.rb +48 -48
  164. data/config/locales/en.yml +8 -8
  165. data/config/routes.rb +6 -7
  166. data/lib/active_record_extensions/active_record_extensions.rb +1 -2
  167. data/lib/annotatable.rb +3 -5
  168. data/lib/configuration_extensions/configuration_extensions.rb +1 -1
  169. data/lib/inheritable_class_attributes.rb +13 -9
  170. data/lib/login_system.rb +73 -73
  171. data/lib/method_observer.rb +13 -12
  172. data/lib/ostruct.rb +7 -10
  173. data/lib/simpleton.rb +0 -4
  174. data/lib/string_extensions/string_extensions.rb +3 -3
  175. data/lib/symbol_extensions/symbol_extensions.rb +1 -1
  176. data/lib/tasks/database.rake +28 -28
  177. data/lib/tasks/extensions.rake +18 -18
  178. data/lib/tasks/framework.rake +68 -68
  179. data/lib/tasks/radiant_config.rake +4 -4
  180. data/lib/tasks/snippets_extension_tasks.rake +11 -11
  181. data/lib/tasks/translate.rake +14 -14
  182. data/lib/tasks/upgrade_to_devise.rake +1 -1
  183. data/lib/translation_support.rb +22 -22
  184. data/lib/trusty_cms.rb +2 -2
  185. data/lib/trusty_cms/admin_ui.rb +19 -16
  186. data/lib/trusty_cms/admin_ui/region_partials.rb +4 -3
  187. data/lib/trusty_cms/admin_ui/region_set.rb +4 -5
  188. data/lib/trusty_cms/available_locales.rb +2 -4
  189. data/lib/trusty_cms/config/definition.rb +11 -8
  190. data/lib/trusty_cms/engine.rb +14 -14
  191. data/lib/trusty_cms/extension.rb +14 -16
  192. data/lib/trusty_cms/extension_loader.rb +6 -6
  193. data/lib/trusty_cms/extension_migrator.rb +42 -41
  194. data/lib/trusty_cms/extension_path.rb +20 -19
  195. data/lib/trusty_cms/initializer.rb +5 -8
  196. data/lib/trusty_cms/pagination/controller.rb +7 -10
  197. data/lib/trusty_cms/pagination/link_renderer.rb +2 -2
  198. data/lib/trusty_cms/resource_responses.rb +3 -3
  199. data/lib/trusty_cms/setup.rb +130 -132
  200. data/lib/trusty_cms/taggable.rb +19 -22
  201. data/lib/trusty_cms/task_support.rb +9 -6
  202. data/package.json +10 -2
  203. data/public/dispatch.fcgi +1 -1
  204. data/public/dispatch.rb +2 -2
  205. data/script/extension +1 -1
  206. data/script/rails +2 -2
  207. data/spec/dummy/package.json +1 -1
  208. data/spec/dummy/yarn.lock +3 -3
  209. data/trusty_cms.gemspec +25 -25
  210. data/vendor/extensions/clipped-extension/lib/clipped_admin_ui.rb +1 -1
  211. data/yarn.lock +1992 -4
  212. metadata +54 -42
  213. data/app/assets/stylesheets/admin/partials/_deprecated.scss +0 -65
  214. data/app/assets/stylesheets/admin/partials/_jquery-ui-structure.scss +0 -258
  215. data/app/assets/stylesheets/admin/partials/_jquery-ui-theme.scss +0 -410
  216. data/app/assets/stylesheets/admin/partials/_jquery-ui.scss +0 -650
  217. data/app/views/admin/assets/refresh.html.haml +0 -14
@@ -0,0 +1,37 @@
1
+ #preferences, #config {
2
+ padding-bottom: 1em;
3
+
4
+ h3, h4 {
5
+ border-bottom: 1px solid $gray;
6
+ padding-bottom: 0.25em;
7
+ }
8
+ }
9
+
10
+ .ruled {
11
+ border-bottom: 1px solid $light-gray;
12
+ margin-bottom: 0.5em;
13
+ padding: 0.5em;
14
+
15
+ span {
16
+ font-weight: bold;
17
+ }
18
+
19
+ label {
20
+ color: $dark-gray;
21
+ display: inline-block;
22
+ font-size: 1em;
23
+ margin-right: 0.5em;
24
+ }
25
+ }
26
+
27
+ #display_password {
28
+ .button {
29
+ display: block;
30
+ max-width: fit-content;
31
+ }
32
+ }
33
+
34
+ .checkbox {
35
+ display: inline-block;
36
+ margin-right: 0.5em;
37
+ }
@@ -0,0 +1,55 @@
1
+ nav {
2
+ background-color: $white;
3
+ border-right: 0.5px solid $dark-gray;
4
+ grid-area: nav;
5
+
6
+ ul.navigation {
7
+ border-right: 0.5px solid $dark-gray;
8
+
9
+ a {
10
+ color: mix($light-gray, white, 15%);
11
+ text-decoration: none;
12
+
13
+ li {
14
+ background-color: $dark-blue;
15
+ border-top: 1px solid $light-gray;
16
+ padding: 1em 7em 1em 1em;
17
+
18
+ &:hover {
19
+ background: darken($dark-blue, 15%);
20
+ cursor: pointer;
21
+ }
22
+
23
+ &.current {
24
+ background: darken($dark-blue, 15%);
25
+ color: $white;
26
+ font-weight: bold;
27
+ }
28
+ }
29
+ }
30
+ }
31
+ }
32
+
33
+ .toolbar {
34
+ background-color: $white;
35
+ border-right: 0.5px solid $dark-gray;
36
+ grid-area: toolbar;
37
+
38
+ ul.secondary_navigation {
39
+ border-right: 0.5px solid $dark-gray;
40
+
41
+ a {
42
+ text-decoration: none;
43
+
44
+ li {
45
+ border-bottom: 0.5px solid $dark-gray;
46
+ padding: 1em 5em 1em 1em;
47
+ }
48
+
49
+ &.current {
50
+ font-style: italic;
51
+ font-weight: bold;
52
+ }
53
+ }
54
+ }
55
+ }
@@ -1,64 +1,58 @@
1
1
  #tab_control {
2
- color: #333333;
3
- margin-bottom: 1em;
4
2
  .tabs {
5
3
  float: left;
6
4
  width: 100%;
7
- margin-right: -4px;
5
+
8
6
  .tab {
9
- background-color: #e4e4e4;
10
- color: black;
7
+ background-color: darken($light-gray, 5%);
11
8
  display: inline-block;
12
- font-size: 90%;
13
- text-align: left;
9
+ font-size: 0.8em;
14
10
  margin-right: 5px;
15
- padding: 8px 15px 5px;
11
+ padding: 0.85em 0.5em;
16
12
  text-decoration: none;
17
- text-transform: titlecase;
18
- border-top-left-radius: 6px;
19
- border-top-right-radius: 6px;
13
+
20
14
  &.here {
21
- background-color: white;
22
- color: #737272;
15
+ background-color: $white;
16
+ color: $gray;
23
17
  font-weight: bold;
24
18
  }
19
+
25
20
  span:hover {
26
- color: #737272;
21
+ color: $gray;
27
22
  }
23
+
28
24
  .close {
29
- margin-top: -4px;
30
- margin-left: 5px;
31
- margin-right: -5px;
25
+ padding-left: .5em;
32
26
  }
33
27
  }
34
28
  }
29
+
35
30
  .pages {
36
- background: white;
37
- width: 100%;
31
+ background: $white;
38
32
  clear: both;
33
+ margin-right: 1em;
34
+
39
35
  .page {
40
36
  background: white;
41
- background-image: linear-gradient(to bottom, #ffffff, #f5f1e2 15%, #f5f1e2);
42
- box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);
43
37
  padding: 12px 20px 20px;
38
+
44
39
  p {
45
40
  margin-top: 0;
46
41
  }
42
+
47
43
  label {
44
+ color: #000;
48
45
  display: inline;
49
- color: #333333;
50
- font-weight: normal;
51
46
  font-size: 80%;
47
+ font-weight: normal;
52
48
  text-shadow: none;
53
49
  }
54
50
  }
51
+
55
52
  .reference_links {
56
- font-size: 85%;
57
- margin-left: 1em;
58
53
  float: right;
59
- a {
60
- color: #0066cc;
61
- }
54
+ font-size: 85%;
55
+ margin-bottom: 0;
62
56
  }
63
57
  }
64
58
  }
@@ -67,19 +61,13 @@
67
61
  #tab_toolbar {
68
62
  float: right;
69
63
  overflow: hidden;
70
- margin-top: 0.2em;
71
- padding: 3px;
64
+ padding: 0 1em;
72
65
  }
73
66
  }
74
67
 
75
68
  .reference_links {
76
69
  font-size: 85%;
77
- span {
78
- padding: 0 0 0 4px;
79
- a {
80
- color: #4444ee;
81
- }
82
- }
70
+ margin-bottom: 1em;
83
71
  }
84
72
 
85
73
  #tag_reference_link {
@@ -1,113 +1,106 @@
1
1
  @mixin status-badge($background, $color: white, $width: 5em) {
2
- color: $color;
3
2
  background: $background;
3
+ color: $color;
4
4
  display: block;
5
5
  padding: 0 6px;
6
- width: $width;
7
6
  text-align: center;
8
- border-radius: 100px;
7
+ width: $width;
9
8
  }
10
9
 
11
- table.index {
12
- font-size: 90%;
13
- margin-bottom: 2em;
14
- width: 100%;
15
- border-bottom: 1px solid white;
10
+
11
+ table {
16
12
  th {
17
- text-align: left;
18
- background-color: #9e9e9e;
19
- color: white;
20
- font-size: 90%;
21
- font-weight: normal;
22
- padding: 2px 9px;
13
+ background-color: $light-gray;
14
+ color: $dark-gray;
15
+ padding: 0.75em;
16
+ white-space: nowrap;
17
+
23
18
  &.actions {
24
- padding-left: 15px;
25
- min-width: 18em;
19
+ padding: 0 17em 0 1em;
26
20
  }
21
+
27
22
  &.name {
28
23
  width: 100%;
29
24
  }
25
+
30
26
  &.status {
31
27
  min-width: 8em;
32
28
  }
33
29
  }
30
+
34
31
  td {
35
- text-align: left;
36
- padding: 4px 9px;
37
32
  border-top: 1px solid #f0f0f0;
33
+ font-size: 0.85em;
34
+ padding: 1em 0.25em;
35
+
38
36
  a.action,
39
37
  span.action.disabled {
40
- padding: 6px;
41
38
  margin: 0 25px 0 1px;
39
+ padding: 6px;
40
+
42
41
  img {
43
42
  vertical-align: -18%;
44
43
  }
45
44
  }
45
+
46
46
  a.action {
47
- color: black;
47
+ color: $dark-gray;
48
48
  text-decoration: none;
49
+
49
50
  &:hover {
50
- background: #d8d8d8;
51
- background-image: linear-gradient(to bottom, #ffffff, #cccccc);
52
- border: 1px solid #a5c9df;
51
+ background: $light-gray;
52
+ border: 1px solid darken($light-gray, 10%);
53
53
  margin: 0 24px 0 0;
54
- border-radius: 5px;
55
54
  }
55
+
56
56
  &.selected {
57
- background: #c5e0f5;
58
- background-image: linear-gradient(to bottom, #e5f5ff, #c5e0ff);
59
- border: 1px solid #a5c9df;
57
+ background: $light-gray;
58
+ border: 1px solid darken($light-gray, 10%);
60
59
  margin: 0 24px 0 0;
61
- border-top-left-radius: 5px;
62
- border-top-right-radius: 5px;
63
- border-bottom-left-radius: 0;
64
- border-bottom-right-radius: 0;
65
60
  }
66
61
  }
62
+
67
63
  span.action.disabled {
68
64
  color: #cccccc;
69
65
  }
66
+
70
67
  &.empty {
71
68
  color: silver;
72
- font-size: 85%;
73
69
  font-style: italic;
74
70
  padding: 3em;
75
71
  text-align: center;
76
72
  }
73
+
77
74
  &.name {
78
- font-size: 115%;
79
75
  font-weight: bold;
80
- img {
81
- vertical-align: center;
82
- }
76
+
83
77
  a {
84
- color: black;
78
+ color: $dark-gray;
85
79
  text-decoration: none;
86
- &:hover {
87
- color: #EC0673;
88
- text-decoration: underline;
89
- }
90
80
  }
91
81
  }
82
+
92
83
  &.actions {
93
84
  font-size: 85%;
94
85
  white-space: nowrap;
95
86
  }
96
87
  }
88
+
97
89
  tr {
98
90
  &:first-child {
99
91
  border-top: 1px solid white;
100
92
  }
93
+
101
94
  &.hover,
102
95
  &:hover {
103
96
  td {
104
- border-top: 1px solid #d5f0ff;
105
- border-bottom: 1px solid #c5dff5;
106
97
  background: #c5dff5;
107
- background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
98
+ border-bottom: 1px solid #c5dff5;
99
+ border-top: 1px solid #d5f0ff;
108
100
  }
109
101
  }
110
102
  }
103
+
111
104
  thead {
112
105
  tr,
113
106
  tr:first-child {
@@ -117,57 +110,31 @@ table.index {
117
110
  }
118
111
 
119
112
  table.index#pages {
120
- tr.page {
121
- &.level_0 td.name {
122
- font-size: 120%;
123
- font-weight: bold;
124
- }
125
- &.level_1 td.name {
126
- font-size: 115%;
127
- font-weight: bold;
128
- }
129
- &.level_2 td.name {
130
- font-size: 115%;
131
- }
132
- &.level_3 td.name {
133
- font-size: 105%;
134
- }
135
- }
136
113
  td.name {
137
- font-size: 105%;
138
- a {
139
- text-decoration: none;
140
- .title {
141
- color: black;
142
- text-decoration: none;
143
- }
144
- &:hover .title {
145
- color: #EC0673;
146
- text-decoration: underline;
114
+ .w1 {
115
+ position: relative;
116
+
117
+ img.expander {
118
+ left: -25px;
119
+ padding: 6px 3px;
120
+ position: absolute;
147
121
  }
148
122
  }
123
+
149
124
  .info {
150
125
  color: #9eb3bf;
126
+ font-size: 0.90em;
151
127
  font-style: italic;
152
128
  font-weight: normal;
153
- font-size: 90%;
154
129
  }
155
130
  }
131
+
156
132
  tr.page.virtual td.name a .title {
157
133
  color: #9eb3bf;
158
134
  }
159
- td.name {
160
- .w1 {
161
- position: relative;
162
- img.expander {
163
- left: -25px;
164
- position: absolute;
165
- padding: 6px 3px;
166
- }
167
- }
168
- }
135
+
169
136
  td.status {
170
- font-size: 80%;
137
+ font-size: .80em;
171
138
  }
172
139
  }
173
140
 
@@ -178,7 +145,7 @@ table.index#pages {
178
145
  }
179
146
 
180
147
  .draft_status {
181
- @include status-badge(#cc494c);
148
+ @include status-badge($red);
182
149
  }
183
150
 
184
151
  .hidden_status {
@@ -187,12 +154,14 @@ table.index#pages {
187
154
 
188
155
  table.index#users {
189
156
  td.name {
190
- padding-top: 8px;
191
157
  padding-bottom: 8px;
158
+ padding-top: 8px;
159
+
192
160
  img.avatar {
193
161
  margin-right: 4px;
194
162
  vertical-align: center;
195
163
  }
164
+
196
165
  .login {
197
166
  color: #9eb3bf;
198
167
  font-size: 90%;
@@ -7,34 +7,39 @@
7
7
  div.textarea_toolbar {
8
8
  float: left;
9
9
  margin-bottom: 8px;
10
+
10
11
  span.separator {
11
- padding: 0;
12
- height: 6px;
13
- width: 2px;
14
- margin: 0 2px;
15
12
  border-left: solid 1px #d5d5d5;
16
13
  border-right: solid 1px whitesmoke;
14
+ height: 6px;
15
+ margin: 0 2px;
16
+ padding: 0;
17
+ width: 2px;
17
18
  }
19
+
18
20
  button,
19
21
  button.unselected {
20
- margin: 0;
21
22
  background: none;
22
23
  border: none;
24
+ margin: 0;
23
25
  padding: 2px 0;
24
26
  text-align: center;
25
27
  width: 24px;
28
+
26
29
  img {
27
30
  vertical-align: text-bottom;
28
31
  }
29
32
  }
33
+
30
34
  button:hover,
31
35
  button.unselected:hover {
32
36
  border: 1px solid #999999;
33
37
  padding: 1px 0;
34
38
  }
39
+
35
40
  button.selected {
36
- border: 1px solid #ce9100;
37
41
  background-color: white;
42
+ border: 1px solid #ce9100;
38
43
  padding: 1px 0;
39
44
  }
40
45
  }