trusty-multi-site-extension 2.0.1.pre.beta → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- N2NmZTgwZWQ2NWE3MmIzOWY1MjVjZGYwNjZmOGY3MWZiMTIzMzRkNg==
5
- data.tar.gz: !binary |-
6
- YjgwNTlmMGNhMDkyZjgzMDc2ZTIwNmMzNjMzZjRmNGE0MWRhODczNA==
2
+ SHA1:
3
+ metadata.gz: 371ce42626ee642f61e9fd3bbef47e13f4d325aa
4
+ data.tar.gz: 90d7d0adb6332de60bf5987f14c6899c913e8a66
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- MzE4MWUyYTEwMWQ5MjVhZjQ4YjFhOWNiNjk4YmI5NGI1YzNkMjA0YWY3Mzgw
10
- ZjUyZjhkZDEwMDVlOTU1YTgyMjFmMjBkZjQwYjc4Njc0YTk4NzFlN2MyOGVk
11
- YjIxMGM4ODEyMDUwYzRmODEwYWI0NzA2NDFkZGVmMWMzMDgzMzA=
12
- data.tar.gz: !binary |-
13
- MTE4OTM5NDUwZmM2NWI5ODc2Y2ViNGEyMmEwNGY3M2NhMGQwYzc4M2U1MmJk
14
- ZWFhOWE4YjhjYzBkZjAyODBmYWQ2MmEyYjljZDMxNGJmM2RmYjUzNGYxOTlh
15
- MGQxZGJjMDUyZjgxYmRhMzNkYmQyZWI5NmRhODhlMzc4NTE2MTg=
6
+ metadata.gz: f25b7a73307a1fb7ffdd16485893b1e817367cebf62abe5d024280f5820955f5ea5ab41554ff39a2546854e202699a4c8d460802b028aeed16bf35a1bb5a392c
7
+ data.tar.gz: f92434f7213aed5a146e9f7f6b9e33d70418d8bfb2e30085b5d206d4c73e5c90418e0bc19fa6150f5613a227b40cfd4c73ecad72e536f8f351e8ed711c6ff57b
data/Gemfile CHANGED
@@ -1,2 +1,49 @@
1
1
  source 'https://rubygems.org'
2
- gem 'trustygems', '~> 0.1.0'
2
+
3
+ # This is the minimum of dependency required to run
4
+ # the trusty-cms instance generator, which is (normally)
5
+ # the only time the trusty gem functions as an
6
+ # application. The instance has its own Gemfile, which
7
+ # requires radiant and therefore pulls in every
8
+ # dependency mentioned in radiant.gemspec.
9
+
10
+ gem 'trustygems', '~> 0.2.0'
11
+
12
+ gemspec
13
+
14
+ # When trusty is installed as a gem you can run all of
15
+ # its tests and specs from an instance. If you're working
16
+ # on trusty itself and you want to run specs from the
17
+ # radiant root directory, uncomment the lines below and
18
+ # run `bundle install`.
19
+
20
+ # gemspec
21
+ # gem "compass-rails", "~> 1.0.3"
22
+
23
+ # gem "radiant-archive-extension", "~> 1.0.7"
24
+ # gem "radiant-clipped-extension", "~> 1.1.0"
25
+ # gem "radiant-debug-extension", "~> 1.0.2"
26
+ # gem "radiant-exporter-extension", "~> 1.1.0"
27
+ # gem "radiant-markdown_filter-extension", "~> 1.0.2"
28
+ # gem "radiant-sheets-extension", "~> 1.1.0.alpha"
29
+ # gem "radiant-snippets-extension", "~> 1.1.0.alpha"
30
+ # gem "radiant-site_templates-extension", "~> 1.0.4"
31
+ # gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
32
+ # gem "radiant-textile_filter-extension", "~> 1.0.4"
33
+
34
+
35
+ group :development, :test do
36
+ gem "compass-rails", "~> 2.0.1"
37
+ gem 'thin', '~> 1.6.2'
38
+ gem 'pry', '~> 0.10.0'
39
+ gem 'capybara', '~> 2.3.0'
40
+ gem 'rspec-rails', '~> 3.0.0'
41
+ gem 'launchy', '~> 2.4.2'
42
+ gem 'database_cleaner', '~> 1.3.0'
43
+ gem 'poltergeist', '~> 1.5.1'
44
+ gem "ckeditor", "~> 4.1.0"
45
+ gem 'factory_girl_rails', '~> 4.5.0'
46
+ gem 'rails-observers'
47
+ gem "protected_attributes"
48
+ gem "pry-byebug"
49
+ end
@@ -1,12 +1,300 @@
1
+ PATH
2
+ remote: .
3
+ specs:
4
+ trusty-multi-site-extension (2.0.2)
5
+ acts_as_list (= 0.4.0)
6
+ trusty-cms (~> 2.0.0.pre.beta)
7
+ trusty-snippets-extension (~> 2.0.0.pre.beta)
8
+
1
9
  GEM
2
10
  remote: https://rubygems.org/
3
11
  specs:
12
+ RedCloth (4.2.9)
13
+ actionmailer (4.2.3)
14
+ actionpack (= 4.2.3)
15
+ actionview (= 4.2.3)
16
+ activejob (= 4.2.3)
17
+ mail (~> 2.5, >= 2.5.4)
18
+ rails-dom-testing (~> 1.0, >= 1.0.5)
19
+ actionpack (4.2.3)
20
+ actionview (= 4.2.3)
21
+ activesupport (= 4.2.3)
22
+ rack (~> 1.6)
23
+ rack-test (~> 0.6.2)
24
+ rails-dom-testing (~> 1.0, >= 1.0.5)
25
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
26
+ actionview (4.2.3)
27
+ activesupport (= 4.2.3)
28
+ builder (~> 3.1)
29
+ erubis (~> 2.7.0)
30
+ rails-dom-testing (~> 1.0, >= 1.0.5)
31
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
32
+ activejob (4.2.3)
33
+ activesupport (= 4.2.3)
34
+ globalid (>= 0.3.0)
35
+ activemodel (4.2.3)
36
+ activesupport (= 4.2.3)
37
+ builder (~> 3.1)
38
+ activerecord (4.2.3)
39
+ activemodel (= 4.2.3)
40
+ activesupport (= 4.2.3)
41
+ arel (~> 6.0)
42
+ activesupport (4.2.3)
43
+ i18n (~> 0.7)
44
+ json (~> 1.7, >= 1.7.7)
45
+ minitest (~> 5.1)
46
+ thread_safe (~> 0.3, >= 0.3.4)
47
+ tzinfo (~> 1.1)
48
+ acts_as_list (0.4.0)
49
+ activerecord (>= 3.0)
50
+ acts_as_tree (2.2.0)
51
+ activerecord (>= 3.0.0)
52
+ addressable (2.3.8)
53
+ arel (6.0.3)
54
+ builder (3.2.2)
55
+ byebug (5.0.0)
56
+ columnize (= 0.9.0)
57
+ capybara (2.3.0)
58
+ mime-types (>= 1.16)
59
+ nokogiri (>= 1.3.3)
60
+ rack (>= 1.0.0)
61
+ rack-test (>= 0.5.4)
62
+ xpath (~> 2.0)
63
+ chunky_png (1.3.4)
64
+ ckeditor (4.1.3)
65
+ cocaine
66
+ orm_adapter (~> 0.5.0)
67
+ climate_control (0.0.3)
68
+ activesupport (>= 3.0)
69
+ cliver (0.3.2)
70
+ cocaine (0.5.7)
71
+ climate_control (>= 0.0.3, < 1.0)
72
+ coderay (1.1.0)
73
+ columnize (0.9.0)
74
+ compass (1.0.3)
75
+ chunky_png (~> 1.2)
76
+ compass-core (~> 1.0.2)
77
+ compass-import-once (~> 1.0.5)
78
+ rb-fsevent (>= 0.9.3)
79
+ rb-inotify (>= 0.9)
80
+ sass (>= 3.3.13, < 3.5)
81
+ compass-core (1.0.3)
82
+ multi_json (~> 1.0)
83
+ sass (>= 3.3.0, < 3.5)
84
+ compass-import-once (1.0.5)
85
+ sass (>= 3.2, < 3.5)
86
+ compass-rails (2.0.3)
87
+ compass (~> 1.0.0)
88
+ sass-rails (<= 5.0.1)
89
+ sprockets (< 2.13)
90
+ daemons (1.2.3)
91
+ database_cleaner (1.3.0)
92
+ delocalize (0.4.0)
93
+ rails (>= 3.0)
94
+ diff-lcs (1.2.5)
95
+ erubis (2.7.0)
96
+ eventmachine (1.0.8)
97
+ execjs (2.5.2)
98
+ factory_girl (4.5.0)
99
+ activesupport (>= 3.0.0)
100
+ factory_girl_rails (4.5.0)
101
+ factory_girl (~> 4.5.0)
102
+ railties (>= 3.0.0)
103
+ ffi (1.9.10)
104
+ globalid (0.3.6)
105
+ activesupport (>= 4.1.0)
106
+ haml (4.0.7)
107
+ tilt
108
+ haml-rails (0.9.0)
109
+ actionpack (>= 4.0.1)
110
+ activesupport (>= 4.0.1)
111
+ haml (>= 4.0.6, < 5.0)
112
+ html2haml (>= 1.0.1)
113
+ railties (>= 4.0.1)
114
+ highline (1.7.3)
115
+ hike (1.2.3)
116
+ html2haml (2.0.0)
117
+ erubis (~> 2.7.0)
118
+ haml (~> 4.0.0)
119
+ nokogiri (~> 1.6.0)
120
+ ruby_parser (~> 3.5)
121
+ i18n (0.7.0)
122
+ jquery-rails (3.1.3)
123
+ railties (>= 3.0, < 5.0)
124
+ thor (>= 0.14, < 2.0)
125
+ json (1.8.3)
126
+ launchy (2.4.3)
127
+ addressable (~> 2.3)
128
+ libv8 (3.16.14.11)
129
+ loofah (2.0.2)
130
+ nokogiri (>= 1.5.9)
131
+ mail (2.6.3)
132
+ mime-types (>= 1.16, < 3)
133
+ method_source (0.8.2)
134
+ mime-types (2.6.1)
135
+ mini_portile (0.6.2)
136
+ minitest (5.8.0)
137
+ multi_json (1.11.2)
138
+ mysql (2.9.1)
139
+ nokogiri (1.6.6.2)
140
+ mini_portile (~> 0.6.0)
141
+ orm_adapter (0.5.0)
142
+ poltergeist (1.5.1)
143
+ capybara (~> 2.1)
144
+ cliver (~> 0.3.1)
145
+ multi_json (~> 1.0)
146
+ websocket-driver (>= 0.2.0)
147
+ protected_attributes (1.0.9)
148
+ activemodel (>= 4.0.1, < 5.0)
149
+ pry (0.10.1)
150
+ coderay (~> 1.1.0)
151
+ method_source (~> 0.8.1)
152
+ slop (~> 3.4)
153
+ pry-byebug (3.2.0)
154
+ byebug (~> 5.0)
155
+ pry (~> 0.10)
156
+ rack (1.6.4)
157
+ rack-cache (1.2)
158
+ rack (>= 0.4)
159
+ rack-test (0.6.3)
160
+ rack (>= 1.0)
161
+ radius (0.7.4)
162
+ rails (4.2.3)
163
+ actionmailer (= 4.2.3)
164
+ actionpack (= 4.2.3)
165
+ actionview (= 4.2.3)
166
+ activejob (= 4.2.3)
167
+ activemodel (= 4.2.3)
168
+ activerecord (= 4.2.3)
169
+ activesupport (= 4.2.3)
170
+ bundler (>= 1.3.0, < 2.0)
171
+ railties (= 4.2.3)
172
+ sprockets-rails
173
+ rails-deprecated_sanitizer (1.0.3)
174
+ activesupport (>= 4.2.0.alpha)
175
+ rails-dom-testing (1.0.6)
176
+ activesupport (>= 4.2.0.beta, < 5.0)
177
+ nokogiri (~> 1.6.0)
178
+ rails-deprecated_sanitizer (>= 1.0.1)
179
+ rails-html-sanitizer (1.0.2)
180
+ loofah (~> 2.0)
181
+ rails-observers (0.1.2)
182
+ activemodel (~> 4.0)
183
+ railties (4.2.3)
184
+ actionpack (= 4.2.3)
185
+ activesupport (= 4.2.3)
186
+ rake (>= 0.8.7)
187
+ thor (>= 0.18.1, < 2.0)
4
188
  rake (10.4.2)
5
- trustygems (0.1.0)
189
+ rb-fsevent (0.9.5)
190
+ rb-inotify (0.9.5)
191
+ ffi (>= 0.5.0)
192
+ rdoc (3.12.2)
193
+ json (~> 1.4)
194
+ ref (2.0.0)
195
+ rspec-core (3.0.4)
196
+ rspec-support (~> 3.0.0)
197
+ rspec-expectations (3.0.4)
198
+ diff-lcs (>= 1.2.0, < 2.0)
199
+ rspec-support (~> 3.0.0)
200
+ rspec-mocks (3.0.4)
201
+ rspec-support (~> 3.0.0)
202
+ rspec-rails (3.0.2)
203
+ actionpack (>= 3.0)
204
+ activesupport (>= 3.0)
205
+ railties (>= 3.0)
206
+ rspec-core (~> 3.0.0)
207
+ rspec-expectations (~> 3.0.0)
208
+ rspec-mocks (~> 3.0.0)
209
+ rspec-support (~> 3.0.0)
210
+ rspec-support (3.0.4)
211
+ ruby_parser (3.7.1)
212
+ sexp_processor (~> 4.1)
213
+ sass (3.4.16)
214
+ sass-rails (5.0.1)
215
+ railties (>= 4.0.0, < 5.0)
216
+ sass (~> 3.1)
217
+ sprockets (>= 2.8, < 4.0)
218
+ sprockets-rails (>= 2.0, < 4.0)
219
+ tilt (~> 1.1)
220
+ sexp_processor (4.6.0)
221
+ slop (3.6.0)
222
+ sprockets (2.12.4)
223
+ hike (~> 1.2)
224
+ multi_json (~> 1.0)
225
+ rack (~> 1.0)
226
+ tilt (~> 1.1, != 1.3.0)
227
+ sprockets-rails (2.3.2)
228
+ actionpack (>= 3.0)
229
+ activesupport (>= 3.0)
230
+ sprockets (>= 2.8, < 4.0)
231
+ stringex (1.5.1)
232
+ therubyracer (0.12.2)
233
+ libv8 (~> 3.16.14.0)
234
+ ref
235
+ thin (1.6.3)
236
+ daemons (~> 1.0, >= 1.0.9)
237
+ eventmachine (~> 1.0)
238
+ rack (~> 1.0)
239
+ thor (0.19.1)
240
+ thread_safe (0.3.5)
241
+ tilt (1.4.1)
242
+ trusty-cms (2.0.11)
243
+ RedCloth (~> 4.2)
244
+ acts_as_tree (~> 2.1)
245
+ bundler (~> 1.7)
246
+ ckeditor (~> 4.1)
247
+ compass-rails (~> 2.0)
248
+ delocalize (~> 0.2)
249
+ execjs (~> 2.2)
250
+ haml (~> 4.0)
251
+ haml-rails (~> 0.5)
252
+ highline (~> 1.6)
253
+ jquery-rails (~> 3.1)
254
+ mysql (~> 2.9)
255
+ protected_attributes (~> 1.0.9)
256
+ rack (~> 1.4)
257
+ rack-cache (~> 1.2)
258
+ radius (~> 0.7)
259
+ rails (~> 4.2)
260
+ rdoc (~> 3.9)
261
+ stringex (~> 1.3)
262
+ therubyracer (~> 0.12)
263
+ tzinfo (~> 1.2)
264
+ uglifier (~> 2.6)
265
+ will_paginate (~> 3.0)
266
+ trusty-snippets-extension (2.0.3)
267
+ trusty-cms (~> 2.0.0.pre.beta)
268
+ trustygems (0.2.1)
6
269
  rake
270
+ tzinfo (1.2.2)
271
+ thread_safe (~> 0.1)
272
+ uglifier (2.7.1)
273
+ execjs (>= 0.3.0)
274
+ json (>= 1.8.0)
275
+ websocket-driver (0.6.2)
276
+ websocket-extensions (>= 0.1.0)
277
+ websocket-extensions (0.1.2)
278
+ will_paginate (3.0.7)
279
+ xpath (2.0.0)
280
+ nokogiri (~> 1.3)
7
281
 
8
282
  PLATFORMS
9
283
  ruby
10
284
 
11
285
  DEPENDENCIES
12
- trustygems (~> 0.1.0)
286
+ capybara (~> 2.3.0)
287
+ ckeditor (~> 4.1.0)
288
+ compass-rails (~> 2.0.1)
289
+ database_cleaner (~> 1.3.0)
290
+ factory_girl_rails (~> 4.5.0)
291
+ launchy (~> 2.4.2)
292
+ poltergeist (~> 1.5.1)
293
+ protected_attributes
294
+ pry (~> 0.10.0)
295
+ pry-byebug
296
+ rails-observers
297
+ rspec-rails (~> 3.0.0)
298
+ thin (~> 1.6.2)
299
+ trusty-multi-site-extension!
300
+ trustygems (~> 0.2.0)
@@ -1,52 +1,85 @@
1
- #content table.index tr.node td {
2
- padding: .5em;
3
- }
4
-
5
- #content table.index .node .site small {
6
- color: #666;
7
- font-size: 90%;
8
- font-style: italic;
9
- font-weight: normal;
10
- margin-left: .5em;
11
- }
1
+ //fonts
2
+ $font_0: Georgia;
3
+ $font_1: Palatino;
4
+ $font_2: Times New Roman;
5
+ $font_3: Times;
6
+ $font_4: serif;
12
7
 
13
- #content table.index .node .site a, #content table.index .node .site a:visited {
14
- font-size: 115%;
15
- font-weight: bold;
16
- color: black;
17
- text-decoration: none;
8
+ #content {
9
+ table.index {
10
+ tr.node {
11
+ td {
12
+ padding: .5em;
13
+ }
14
+ }
15
+ &.node {
16
+ &.site {
17
+ small {
18
+ color: #666;
19
+ font-size: 90%;
20
+ font-style: italic;
21
+ font-weight: normal;
22
+ margin-left: .5em;
23
+ }
24
+ a {
25
+ &:visited {
26
+ font-size: 115%;
27
+ font-weight: bold;
28
+ color: black;
29
+ text-decoration: none;
30
+ }
31
+ }
32
+ }
33
+ }
34
+ }
35
+ .form-area {
36
+ p {
37
+ &.domain {
38
+ float: left;
39
+ width: 40%;
40
+ margin: 1em 1em 0 0;
41
+ overflow: hidden;
42
+ label {
43
+
44
+ }
45
+ }
46
+ &.subtitle {
47
+ margin: 1em 0 0 0;
48
+ }
49
+ }
50
+ }
18
51
  }
19
52
 
20
- #content .form-area p.domain {
21
- float: left;
22
- width: 40%;
23
- margin: 1em 1em 0 0;
24
- overflow: hidden;
25
- }
26
-
27
- #content .form-area p.subtitle {
28
- margin: 1em 0 0 0;
29
- }
30
53
 
31
- #content .form-area p.domain label, #content .form-area p.homepage label {
32
- display: block;
33
- position: relative;
54
+ #content {
55
+ div.form-area p.homepage {
56
+ float: right;
57
+ width: 16%;
58
+ margin: 1em 0 0;
59
+ overflow: hidden;
60
+ }
61
+ .form-area p {
62
+ &.domain label {
63
+ display: block;
64
+ position: relative;
65
+ }
66
+ &.homepage label {
67
+ display: block;
68
+ position: relative;
69
+ }
70
+ }
34
71
  }
35
-
36
- #content div.form-area p.domain .textbox, #content div.form-area p.homepage .textbox, #content div.form-area p.subtitle .textbox, #content div.form-area p.subtitle select {
37
- font-family: Georgia,Palatino,"Times New Roman",Times,serif;
38
- font-size: 140%;
39
- width: 100%;
72
+ p.formnote {
73
+ clear: both;
74
+ padding: 2em 0;
40
75
  }
41
76
 
42
- #content div.form-area p.homepage {
43
- float: right;
44
- width: 16%;
45
- margin: 1em 0 0 0;
46
- overflow: hidden;
47
- }
48
77
 
49
- p.formnote {
50
- clear: both;
51
- padding: 2em 0;
52
- }
78
+ //@extend-elements
79
+ //original selectors
80
+ //#content div.form-area p.domain .textbox, #content div.form-area p.homepage .textbox, #content div.form-area p.subtitle .textbox, #content div.form-area p.subtitle select
81
+ %extend_1 {
82
+ font-family: $font_0, $font_1, $font_2, $font_3, $font_4;
83
+ font-size: 140%;
84
+ width: 100%;
85
+ }
@@ -1,96 +1,76 @@
1
- #site_chooser{
2
- width: 20%;
3
- border-collapse: collapse;
4
- float: right;
5
- }
6
-
7
-
8
- /* BE SURE TO INCLUDE THE CSS RESET FOUND IN THE DEMO PAGE'S CSS */
9
- /*------------------------------------*\
10
- NAV
11
- \*------------------------------------*/
12
- #nav{
13
- list-style:none;
14
- font-weight:bold;
15
- margin-bottom:10px;
16
- /* Clear floats */
17
- width:100%;
18
- padding-top: 10px;
19
- padding-bottom: 10px;
20
- padding-left: 5px;
21
- margin: 0px;
22
- cursor: pointer;
23
- /* Bring the nav above everything else--uncomment if needed.
24
- position:relative;
25
- z-index:5;
26
- */
27
- }
28
- #nav li{
29
- margin-right:10px;
30
- position:relative;
31
- color: #66d9e0;
32
- }
33
- #nav a{
34
- display:block;
35
- padding:5px;
36
- color:#fff;
37
- background:#000;
38
- text-decoration:none;
39
- }
40
- #nav a:hover{
41
- color:#fff;
42
- background:#000;
43
- text-decoration:underline;
44
- }
45
-
46
- /*--- DROPDOWN ---*/
1
+ //colors
2
+ $color_turquoise_blue_approx: #66d9e0;
3
+ $white: #fff;
4
+ $black: #000;
47
5
 
48
- #nav ul{
49
- background:#fff; /* Adding a background makes the dropdown work properly in IE7+. Make this as close to your page's background as possible (i.e. white page == white background). */
50
- background:rgba(255,255,255,0); /* But! Let's make the background fully transparent where we can, we don't actually want to see it if we can help it... */
51
- list-style:none;
52
- position:absolute;
53
- /*left:-9999px;*/ /* Hide off-screen when not needed (this is more accessible than display:none;) */
54
- margin-top:10px;
55
- visibility: hidden;
56
- opacity: 0;
57
- -webkit-transition: opacity 0.2s;
58
- -moz-transition: opacity 0.2s;
59
- -ms-transition: opacity 0.2s;
60
- -o-transition: opacity 0.2s;
61
- transition: opacity 0.2s;
62
-
63
- }
64
- #nav ul li{
65
- float:none;
66
- }
67
- #nav ul a{
68
- white-space:nowrap; /* Stop text wrapping and creating multi-line dropdown items */
69
- }
70
- #nav:hover ul{ /* Display the dropdown on hover */
71
- visibility: visible;
72
- opacity: 1;
73
- -webkit-transition: opacity 0.2s;
74
- -moz-transition: opacity 0.2s;
75
- -ms-transition: opacity 0.2s;
76
- -o-transition: opacity 0.2s;
77
- transition: opacity 0.2s;
78
- /*left:0;*/ /* Bring back on-screen when needed */
79
- z-index: 99999;
80
-
81
- }
82
- #nav li:hover a{ /* These create persistent hover states, meaning the top-most link stays 'hovered' even when your cursor has moved down the list. */
83
- background:#000;
84
- text-decoration:underline;
85
- }
86
- #nav li:hover ul a{ /* The persistent hover state does however create a global style for links even before they're hovered. Here we undo these effects. */
87
- text-decoration:none;
6
+ #site_chooser {
7
+ width: 20%;
8
+ border-collapse: collapse;
9
+ float: right;
88
10
  }
89
- #nav a.site-link:hover { /* Here we define the most explicit hover states--what happens when you hover each individual link. */
90
- color: #66d9e0;
91
- -webkit-transition: all 0.2s;
92
- -moz-transition: all 0.2s;
93
- -ms-transition: all 0.2s;
94
- -o-transition: all 0.2s;
95
- transition: all 0.2s;
11
+ #nav {
12
+ list-style: none;
13
+ font-weight: bold;
14
+ margin-bottom: 10px;
15
+ width: 100%;
16
+ padding-top: 10px;
17
+ padding-bottom: 10px;
18
+ padding-left: 5px;
19
+ margin: 0;
20
+ cursor: pointer;
21
+ li {
22
+ margin-right: 10px;
23
+ position: relative;
24
+ color: $color_turquoise_blue_approx;
25
+ &:hover {
26
+ a {
27
+ background: $black;
28
+ text-decoration: underline;
29
+ }
30
+ ul a {
31
+ text-decoration: none;
32
+ }
33
+ }
34
+ }
35
+ a {
36
+ display: block;
37
+ padding: 5px;
38
+ color: $white;
39
+ background: $black;
40
+ text-decoration: none;
41
+ &:hover {
42
+ color: $white;
43
+ background: $black;
44
+ text-decoration: underline;
45
+ }
46
+ &.site-link:hover {
47
+ color: $color_turquoise_blue_approx;
48
+ //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
49
+ transition: all 0.2s;
50
+ }
51
+ }
52
+ ul {
53
+ background: $white;
54
+ background: rgba(255,255,255,0);
55
+ list-style: none;
56
+ position: absolute;
57
+ margin-top: 10px;
58
+ visibility: hidden;
59
+ opacity: 0;
60
+ //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
61
+ transition: opacity 0.2s;
62
+ li {
63
+ float: none;
64
+ }
65
+ a {
66
+ white-space: nowrap;
67
+ }
68
+ }
69
+ &:hover ul {
70
+ visibility: visible;
71
+ opacity: 1;
72
+ //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
73
+ transition: opacity 0.2s;
74
+ z-index: 99999;
75
+ }
96
76
  }
@@ -1,4 +1,8 @@
1
1
  require 'multi_site/engine'
2
+
3
+ Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper
4
+ Admin::SnippetsController.send :helper, MultiSite::SiteChooserHelper
5
+
2
6
  TrustyCms.config do |config|
3
7
  # config.define "setting.name", :default => 'value', :select_from => ['foo', 'bar']
4
8
  require 'multi_site/scoped_validation'
@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "trusty-multi-site-extension"
7
- s.version = "2.0.1-beta"
7
+ s.version = "2.0.2"
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
10
10
  s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-multi-site-extension
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1.pre.beta
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-08-03 00:00:00.000000000 Z
13
+ date: 2015-08-13 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: acts_as_list
@@ -30,28 +30,28 @@ dependencies:
30
30
  name: trusty-snippets-extension
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
- - - ~>
33
+ - - "~>"
34
34
  - !ruby/object:Gem::Version
35
35
  version: 2.0.0.pre.beta
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
- - - ~>
40
+ - - "~>"
41
41
  - !ruby/object:Gem::Version
42
42
  version: 2.0.0.pre.beta
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: trusty-cms
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
- - - ~>
47
+ - - "~>"
48
48
  - !ruby/object:Gem::Version
49
49
  version: 2.0.0.pre.beta
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
- - - ~>
54
+ - - "~>"
55
55
  - !ruby/object:Gem::Version
56
56
  version: 2.0.0.pre.beta
57
57
  description: Extends Trusty CMS Layouts to support multiple sites, defined by domain
@@ -135,17 +135,17 @@ require_paths:
135
135
  - lib
136
136
  required_ruby_version: !ruby/object:Gem::Requirement
137
137
  requirements:
138
- - - ! '>='
138
+ - - ">="
139
139
  - !ruby/object:Gem::Version
140
140
  version: '0'
141
141
  required_rubygems_version: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ! '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  requirements: []
147
147
  rubyforge_project:
148
- rubygems_version: 2.4.5
148
+ rubygems_version: 2.4.3
149
149
  signing_key:
150
150
  specification_version: 4
151
151
  summary: Extends Trusty CMS Layouts to support multiple sites, defined by domain