magic_stylez 0.0.0.66 → 0.0.0.67

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 (30) hide show
  1. checksums.yaml +4 -4
  2. data/lib/magic_stylez/version.rb +1 -1
  3. data/test/dummy/app/assets/javascripts/app.js.coffee +60 -0
  4. data/test/dummy/app/assets/javascripts/application.js +2 -0
  5. data/test/dummy/app/assets/javascripts/views/app/start.jst.eco +30 -1
  6. data/test/dummy/app/assets/javascripts/views/layout/at_first.jst.eco +61 -0
  7. data/test/dummy/app/assets/javascripts/views/layout/fullpage_table.jst.eco +9 -0
  8. data/test/dummy/app/assets/javascripts/views/layout/section.jst.eco +37 -8
  9. data/test/dummy/app/assets/javascripts/views/templates/aside-nav.jst.eco +1 -1
  10. data/test/dummy/app/assets/stylesheets/application.css.scss +50 -7
  11. data/test/dummy/app/assets/stylesheets/corporate/_variables.scss +16 -0
  12. data/test/dummy/app/views/front/_aside.html.erb +1 -1
  13. data/test/dummy/app/views/front/start.html.erb +31 -1
  14. data/test/dummy/public/html/aside-nav.html +2 -2
  15. data/test/dummy/public/html/fixed-header.html +2 -2
  16. data/test/dummy/public/html/fixed-subnav.html +2 -2
  17. data/test/dummy/public/html/index.html +35 -4
  18. data/test/dummy/public/html/slidebar-header.html +2 -2
  19. data/test/dummy/public/html/slidebar-subnav.html +2 -2
  20. data/vendor/assets/javascripts/magic/ext/rails-ujs.js +479 -0
  21. data/vendor/assets/stylesheets/corporate/_variables.scss +5 -4
  22. data/vendor/assets/stylesheets/magic/content/_buttons.scss +1 -0
  23. data/vendor/assets/stylesheets/magic/content/_navbar.scss +7 -3
  24. data/vendor/assets/stylesheets/magic/layout/_section.scss +11 -5
  25. data/vendor/assets/stylesheets/magic/lib/_cross_browser.scss +2 -0
  26. data/vendor/assets/stylesheets/magic/xxx/_body.scss +4 -2
  27. data/vendor/assets/stylesheets/magic/xxx/_header.scss +2 -1
  28. data/vendor/assets/stylesheets/magic-min.scss +0 -1
  29. data/vendor/assets/stylesheets/magic-stylez.scss +0 -1
  30. metadata +5 -2
@@ -3,10 +3,10 @@
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
5
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
6
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-12830c6ac7643ebdf44bcc14c1cc31f4.css" media="all" rel="stylesheet" />
6
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-788d9ed1d184bbb91db637ecb8449a19.css" media="all" rel="stylesheet" />
7
7
  <script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
8
8
  <meta content="authenticity_token" name="csrf-param" />
9
- <meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
9
+ <meta content="ejY5unK2faEpuNt0ZxLzOSrMpPGXx4NredOdpigf1jw=" name="csrf-token" />
10
10
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
11
11
  <script type="text/javascript" charset="utf-8">
12
12
  App = {};
@@ -0,0 +1,479 @@
1
+ (function($, undefined) {
2
+
3
+ /**
4
+ * Unobtrusive scripting adapter for jQuery
5
+ * https://github.com/rails/jquery-ujs
6
+ *
7
+ * Requires jQuery 1.8.0 or later.
8
+ *
9
+ * Released under the MIT license
10
+
11
+ # changed to work better with divided and splitted buttons .. twetzel
12
+
13
+ *
14
+ */
15
+
16
+ // Cut down on the number of issues from people inadvertently including jquery_ujs twice
17
+ // by detecting and raising an error when it happens.
18
+ if ( $.rails !== undefined ) {
19
+ $.error('jquery-ujs has already been loaded!');
20
+ }
21
+
22
+ // Shorthand to make it a little easier to call public rails functions from within rails.js
23
+ var rails;
24
+ var $document = $(document);
25
+
26
+ $.rails = rails = {
27
+ // Link elements bound by jquery-ujs
28
+ linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with], a[data-disable]',
29
+
30
+ // Button elements bound by jquery-ujs
31
+ buttonClickSelector: 'button[data-remote]:not(form button), button[data-confirm]:not(form button)',
32
+
33
+ // Select elements bound by jquery-ujs
34
+ inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
35
+
36
+ // Form elements bound by jquery-ujs
37
+ formSubmitSelector: 'form',
38
+
39
+ // Form input elements bound by jquery-ujs
40
+ formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])',
41
+
42
+ // Form input elements disabled during form submission
43
+ disableSelector: 'input[data-disable-with]:enabled, button[data-disable-with]:enabled, textarea[data-disable-with]:enabled, input[data-disable]:enabled, button[data-disable]:enabled, textarea[data-disable]:enabled',
44
+
45
+ // Form input elements re-enabled after form submission
46
+ enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled, input[data-disable]:disabled, button[data-disable]:disabled, textarea[data-disable]:disabled',
47
+
48
+ // Form required input elements
49
+ requiredInputSelector: 'input[name][required]:not([disabled]),textarea[name][required]:not([disabled])',
50
+
51
+ // Form file input elements
52
+ fileInputSelector: 'input[type=file]',
53
+
54
+ // Link onClick disable selector with possible reenable after remote submission
55
+ linkDisableSelector: 'a[data-disable-with], a[data-disable]',
56
+
57
+ // Button onClick disable selector with possible reenable after remote submission
58
+ buttonDisableSelector: 'button[data-remote][data-disable-with], button[data-remote][data-disable]',
59
+
60
+ // Make sure that every Ajax request sends the CSRF token
61
+ CSRFProtection: function(xhr) {
62
+ var token = $('meta[name="csrf-token"]').attr('content');
63
+ if (token) xhr.setRequestHeader('X-CSRF-Token', token);
64
+ },
65
+
66
+ // making sure that all forms have actual up-to-date token(cached forms contain old one)
67
+ refreshCSRFTokens: function(){
68
+ var csrfToken = $('meta[name=csrf-token]').attr('content');
69
+ var csrfParam = $('meta[name=csrf-param]').attr('content');
70
+ $('form input[name="' + csrfParam + '"]').val(csrfToken);
71
+ },
72
+
73
+ // Triggers an event on an element and returns false if the event result is false
74
+ fire: function(obj, name, data) {
75
+ var event = $.Event(name);
76
+ obj.trigger(event, data);
77
+ return event.result !== false;
78
+ },
79
+
80
+ // Default confirm dialog, may be overridden with custom confirm dialog in $.rails.confirm
81
+ confirm: function(message) {
82
+ return confirm(message);
83
+ },
84
+
85
+ // Default ajax function, may be overridden with custom function in $.rails.ajax
86
+ ajax: function(options) {
87
+ return $.ajax(options);
88
+ },
89
+
90
+ // Default way to get an element's href. May be overridden at $.rails.href.
91
+ href: function(element) {
92
+ return element.attr('href');
93
+ },
94
+
95
+ // Submits "remote" forms and links with ajax
96
+ handleRemote: function(element) {
97
+ var method, url, data, elCrossDomain, crossDomain, withCredentials, dataType, options;
98
+
99
+ if (rails.fire(element, 'ajax:before')) {
100
+ elCrossDomain = element.data('cross-domain');
101
+ crossDomain = elCrossDomain === undefined ? null : elCrossDomain;
102
+ withCredentials = element.data('with-credentials') || null;
103
+ dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
104
+
105
+ if (element.is('form')) {
106
+ method = element.attr('method');
107
+ url = element.attr('action');
108
+ data = element.serializeArray();
109
+ // memoized value from clicked submit button
110
+ var button = element.data('ujs:submit-button');
111
+ if (button) {
112
+ data.push(button);
113
+ element.data('ujs:submit-button', null);
114
+ }
115
+ } else if (element.is(rails.inputChangeSelector)) {
116
+ method = element.data('method');
117
+ url = element.data('url');
118
+ data = element.serialize();
119
+ if (element.data('params')) data = data + "&" + element.data('params');
120
+ } else if (element.is(rails.buttonClickSelector)) {
121
+ method = element.data('method') || 'get';
122
+ url = element.data('url');
123
+ data = element.serialize();
124
+ if (element.data('params')) data = data + "&" + element.data('params');
125
+ } else {
126
+ method = element.data('method');
127
+ url = rails.href(element);
128
+ data = element.data('params') || null;
129
+ }
130
+
131
+ options = {
132
+ type: method || 'GET', data: data, dataType: dataType,
133
+ // stopping the "ajax:beforeSend" event will cancel the ajax request
134
+ beforeSend: function(xhr, settings) {
135
+ if (settings.dataType === undefined) {
136
+ xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
137
+ }
138
+ if (rails.fire(element, 'ajax:beforeSend', [xhr, settings])) {
139
+ element.trigger('ajax:send', xhr);
140
+ } else {
141
+ return false;
142
+ }
143
+ },
144
+ success: function(data, status, xhr) {
145
+ element.trigger('ajax:success', [data, status, xhr]);
146
+ },
147
+ complete: function(xhr, status) {
148
+ element.trigger('ajax:complete', [xhr, status]);
149
+ },
150
+ error: function(xhr, status, error) {
151
+ element.trigger('ajax:error', [xhr, status, error]);
152
+ },
153
+ crossDomain: crossDomain
154
+ };
155
+
156
+ // There is no withCredentials for IE6-8 when
157
+ // "Enable native XMLHTTP support" is disabled
158
+ if (withCredentials) {
159
+ options.xhrFields = {
160
+ withCredentials: withCredentials
161
+ };
162
+ }
163
+
164
+ // Only pass url to `ajax` options if not blank
165
+ if (url) { options.url = url; }
166
+
167
+ return rails.ajax(options);
168
+ } else {
169
+ return false;
170
+ }
171
+ },
172
+
173
+ // Handles "data-method" on links such as:
174
+ // <a href="/users/5" data-method="delete" rel="nofollow" data-confirm="Are you sure?">Delete</a>
175
+ handleMethod: function(link) {
176
+ var href = rails.href(link),
177
+ method = link.data('method'),
178
+ target = link.attr('target'),
179
+ csrfToken = $('meta[name=csrf-token]').attr('content'),
180
+ csrfParam = $('meta[name=csrf-param]').attr('content'),
181
+ form = $('<form method="post" action="' + href + '"></form>'),
182
+ metadataInput = '<input name="_method" value="' + method + '" type="hidden" />';
183
+
184
+ if (csrfParam !== undefined && csrfToken !== undefined) {
185
+ metadataInput += '<input name="' + csrfParam + '" value="' + csrfToken + '" type="hidden" />';
186
+ }
187
+
188
+ if (target) { form.attr('target', target); }
189
+
190
+ form.hide().append(metadataInput).appendTo('body');
191
+ form.submit();
192
+ },
193
+
194
+ // Helper function that returns form elements that match the specified CSS selector
195
+ // If form is actually a "form" element this will return associated elements outside the from that have
196
+ // the html form attribute set
197
+ formElements: function(form, selector) {
198
+ return form.is('form') ? $(form[0].elements).filter(selector) : form.find(selector);
199
+ },
200
+
201
+ /* Disables form elements:
202
+ - Caches element value in 'ujs:enable-with' data store
203
+ - Replaces element text with value of 'data-disable-with' attribute
204
+ - Sets disabled property to true
205
+ */
206
+ disableFormElements: function(form) {
207
+ rails.formElements(form, rails.disableSelector).each(function() {
208
+ rails.disableFormElement($(this));
209
+ });
210
+ },
211
+
212
+ disableFormElement: function(element) {
213
+ var method, replacement;
214
+
215
+ method = element.is('button') ? 'html' : 'val';
216
+ replacement = element.data('disable-with');
217
+
218
+ element.data('ujs:enable-with', element[method]());
219
+ if (replacement !== undefined) {
220
+ // element[method](replacement);
221
+ if ( element.hasClass("btn-splited") || element.hasClass("btn-divided") ) {
222
+ element.children("*:not(.icn):first").html(replacement);
223
+ } else {
224
+ element[method](replacement);
225
+ }
226
+ }
227
+
228
+ element.prop('disabled', true);
229
+ element.addClass("disabled");
230
+ },
231
+
232
+ /* Re-enables disabled form elements:
233
+ - Replaces element text with cached value from 'ujs:enable-with' data store (created in `disableFormElements`)
234
+ - Sets disabled property to false
235
+ */
236
+ enableFormElements: function(form) {
237
+ rails.formElements(form, rails.enableSelector).each(function() {
238
+ rails.enableFormElement($(this));
239
+ });
240
+ },
241
+
242
+ enableFormElement: function(element) {
243
+ var method = element.is('button') ? 'html' : 'val';
244
+ if ( element.data('ujs:enable-with') ) {
245
+ // element[method](element.data('ujs:enable-with'));
246
+ if ( element.hasClass("btn-splited") || element.hasClass("btn-divided") ) {
247
+ element.children("*:not(.icn):first").html(element.data('ujs:enable-with'));
248
+ } else {
249
+ element[method](element.data('ujs:enable-with'));
250
+ }
251
+ }
252
+ element.prop('disabled', false);
253
+ element.removeClass("disabled");
254
+ },
255
+
256
+ /* For 'data-confirm' attribute:
257
+ - Fires `confirm` event
258
+ - Shows the confirmation dialog
259
+ - Fires the `confirm:complete` event
260
+
261
+ Returns `true` if no function stops the chain and user chose yes; `false` otherwise.
262
+ Attaching a handler to the element's `confirm` event that returns a `falsy` value cancels the confirmation dialog.
263
+ Attaching a handler to the element's `confirm:complete` event that returns a `falsy` value makes this function
264
+ return false. The `confirm:complete` event is fired whether or not the user answered true or false to the dialog.
265
+ */
266
+ allowAction: function(element) {
267
+ var message = element.data('confirm'),
268
+ answer = false, callback;
269
+ if (!message) { return true; }
270
+
271
+ if (rails.fire(element, 'confirm')) {
272
+ answer = rails.confirm(message);
273
+ callback = rails.fire(element, 'confirm:complete', [answer]);
274
+ }
275
+ return answer && callback;
276
+ },
277
+
278
+ // Helper function which checks for blank inputs in a form that match the specified CSS selector
279
+ blankInputs: function(form, specifiedSelector, nonBlank) {
280
+ var inputs = $(), input, valueToCheck,
281
+ selector = specifiedSelector || 'input,textarea',
282
+ allInputs = form.find(selector);
283
+
284
+ allInputs.each(function() {
285
+ input = $(this);
286
+ valueToCheck = input.is('input[type=checkbox],input[type=radio]') ? input.is(':checked') : input.val();
287
+ // If nonBlank and valueToCheck are both truthy, or nonBlank and valueToCheck are both falsey
288
+ if (!valueToCheck === !nonBlank) {
289
+
290
+ // Don't count unchecked required radio if other radio with same name is checked
291
+ if (input.is('input[type=radio]') && allInputs.filter('input[type=radio]:checked[name="' + input.attr('name') + '"]').length) {
292
+ return true; // Skip to next input
293
+ }
294
+
295
+ inputs = inputs.add(input);
296
+ }
297
+ });
298
+ return inputs.length ? inputs : false;
299
+ },
300
+
301
+ // Helper function which checks for non-blank inputs in a form that match the specified CSS selector
302
+ nonBlankInputs: function(form, specifiedSelector) {
303
+ return rails.blankInputs(form, specifiedSelector, true); // true specifies nonBlank
304
+ },
305
+
306
+ // Helper function, needed to provide consistent behavior in IE
307
+ stopEverything: function(e) {
308
+ $(e.target).trigger('ujs:everythingStopped');
309
+ e.stopImmediatePropagation();
310
+ return false;
311
+ },
312
+
313
+ // replace element's html with the 'data-disable-with' after storing original html
314
+ // and prevent clicking on it
315
+ disableElement: function(element) {
316
+
317
+ console.log("***")
318
+ console.log("disableElement !")
319
+ console.log("***")
320
+
321
+ var replacement = element.data('disable-with');
322
+
323
+ element.data('ujs:enable-with', element.html()); // store enabled state
324
+ element.addClass("disabled");
325
+ if (replacement !== undefined) {
326
+ if ( element.hasClass("btn-splited") || element.hasClass("btn-divided") ) {
327
+ element.children("*:not(.icn):first").html(replacement);
328
+ } else {
329
+ element.html(replacement);
330
+ }
331
+ }
332
+
333
+ element.bind('click.railsDisable', function(e) { // prevent further clicking
334
+ return rails.stopEverything(e);
335
+ });
336
+ },
337
+
338
+ // restore element to its original state which was disabled by 'disableElement' above
339
+ enableElement: function(element) {
340
+ element.removeClass("disabled");
341
+ if (element.data('ujs:enable-with') !== undefined) {
342
+ // element.html(element.data('ujs:enable-with')); // set to old enabled state
343
+ if ( element.hasClass("btn-splited") || element.hasClass("btn-divided") ) {
344
+ element.children("*:not(.icn):first").html(element.data('ujs:enable-with'));
345
+ } else {
346
+ element.html(element.data('ujs:enable-with'));
347
+ }
348
+ element.removeData('ujs:enable-with'); // clean up cache
349
+ }
350
+ element.unbind('click.railsDisable'); // enable element
351
+ }
352
+ };
353
+
354
+ if (rails.fire($document, 'rails:attachBindings')) {
355
+
356
+ $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }});
357
+
358
+ $document.delegate(rails.linkDisableSelector, 'ajax:complete', function() {
359
+ rails.enableElement($(this));
360
+ });
361
+
362
+ $document.delegate(rails.buttonDisableSelector, 'ajax:complete', function() {
363
+ rails.enableFormElement($(this));
364
+ });
365
+
366
+ $document.delegate(rails.linkClickSelector, 'click.rails', function(e) {
367
+ var link = $(this), method = link.data('method'), data = link.data('params'), metaClick = e.metaKey || e.ctrlKey;
368
+ if (!rails.allowAction(link)) return rails.stopEverything(e);
369
+
370
+ if (!metaClick && link.is(rails.linkDisableSelector)) rails.disableElement(link);
371
+
372
+ if (link.data('remote') !== undefined) {
373
+ if (metaClick && (!method || method === 'GET') && !data) { return true; }
374
+
375
+ var handleRemote = rails.handleRemote(link);
376
+ // response from rails.handleRemote() will either be false or a deferred object promise.
377
+ if (handleRemote === false) {
378
+ rails.enableElement(link);
379
+ } else {
380
+ handleRemote.error( function() { rails.enableElement(link); } );
381
+ }
382
+ return false;
383
+
384
+ } else if (link.data('method')) {
385
+ rails.handleMethod(link);
386
+ return false;
387
+ }
388
+ });
389
+
390
+ $document.delegate(rails.buttonClickSelector, 'click.rails', function(e) {
391
+ var button = $(this);
392
+
393
+ if (!rails.allowAction(button)) return rails.stopEverything(e);
394
+
395
+ if (button.is(rails.buttonDisableSelector)) rails.disableFormElement(button);
396
+
397
+ var handleRemote = rails.handleRemote(button);
398
+ // response from rails.handleRemote() will either be false or a deferred object promise.
399
+ if (handleRemote === false) {
400
+ rails.enableFormElement(button);
401
+ } else {
402
+ handleRemote.error( function() { rails.enableFormElement(button); } );
403
+ }
404
+ return false;
405
+ });
406
+
407
+ $document.delegate(rails.inputChangeSelector, 'change.rails', function(e) {
408
+ var link = $(this);
409
+ if (!rails.allowAction(link)) return rails.stopEverything(e);
410
+
411
+ rails.handleRemote(link);
412
+ return false;
413
+ });
414
+
415
+ $document.delegate(rails.formSubmitSelector, 'submit.rails', function(e) {
416
+ var form = $(this),
417
+ remote = form.data('remote') !== undefined,
418
+ blankRequiredInputs,
419
+ nonBlankFileInputs;
420
+
421
+ if (!rails.allowAction(form)) return rails.stopEverything(e);
422
+
423
+ // skip other logic when required values are missing or file upload is present
424
+ if (form.attr('novalidate') == undefined) {
425
+ blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector);
426
+ if (blankRequiredInputs && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
427
+ return rails.stopEverything(e);
428
+ }
429
+ }
430
+
431
+ if (remote) {
432
+ nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
433
+ if (nonBlankFileInputs) {
434
+ // slight timeout so that the submit button gets properly serialized
435
+ // (make it easy for event handler to serialize form without disabled values)
436
+ setTimeout(function(){ rails.disableFormElements(form); }, 13);
437
+ var aborted = rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
438
+
439
+ // re-enable form elements if event bindings return false (canceling normal form submission)
440
+ if (!aborted) { setTimeout(function(){ rails.enableFormElements(form); }, 13); }
441
+
442
+ return aborted;
443
+ }
444
+
445
+ rails.handleRemote(form);
446
+ return false;
447
+
448
+ } else {
449
+ // slight timeout so that the submit button gets properly serialized
450
+ setTimeout(function(){ rails.disableFormElements(form); }, 13);
451
+ }
452
+ });
453
+
454
+ $document.delegate(rails.formInputClickSelector, 'click.rails', function(event) {
455
+ var button = $(this);
456
+
457
+ if (!rails.allowAction(button)) return rails.stopEverything(event);
458
+
459
+ // register the pressed submit button
460
+ var name = button.attr('name'),
461
+ data = name ? {name:name, value:button.val()} : null;
462
+
463
+ button.closest('form').data('ujs:submit-button', data);
464
+ });
465
+
466
+ $document.delegate(rails.formSubmitSelector, 'ajax:send.rails', function(event) {
467
+ if (this == event.target) rails.disableFormElements($(this));
468
+ });
469
+
470
+ $document.delegate(rails.formSubmitSelector, 'ajax:complete.rails', function(event) {
471
+ if (this == event.target) rails.enableFormElements($(this));
472
+ });
473
+
474
+ $(function(){
475
+ rails.refreshCSRFTokens();
476
+ });
477
+ }
478
+
479
+ })( jQuery );
@@ -54,11 +54,12 @@ $border-radius-small: 3px !default;
54
54
  // Padding
55
55
  $section-padding: 50px !default;
56
56
  $section-head-padding: 10px !default;
57
- $section-compact-padding: 10px !default;
58
- $section-flatted-padding: 30px !default;
59
- $section-fat-padding: 80px !default;
60
- $section-fatter-padding: 120px !default;
61
57
 
58
+ $section-xs-padding: 10px !default;
59
+ $section-sm-padding: 30px !default;
60
+ $section-lg-padding: 80px !default;
61
+ $section-xl-padding: 120px !default;
62
+ $section-xxl-padding: 200px !default;
62
63
 
63
64
 
64
65
  // Colors
@@ -212,6 +212,7 @@
212
212
  background-color: transparent !important;
213
213
  border-color: transparent !important;
214
214
  background-image: none;
215
+ box-shadow: none;
215
216
  }
216
217
  }
217
218
 
@@ -122,14 +122,18 @@ body, #body, #container, .main-content, .main_content {
122
122
  top: 0; right: auto; bottom: 0; left: 0;
123
123
  margin: 0;
124
124
  background: $dark-bg;
125
- @include transform( translateZ( 0 ) );
126
- @include transform( translateX( -222px ) );
125
+ // @include transform( translateZ( 0 ) );
126
+ // @include transform( translateX( -222px ) );
127
+ @include transform( translate(-222px,0) );
127
128
  width: 220px;
128
129
  max-height: none;
129
130
  overflow-y: scroll;
130
131
  @include transition (all 0.7s ease-in-out);
131
132
  .btn { @include horizontal-margin( 15px ); width: auto; }
132
- &.on { @include transform( translateX( 0 ) ); }
133
+ &.on {
134
+ // @include transform( translateX( 0 ) );
135
+ @include transform( translate(0,0) );
136
+ }
133
137
  }
134
138
 
135
139
  &.fixed-top, &.navbar-fixed-top {
@@ -13,7 +13,7 @@
13
13
 
14
14
 
15
15
  &.image {
16
- &.fixed { background-attachment: fixed; z-index: 3; }
16
+ &.fixed { background-attachment: fixed; /* position: static; */ z-index: 88; }
17
17
 
18
18
  background-color: transparent;
19
19
  background-position: center center;
@@ -21,6 +21,11 @@
21
21
  background-size: cover;
22
22
  background-image: url('http://lorempixel.com/g/1200/500/nature/');
23
23
 
24
+ // &.fixed {
25
+ // background: transparent image-url('magic/bgs/hdr_landsberger.jpg') no-repeat center center fixed;
26
+ // background-size: cover;
27
+ // }
28
+
24
29
  .corset, .container { background: transparent; }
25
30
  }
26
31
 
@@ -81,11 +86,12 @@
81
86
  //
82
87
  // Section Sizes
83
88
  //
84
- &.compact { padding-top: $section-compact-padding; padding-bottom: $section-compact-padding; }
85
- &.flatted, &.tight { padding-top: $section-flatted-padding; padding-bottom: $section-flatted-padding; }
89
+ &.section-xs, &.sctn-xs, &.compact { padding-top: $section-xs-padding; padding-bottom: $section-xs-padding; }
90
+ &.section-sm, &.sctn-sm, &.flatted, &.tight { padding-top: $section-sm-padding; padding-bottom: $section-sm-padding; }
86
91
 
87
- &.fat { padding-top: $section-fat-padding; padding-bottom: $section-fat-padding; }
88
- &.fatter { padding-top: $section-fatter-padding; padding-bottom: $section-fatter-padding; }
92
+ &.section-lg, &.sctn-lg, &.fat { padding-top: $section-lg-padding; padding-bottom: $section-lg-padding; }
93
+ &.section-xl, &.sctn-xl, &.fatter { padding-top: $section-xl-padding; padding-bottom: $section-xl-padding; }
94
+ &.section-xxl, &.sctn-xxl { padding-top: $section-xxl-padding; padding-bottom: $section-xxl-padding; }
89
95
 
90
96
  &.flat { padding-top: 0; padding-bottom: 0; }
91
97
  &.flat-top { padding-top: 0; }
@@ -56,6 +56,8 @@
56
56
  // twbs
57
57
  // @include translate3d(0, 0, 0);
58
58
  // bourbon
59
+ // there is a chrome bug with that ... http://codepen.io/herzflimmern/blog/chrome-bug-with-fixed-background-and-translate3d
59
60
  @include transform(translate3d(0,0,0));
61
+ // @include transform( translate(0,0) );
60
62
  }
61
63
 
@@ -10,7 +10,8 @@
10
10
  #fixed_nav {
11
11
  position: fixed;
12
12
  // let graphic card render header:
13
- @include transform( translateZ( 0 ) );
13
+ // @include transform( translateZ( 0 ) );
14
+ @include gpu_render;
14
15
  top: 0; left: 0; right: 0;
15
16
  @include border-radius(0);
16
17
  z-index: 999;
@@ -131,7 +132,8 @@
131
132
  //## Aside-Navigation
132
133
  #nav-aside {
133
134
  display: block; position: fixed;
134
- @include transform( translateZ( 0 ) );
135
+ // @include transform( translateZ( 0 ) );
136
+ @include gpu_render;
135
137
  margin: 0; padding: 0;
136
138
 
137
139
  right: 0; left: 0; bottom: 0;
@@ -254,7 +254,8 @@
254
254
  height: 50px;
255
255
  z-index: 23;
256
256
  background: #fff;
257
- @include transform( translateZ( 0 ) );
257
+ // @include transform( translateZ( 0 ) );
258
+ @include gpu_render;
258
259
  .navbar-toggle { float: left; border: solid 1px transparent; }
259
260
  .nav.navbar-nav {
260
261
  li {
@@ -61,7 +61,6 @@
61
61
 
62
62
 
63
63
  // @import "magic/lists/nav";
64
- // @import "magic/content/header";
65
64
  // @import "magic/layout/body";
66
65
 
67
66
 
@@ -64,7 +64,6 @@
64
64
 
65
65
 
66
66
 
67
- //@import "magic/content/header";
68
67
  //@import "magic/layout/body";
69
68
 
70
69
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: magic_stylez
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.0.66
4
+ version: 0.0.0.67
5
5
  platform: ruby
6
6
  authors:
7
7
  - Torsten Wetzel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-09 00:00:00.000000000 Z
11
+ date: 2015-01-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -245,6 +245,7 @@ files:
245
245
  - test/dummy/app/assets/javascripts/views/icons/icomoon.jst.eco
246
246
  - test/dummy/app/assets/javascripts/views/icons/magicons.jst.eco
247
247
  - test/dummy/app/assets/javascripts/views/icons/olicons.jst.eco
248
+ - test/dummy/app/assets/javascripts/views/layout/at_first.jst.eco
248
249
  - test/dummy/app/assets/javascripts/views/layout/corset.jst.eco
249
250
  - test/dummy/app/assets/javascripts/views/layout/fullpage_table.jst.eco
250
251
  - test/dummy/app/assets/javascripts/views/layout/layout_table.jst.eco
@@ -361,6 +362,7 @@ files:
361
362
  - vendor/assets/javascripts/magic-stylez.js.coffee
362
363
  - vendor/assets/javascripts/magic/circle_diagram.js.coffee
363
364
  - vendor/assets/javascripts/magic/collapse.js.coffee
365
+ - vendor/assets/javascripts/magic/ext/rails-ujs.js
364
366
  - vendor/assets/javascripts/magic/helper.js.coffee
365
367
  - vendor/assets/javascripts/magic/render_eco.js.coffee
366
368
  - vendor/assets/stylesheets/corporate/_colors.scss
@@ -472,6 +474,7 @@ test_files:
472
474
  - test/dummy/app/assets/javascripts/views/icons/icomoon.jst.eco
473
475
  - test/dummy/app/assets/javascripts/views/icons/magicons.jst.eco
474
476
  - test/dummy/app/assets/javascripts/views/icons/olicons.jst.eco
477
+ - test/dummy/app/assets/javascripts/views/layout/at_first.jst.eco
475
478
  - test/dummy/app/assets/javascripts/views/layout/corset.jst.eco
476
479
  - test/dummy/app/assets/javascripts/views/layout/fullpage_table.jst.eco
477
480
  - test/dummy/app/assets/javascripts/views/layout/layout_table.jst.eco