trusty-cms 3.5.0 → 3.5.1

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 (31) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -0
  3. data/Gemfile.lock +76 -91
  4. data/app/assets/stylesheets/admin/_base.scss +0 -1
  5. data/app/assets/stylesheets/admin/_reset.scss +55 -0
  6. data/app/assets/stylesheets/admin/_site_chooser.scss +2 -5
  7. data/app/assets/stylesheets/admin/assets.scss +27 -19
  8. data/app/assets/stylesheets/admin/main.scss +1 -3
  9. data/app/assets/stylesheets/admin/modules/_boxes.scss +3 -3
  10. data/app/assets/stylesheets/admin/partials/_actions.scss +12 -10
  11. data/app/assets/stylesheets/admin/partials/_avatars.scss +4 -4
  12. data/app/assets/stylesheets/admin/partials/_content.scss +2 -2
  13. data/app/assets/stylesheets/admin/partials/_dateinput.scss +4 -4
  14. data/app/assets/stylesheets/admin/partials/_deprecated.scss +3 -3
  15. data/app/assets/stylesheets/admin/partials/_dropdown.scss +8 -6
  16. data/app/assets/stylesheets/admin/partials/_forms.scss +20 -27
  17. data/app/assets/stylesheets/admin/partials/_header.scss +16 -11
  18. data/app/assets/stylesheets/admin/partials/_index.scss +10 -8
  19. data/app/assets/stylesheets/admin/partials/_popup.scss +9 -9
  20. data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +4 -3
  21. data/app/assets/stylesheets/admin/partials/_validations.scss +2 -2
  22. data/config/application.rb +0 -2
  23. data/lib/generators/instance/templates/instance_gemfile +0 -3
  24. data/lib/generators/trusty_cms/templates/application.rb.erb +0 -3
  25. data/lib/generators/trusty_cms/trusty_cms_generator.rb +0 -1
  26. data/lib/trusty_cms.rb +1 -1
  27. data/spec/dummy/config/application.rb +0 -3
  28. data/trusty_cms.gemspec +1 -2
  29. metadata +153 -168
  30. data/app/assets/stylesheets/admin/modules/_gradients.scss +0 -5
  31. data/lib/generators/trusty_cms/templates/compass.rb.erb +0 -1
@@ -1,10 +1,8 @@
1
1
  // main.css - main stylesheet for the TrustyCms admin interface
2
2
 
3
3
  // Common Variables and Modules
4
- @import "compass";
5
4
  @import "base";
6
-
7
- @import "compass/reset";
5
+ @import "reset";
8
6
 
9
7
  // Partials
10
8
  @import "partials/typography";
@@ -1,7 +1,7 @@
1
1
  @mixin alt-box {
2
+ background-image: linear-gradient(to bottom, #ffffff, #cccccc);
2
3
  background: #d8d8d8;
3
- @include linear-gradient(color-stops(white, #cccccc));
4
- @include border-radius(8px);
5
- @include single-box-shadow(rgba(0, 0, 0, 0.15), 2px, 2px, 3px);
4
+ border-radius: 8px;
5
+ box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 3px;
6
6
  padding: 12px 10px;
7
7
  }
@@ -1,9 +1,9 @@
1
1
  @mixin button-shadow {
2
- @include single-box-shadow(#555555, 1px, 2px, 3px);
2
+ box-shadow: 1px 2px 3px #555;
3
3
  }
4
4
 
5
5
  @mixin no-button-shadow {
6
- @include single-box-shadow(#555555, 0, 0, 0);
6
+ box-shadow: 0 0 0 #555;
7
7
  }
8
8
 
9
9
  #actions {
@@ -12,7 +12,7 @@
12
12
  right: 0;
13
13
  bottom: 0;
14
14
  background: #777777;
15
- @include linear-gradient(color-stops(#555555, #666666, #777777, #777777));
15
+ background-image: linear-gradient(to bottom, #555555, #666666, #777777, #777777);
16
16
  ul {
17
17
  padding: 14px 8px;
18
18
  }
@@ -32,18 +32,20 @@
32
32
  padding: 6px 12px 6px 12px;
33
33
  margin-right: 1px;
34
34
  background: #dddddd;
35
- @include linear-gradient(color-stops(#c5c5c5, #f0f0f0 20%, white 35%, white));
35
+ background-image: linear-gradient(to bottom, #c5c5c5, #f0f0f0 20%, #ffffff 35%, #ffffff);
36
36
  color: #999999;
37
37
  font-size: 80%;
38
38
  text-decoration: none;
39
- @include border-bottom-radius(5px);
40
- @include border-top-radius(0);
39
+ border-bottom-left-radius: 5px;
40
+ border-bottom-right-radius: 5px;
41
+ border-top-left-radius: 0;
42
+ border-top-right-radius: 0;
41
43
  }
42
44
  a {
43
45
  text-shadow: 1px 1px 1px #eeeeee;
44
46
  &:hover {
45
47
  background: #d8d8d8;
46
- @include linear-gradient(color-stops(white, white, #dddddd));
48
+ background-image: linear-gradient(to bottom, #ffffff, #ffffff, #dddddd);
47
49
  color: #0076a3;
48
50
  @include button-shadow;
49
51
  }
@@ -55,7 +57,7 @@
55
57
  span.disabled {
56
58
  color: #666666;
57
59
  background-color: #999999;
58
- @include linear-gradient(color-stops(#888888, #999999, #999999, #999999));
60
+ background-image: linear-gradient(to bottom, #888888, #999999, #999999, #999999);
59
61
  }
60
62
  span.current {
61
63
  color: black;
@@ -95,13 +97,13 @@
95
97
  .action_button {
96
98
  display: inline;
97
99
  background: #d8d8d8;
98
- @include linear-gradient(color-stops(white, #cccccc));
100
+ background-image: linear-gradient(to bottom, #ffffff, #cccccc);
99
101
  color: #333333;
100
102
  font-size: 80%;
101
103
  padding: 8px 12px;
102
104
  text-decoration: none;
103
105
  text-shadow: 1px 1px 1px #eeeeee;
104
- @include border-radius(5px);
106
+ border-radius: 5px;
105
107
  @include button-shadow;
106
108
  &:hover {
107
109
  color: #0076a3;
@@ -2,11 +2,11 @@ img.avatar {
2
2
  background: white;
3
3
  border: none;
4
4
  padding: 4px;
5
- @include border-radius(3px);
6
- @include single-box-shadow(rgba(0, 0, 0, 0.25), 1px, 1px, 3px);
5
+ border-radius: 3px;
6
+ box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.25);
7
7
  &.avatar_32x32 {
8
8
  padding: 2px;
9
- @include border-radius(2px);
10
- @include single-box-shadow(rgba(0, 0, 0, 0.3), 1px, 1px, 2px);
9
+ border-radius: 2px;
10
+ box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3);
11
11
  }
12
12
  }
@@ -70,10 +70,10 @@ body.reversed {
70
70
  position: fixed;
71
71
  top: 10px;
72
72
  right: 20px;
73
- @include opacity(0.7);
73
+ opacity: 0.7;
74
74
  @include alt-box;
75
75
  &:hover {
76
- @include opaque;
76
+ opacity: 1;
77
77
  }
78
78
  a {
79
79
  @include alt-link;
@@ -5,15 +5,15 @@ input.date {
5
5
  }
6
6
 
7
7
  .calendar_popup {
8
- @include single-box-shadow;
9
- @include border-radius;
8
+ box-shadow: 0 5px #333;
9
+ border-radius: 5px;
10
10
  z-index: 1000;
11
11
  border: 1px solid #b2b2b2;
12
12
  background-color: white;
13
13
  padding: 5px;
14
14
  line-height: 140% !important;
15
15
  a {
16
- @include border-radius;
16
+ border-radius: 5px;
17
17
  }
18
18
  table.calendar {
19
19
  font-size: 90%;
@@ -37,7 +37,7 @@ input.date {
37
37
  padding: 3px !important;
38
38
  margin: 0;
39
39
  &.today {
40
- @include border-radius;
40
+ border-radius: 5px;
41
41
  background-color: #e5e5e5;
42
42
  }
43
43
  &.today a {
@@ -30,7 +30,7 @@ table.index td.note {
30
30
  // Use a div with a class of "popup_title" instead of an h3 with a class of "title"
31
31
  div.popup h3.title {
32
32
  background: #c5dff5;
33
- @include linear-gradient(color_stops(#e5f5ff, #c5dff5));
33
+ background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
34
34
  border-bottom: 1px solid #a7cdf0;
35
35
  font-size: 100%;
36
36
  margin: -10px -20px 20px -20px;
@@ -41,13 +41,13 @@ div.popup h3.title {
41
41
  #actions {
42
42
  a {
43
43
  background: #d8d8d8;
44
- @include linear-gradient(color-stops(white, #cccccc));
44
+ background-image: linear-gradient(to bottom, #ffffff, #cccccc);
45
45
  color: #333333;
46
46
  font-size: 80%;
47
47
  padding: 8px 12px;
48
48
  text-decoration: none;
49
49
  text-shadow: 1px 1px 1px #eeeeee;
50
- @include border-radius(5px);
50
+ border-radius: 5px;
51
51
  @include button-shadow;
52
52
  &:hover {
53
53
  color: #0076a3;
@@ -1,17 +1,19 @@
1
1
  .dropdown_wrapper {
2
2
  border: 1px solid #b3b3b3;
3
3
  border-top: 1px solid #c3c3c3;
4
- @include single-box-shadow(rgba(0, 0, 0, 0.35), 0px, 8px, 25px);
5
- @include border-top-right-radius;
6
- @include border-bottom-radius;
4
+ box-shadow: 0 8px 25px rgba(0, 0, 0, 0.35);
5
+ border-top-right-radius: 5px;
6
+ border-bottom-left-radius: 5px;
7
+ border-bottom-right-radius: 5px;
7
8
  }
8
9
 
9
10
  ul.menu {
10
11
  background: white;
11
12
  font-size: 80%;
12
13
  padding: 5px 20px;
13
- @include border-top-right-radius;
14
- @include border-bottom-radius;
14
+ border-top-right-radius: 5px;
15
+ border-bottom-left-radius: 5px;
16
+ border-bottom-right-radius: 5px;
15
17
  li {
16
18
  margin: 0 -20px;
17
19
  &.separator {
@@ -28,7 +30,7 @@ ul.menu {
28
30
  &:hover {
29
31
  background: #e0f0ff;
30
32
  border-top: 1px solid #d5f0ff;
31
- @include linear-gradient(color_stops(#e5f5ff, #b5d0f5));
33
+ background-image: linear-gradient(to bottom, #e5f5ff, #b5d0f5);
32
34
  }
33
35
  }
34
36
  }
@@ -60,7 +60,7 @@
60
60
  padding: 0.2em 0.5em 0.3em;
61
61
  text-decoration: none;
62
62
  text-shadow: 0px 0px 20px rgba(255, 255, 255, 0.1);
63
- @include border-radius(4px);
63
+ border-radius: 4px;
64
64
  &:hover {
65
65
  background-color: #555555;
66
66
  }
@@ -95,7 +95,7 @@
95
95
 
96
96
  .drawer_contents {
97
97
  background: #c9c9c9;
98
- @include border-bottom-right-radius(6px);
98
+ border-bottom-right-radius: 6px;
99
99
  margin: 0;
100
100
  margin-right: 2px;
101
101
  padding-bottom: 2px;
@@ -104,7 +104,7 @@
104
104
  content: "\0020";
105
105
  display: block;
106
106
  width: 100%;
107
- @include linear-gradient(color-stops(rgba(black, 0.3), rgba(black, 0)));
107
+ background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0));
108
108
  height: 3px;
109
109
  margin-bottom: -3px;
110
110
  }
@@ -167,7 +167,8 @@
167
167
  top: -1px;
168
168
  text-shadow: #666666 1px 1px 0;
169
169
  text-decoration: none;
170
- @include border-bottom-radius(6px);
170
+ border-bottom-left-radius: 6px;
171
+ border-bottom-right-radius: 6px;
171
172
  &:hover,
172
173
  &:active,
173
174
  &:focus {
@@ -189,16 +190,19 @@
189
190
  padding: 1px 15px 10px;
190
191
  position: relative;
191
192
  margin: 3px 0 20px;
192
- @include border-radius(8px);
193
- @include pie-clearfix;
193
+ border-radius: 8px;
194
+ &:after {
195
+ clear: both;
196
+ content: "";
197
+ display: block;
198
+ }
194
199
  * {
195
200
  position: relative;
196
201
  }
197
202
  &:before {
198
- @include linear-gradient(color-stops(white,
199
- #f5f1e2 50%,
200
- #f5f1e2));
201
- @include border-top-radius(10px);
203
+ background-image: linear-gradient(to bottom, #ffffff, #f5f1e2 50%, #f5f1e2);
204
+ border-top-left-radius: 10px;
205
+ border-top-right-radius: 10px;
202
206
  content: "\0020";
203
207
  display: block;
204
208
  position: absolute;
@@ -298,11 +302,8 @@ body.reversed {
298
302
  padding: 20px 15px;
299
303
  margin-bottom: 20px;
300
304
  overflow: hidden;
301
- @include single-box-shadow(#ababab,
302
- 1px,
303
- 1px,
304
- 0);
305
- @include border-radius(8px);
305
+ box-shadow: 1px 1px 0 #ababab;
306
+ border-radius: 8px;
306
307
  h3 {
307
308
  font-weight: bold;
308
309
  font-size: 120%;
@@ -333,13 +334,7 @@ body.reversed {
333
334
  border-radius: 5px;
334
335
  }
335
336
  .box {
336
- @include single-box-shadow(rgba(0,
337
- 0,
338
- 0,
339
- 0.15),
340
- 2px,
341
- 2px,
342
- 3px);
337
+ box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);
343
338
  }
344
339
  }
345
340
  }
@@ -348,15 +343,13 @@ body.single_form {
348
343
  #content {
349
344
  #single_form {
350
345
  background: #f5f1e2;
351
- @include linear-gradient(color-stops(#fdfcf9,
352
- #f5f1e2 25%,
353
- #f5f1e2));
346
+ background-image: linear-gradient(to bottom, #fdfcf9, #f5f1e2 25%, #f5f1e2);
354
347
  border: 0.35em solid #efead3;
355
348
  padding: 0.5em 1.5em;
356
349
  padding-right: 22px;
357
350
  position: relative;
358
351
  width: 28em;
359
- @include border-radius(6px);
352
+ border-radius: 6px;
360
353
  h1 {
361
354
  font-size: 140%;
362
355
  margin: 0.75em 0 1.25em;
@@ -484,4 +477,4 @@ input[type=file] {
484
477
  -ms-transition: all .2s;
485
478
  -o-transition: all .2s;
486
479
  transition: all .2s;
487
- }
480
+ }
@@ -1,7 +1,7 @@
1
1
  #header {
2
2
  font-size: 90%;
3
3
  background: $header;
4
- @include linear-gradient(color-stops(darken($header, 12), $header, $header));
4
+ background-image: linear-gradient(to bottom, #000000, #000000, #000000);
5
5
  position: relative;
6
6
  &:after {
7
7
  content: "\0020";
@@ -11,7 +11,7 @@
11
11
  height: 2px;
12
12
  width: 100%;
13
13
  position: absolute;
14
- @include linear-gradient(color-stops(rgba(black, 0.3), rgba(black, 0)));
14
+ background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0));
15
15
  }
16
16
  }
17
17
 
@@ -32,7 +32,7 @@
32
32
  #view_site {
33
33
  font-size: 90%;
34
34
  background: rgba(black, 0.45);
35
- @include border-radius;
35
+ border-radius: 5px;
36
36
  display: inline;
37
37
  padding: 3px 10px 4px;
38
38
  text-decoration: none;
@@ -55,7 +55,8 @@ ul#navigation {
55
55
  padding: 0 20px;
56
56
  position: relative;
57
57
  text-decoration: none;
58
- @include border-top-radius(6px);
58
+ border-top-left-radius: 6px;
59
+ border-top-right-radius: 6px;
59
60
  }
60
61
  &:hover a {
61
62
  background: opacify($primary-tab, 0.2);
@@ -71,13 +72,17 @@ ul#navigation {
71
72
 
72
73
  #toolbar {
73
74
  background: white;
74
- @include linear-gradient(color-stops(white, darken(white, 5%), darken(white, 20%)));
75
+ background-image: linear-gradient(to bottom, #ffffff, #f2f2f2, #cccccc);
75
76
  font-size: 95%;
76
77
  clear: both;
77
78
  margin: 0;
78
79
  width: 100%;
79
80
  height: 38px;
80
- @include pie-clearfix;
81
+ &:after {
82
+ clear: both;
83
+ content: "";
84
+ display: block;
85
+ }
81
86
  .right {
82
87
  float: right;
83
88
  }
@@ -85,13 +90,13 @@ ul#navigation {
85
90
  padding: 8px 8px 0;
86
91
  input[type=search] {
87
92
  font-size: 12px;
88
- @include border-radius(100px);
93
+ border-radius: 100px;
89
94
  border: 1px solid #cccccc;
90
95
  border-top-color: #999999;
91
96
  border-left-color: #b0b0b0;
92
97
  border-right-color: #bbbbbb;
93
98
  background: white image_url("admin/search.png") 4px center no-repeat;
94
- @include single-box-shadow(rgba(black, 0.2), 0, 1px, 0, inset);
99
+ box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2);
95
100
  width: 180px;
96
101
  padding: 2px 8px 2px 20px;
97
102
  }
@@ -116,16 +121,16 @@ ul#secondary_navigation {
116
121
  height: 38px;
117
122
  text-decoration: none;
118
123
  &:hover {
119
- @include linear-gradient(color-stops(#e4f9ff, #d2ebfd 30%, #b1d1f1 50%, #9bc5ed 50%, #caecff));
124
+ background-image: linear-gradient(to bottom, #e4f9ff, #d2ebfd 30%, #b1d1f1 50%, #9bc5ed 50%, #caecff);
120
125
  color: #444444;
121
126
  }
122
127
  &.current {
123
128
  background: #dddddd;
124
- @include linear-gradient(color-stops(white, darken(white, 10%) 35%, darken(white, 15%) 50%, darken(white, 20%) 50%, darken(white, 15%)));
129
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6 35%, #d9d9d9 50%, #cccccc 50%, #d9d9d9);
125
130
  color: #333333;
126
131
  font-weight: bold;
127
132
  &:hover {
128
- @include linear-gradient(color-stops(#e0f9fe, #c4e2f8 30%, #98c3e7 50%, #79aedb 50%, #b1ddef));
133
+ background-image: linear-gradient(to bottom, #e0f9fe, #c4e2f8 30%, #98c3e7 50%, #79aedb 50%, #b1ddef);
129
134
  color: #222222;
130
135
  }
131
136
  }
@@ -5,7 +5,7 @@
5
5
  padding: 0 6px;
6
6
  width: $width;
7
7
  text-align: center;
8
- @include border-radius(100px);
8
+ border-radius: 100px;
9
9
  }
10
10
 
11
11
  table.index {
@@ -48,18 +48,20 @@ table.index {
48
48
  text-decoration: none;
49
49
  &:hover {
50
50
  background: #d8d8d8;
51
- @include linear-gradient(color-stops(white, #cccccc));
51
+ background-image: linear-gradient(to bottom, #ffffff, #cccccc);
52
52
  border: 1px solid #a5c9df;
53
53
  margin: 0 24px 0 0;
54
- @include border-radius;
54
+ border-radius: 5px;
55
55
  }
56
56
  &.selected {
57
57
  background: #c5e0f5;
58
- @include linear-gradient(color_stops(#e5f5ff, #c5e0ff));
58
+ background-image: linear-gradient(to bottom, #e5f5ff, #c5e0ff);
59
59
  border: 1px solid #a5c9df;
60
60
  margin: 0 24px 0 0;
61
- @include border-top-radius;
62
- @include border-bottom-radius(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;
63
65
  }
64
66
  }
65
67
  span.action.disabled {
@@ -102,7 +104,7 @@ table.index {
102
104
  border-top: 1px solid #d5f0ff;
103
105
  border-bottom: 1px solid #c5dff5;
104
106
  background: #c5dff5;
105
- @include linear-gradient(color_stops(#e5f5ff, #c5dff5));
107
+ background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
106
108
  }
107
109
  }
108
110
  }
@@ -198,4 +200,4 @@ table.index#users {
198
200
  font-weight: normal;
199
201
  }
200
202
  }
201
- }
203
+ }