magic_stylez 0.0.0.36 → 0.0.0.37

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/lib/magic_stylez/version.rb +1 -1
  3. data/test/dummy/README.md +19 -0
  4. data/test/dummy/app/assets/javascripts/app.js.coffee +4 -0
  5. data/test/dummy/app/assets/javascripts/blank.js.coffee +20 -0
  6. data/test/dummy/app/assets/javascripts/views/layout/fullpage_table.jst.eco +2 -2
  7. data/test/dummy/app/assets/javascripts/views/templates/aside-nav.jst.eco +5 -0
  8. data/test/dummy/app/assets/javascripts/views/templates/fixed_header.jst.eco +1 -1
  9. data/test/dummy/app/assets/javascripts/views/templates/responsive_slidebar.jst.eco +1 -1
  10. data/test/dummy/app/assets/stylesheets/application.css.scss +14 -3
  11. data/test/dummy/app/assets/stylesheets/corporate/_fonts.scss +4 -0
  12. data/test/dummy/app/assets/stylesheets/corporate/_typo.scss +2 -0
  13. data/test/dummy/app/assets/stylesheets/corporate/_variables.scss +94 -0
  14. data/test/dummy/app/controllers/front_controller.rb +1 -1
  15. data/test/dummy/app/views/front/templates.html.erb +1 -1
  16. data/test/dummy/app/views/layouts/application.html.erb +1 -1
  17. data/test/dummy/app/views/layouts/blank.html.erb +1 -3
  18. data/test/dummy/app/views/templates/aside-nav.html.erb +137 -0
  19. data/test/dummy/app/views/templates/fixed-header.html.erb +45 -43
  20. data/test/dummy/app/views/templates/responsive-slidebar.html.erb +48 -46
  21. data/test/dummy/public/favicon.ico +0 -0
  22. data/test/dummy/public/favicon.png +0 -0
  23. data/test/dummy/public/html/aside-nav.html +241 -0
  24. data/test/dummy/public/html/fixed-header.html +46 -45
  25. data/test/dummy/public/html/index.html +5 -4
  26. data/test/dummy/public/html/responsive-slidebar.html +49 -48
  27. data/vendor/assets/stylesheets/corporate/_fonts.scss +4 -0
  28. data/vendor/assets/stylesheets/corporate/_variables.scss +45 -0
  29. data/vendor/assets/stylesheets/magic/content/_aside_nav.scss +139 -0
  30. data/vendor/assets/stylesheets/magic/content/_navbar.scss +50 -43
  31. data/vendor/assets/stylesheets/magic/content/_notice.scss +79 -0
  32. data/vendor/assets/stylesheets/magic/lib/_cross_browser.scss +10 -0
  33. data/vendor/assets/stylesheets/magic-min.scss +2 -0
  34. data/vendor/assets/stylesheets/magic-stylez.scss +2 -0
  35. metadata +16 -6
  36. data/test/dummy/README.rdoc +0 -28
  37. data/test/dummy/app/assets/javascripts/blank.js +0 -14
data/vendor/assets/stylesheets/magic/content/_navbar.scss CHANGED
@@ -1,7 +1,12 @@
1
1
  // some changes to twbs navbar
2
2
 
3
3
  // Basics of a navbar
4
+ // $navbar-height-xs: 30px !default;
5
+ // $navbar-height-sm: 40px !default;
4
6
  // $navbar-height: 50px !default;
7
+ // $navbar-height-lg: 60px !default;
8
+ // $navbar-height-xl: 80px !default;
9
+ //
5
10
  // $navbar-margin-bottom: $line-height-computed !default;
6
11
  // $navbar-border-radius: $border-radius-base !default;
7
12
  // $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
@@ -44,54 +49,56 @@
44
49
  .corset, .container { background: inherit; }
45
50
  .navbar-collapse { background: inherit; }
46
51
 
47
- // default hight 50px
48
- .navbar-nav {
49
- background: inherit;
50
- // a:not(.btn) { }
51
- & > li > a, & > a {
52
- padding: 15px 10px;
53
- line-height: 20px;
54
-
55
- &.btn {
56
- margin: 9px 5px;
57
- @include vertical-padding( 5px );
58
- line-height: 20px;
59
- &.btn-sm {
60
- margin: 11px 5px;
61
- @include vertical-padding( 3px );
62
- }
63
- &.btn-xs {
64
- margin: 13px 5px;
65
- @include vertical-padding( 1px );
66
- }
67
- &.btn-lg {
68
- margin: 6px 5px;
69
- @include vertical-padding( 8px );
70
- }
71
- }
72
- }
73
-
74
- }
52
+ // // default hight 50px
53
+ // .navbar-nav {
54
+ // background: inherit;
55
+ // // a:not(.btn) { }
56
+ // & > li > a, & > a {
57
+ // padding: 15px 10px;
58
+ // line-height: 20px;
59
+ //
60
+ // &.btn {
61
+ // margin: 9px 5px;
62
+ // @include vertical-padding( 5px );
63
+ // line-height: 20px;
64
+ // &.btn-sm {
65
+ // margin: 11px 5px;
66
+ // @include vertical-padding( 3px );
67
+ // }
68
+ // &.btn-xs {
69
+ // margin: 13px 5px;
70
+ // @include vertical-padding( 1px );
71
+ // }
72
+ // &.btn-lg {
73
+ // margin: 6px 5px;
74
+ // @include vertical-padding( 8px );
75
+ // }
76
+ // }
77
+ // }
78
+ //
79
+ // }
80
+
81
+ @include sized-navbar( $navbar-height );
75
82
 
76
83
  @media (max-width: $grid-float-breakpoint-max) {
77
84
  .corset .navbar-collapse { @include horizontal-margin( -10px ); }
78
85
  }
79
86
 
80
- &.navbar-xs { @include sized-navbar( 30px ); }
81
- &.navbar-sm { @include sized-navbar( 40px ); }
82
- &.navbar-lg { @include sized-navbar( 60px ); }
83
- &.navbar-xl { @include sized-navbar( 80px ); }
87
+ &.navbar-xs { @include sized-navbar( $navbar-height-xs ); }
88
+ &.navbar-sm { @include sized-navbar( $navbar-height-sm ); }
89
+ &.navbar-lg { @include sized-navbar( $navbar-height-lg ); }
90
+ &.navbar-xl { @include sized-navbar( $navbar-height-xl ); }
84
91
 
85
92
  }
86
93
 
87
94
 
88
95
  body, #body, #container, .main-content, .main_content {
89
96
 
90
- &.fixed-nav-xs { padding: 30px 0 0; }
91
- &.fixed-nav-sm { padding: 40px 0 0; }
92
- &.fixed-nav { padding: 50px 0 0; }
93
- &.fixed-nav-lg { padding: 60px 0 0; }
94
- &.fixed-nav-xl { padding: 80px 0 0; }
97
+ &.fixed-nav-xs { padding-top: $navbar-height-xs; }
98
+ &.fixed-nav-sm { padding-top: $navbar-height-sm; }
99
+ &.fixed-nav { padding-top: $navbar-height; }
100
+ &.fixed-nav-lg { padding-top: $navbar-height-lg; }
101
+ &.fixed-nav-xl { padding-top: $navbar-height-xl; }
95
102
 
96
103
  }
97
104
 
@@ -116,12 +123,12 @@ body, #body, #container, .main-content, .main_content {
116
123
  &.on { @include transform( translateX( 0 ) ); }
117
124
  }
118
125
 
119
- &.fixed-top .navbar-collapse, &.navbar-fixed-top .navbar-collapse {
120
- top: 50px;
121
- &.navbar-xs { top: 30px; }
122
- &.navbar-sm { top: 40px; }
123
- &.navbar-lg { top: 60px; }
124
- &.navbar-xl { top: 80px; }
126
+ &.fixed-top, &.navbar-fixed-top {
127
+ .navbar-collapse { top: $navbar-height; }
128
+ &.navbar-xs { .navbar-collapse { top: $navbar-height-xs; } }
129
+ &.navbar-sm { .navbar-collapse { top: $navbar-height-sm; } }
130
+ &.navbar-lg { .navbar-collapse { top: $navbar-height-lg; } }
131
+ &.navbar-xl { .navbar-collapse { top: $navbar-height-xl; } }
125
132
  }
126
133
  }
127
134
  }
data/vendor/assets/stylesheets/magic/content/_notice.scss ADDED
@@ -0,0 +1,79 @@
1
+ .important_notice {
2
+ display: block; position: fixed;
3
+ top: $important-notice-top; bottom: $important-notice-bottom;
4
+ left:0; right:0;
5
+ line-height: $important-notice-height; height: $important-notice-height; max-height: $important-notice-height;
6
+ padding: 0;
7
+ z-index: $zindex-important-notice;
8
+ text-align: center;
9
+ background: $important-notice-bg;
10
+ color: $important-notice-color;
11
+ font-weight: $important-notice-font-weight;
12
+ font-size: $important-notice-font-size;
13
+ a {
14
+ font-weight: $important-notice-link-weight;
15
+ color: $important-notice-link-color;
16
+ text-shadow: 0 0 3px darken($important-notice-bg, 20%);
17
+ }
18
+ &.warning, .development {
19
+ background: $important-notice-warning-bg;
20
+ color: $important-notice-warning-color;
21
+ a { color: $important-notice-warning-link-color; text-shadow: 0 0 3px darken($important-notice-warning-bg, 20%); }
22
+ }
23
+ &.alert, .staging {
24
+ background: $important-notice-alert-bg;
25
+ color: $important-notice-alert-color;
26
+ a { color: $important-notice-alert-link-color; text-shadow: 0 0 3px darken($important-notice-alert-bg, 20%); }
27
+ }
28
+ }
29
+
30
+ body, #body, #container, .main-content, .main_content {
31
+
32
+ &.with_important_notice {
33
+
34
+ padding-top: $important-notice-height;
35
+
36
+ &.fixed-nav-xs { padding-top: $important-notice-height + $navbar-height-xs; }
37
+ &.fixed-nav-sm { padding-top: $important-notice-height + $navbar-height-sm; }
38
+ &.fixed-nav { padding-top: $important-notice-height + $navbar-height; }
39
+ &.fixed-nav-lg { padding-top: $important-notice-height + $navbar-height-lg; }
40
+ &.fixed-nav-xl { padding-top: $important-notice-height + $navbar-height-xl; }
41
+
42
+ .fixed-top, .navbar-fixed-top { top: $important-notice-height; }
43
+
44
+ }
45
+
46
+ }
47
+
48
+
49
+
50
+ @include responsiveStep-sm {
51
+
52
+ body, #body, #container, .main-content, .main_content {
53
+ &.with_important_notice {
54
+
55
+ #nav-aside { top: $important-notice-height; }
56
+
57
+ }
58
+ }
59
+
60
+ }
61
+ @media (max-width: $grid-float-breakpoint) {
62
+
63
+ body, #body, #container, .main-content, .main_content {
64
+ &.with_important_notice {
65
+
66
+ .navbar.navbar-slidebar {
67
+ &.fixed-top, &.navbar-fixed-top {
68
+ .navbar-collapse { top: $important-notice-height + $navbar-height; }
69
+ &.navbar-xs { .navbar-collapse { top: $important-notice-height + $navbar-height-xs; } }
70
+ &.navbar-sm { .navbar-collapse { top: $important-notice-height + $navbar-height-sm; } }
71
+ &.navbar-lg { .navbar-collapse { top: $important-notice-height + $navbar-height-lg; } }
72
+ &.navbar-xl { .navbar-collapse { top: $important-notice-height + $navbar-height-xl; } }
73
+ }
74
+ }
75
+
76
+ }
77
+ }
78
+
79
+ }
data/vendor/assets/stylesheets/magic/lib/_cross_browser.scss CHANGED
@@ -49,3 +49,13 @@
49
49
  @include spezial_radius( #{percentage($first)} / #{percentage($second)} );
50
50
  }
51
51
 
52
+
53
+ @mixin gpu_render {
54
+ // old style (bourbon)
55
+ // @include transform( translateZ( 0 ) );
56
+ // twbs
57
+ // @include translate3d(0, 0, 0);
58
+ // bourbon
59
+ @include transform(translate3d(0,0,0));
60
+ }
61
+
data/vendor/assets/stylesheets/magic-min.scss CHANGED
@@ -36,6 +36,7 @@
36
36
  // @import "magic/elements/circle_diagram";
37
37
 
38
38
  // load content helper
39
+ // @import "magic/content/aside_nav";
39
40
  // @import "magic/content/banner";
40
41
  // @import "magic/content/box";
41
42
  // @import "magic/content/buttons";
@@ -44,6 +45,7 @@
44
45
  // @import "magic/content/icons";
45
46
  // @import "magic/content/inputs";
46
47
  // @import "magic/content/navbar";
48
+ // @import "magic/content/notice";
47
49
  // @import "magic/content/panel";
48
50
  // @import "magic/content/pix";
49
51
 
data/vendor/assets/stylesheets/magic-stylez.scss CHANGED
@@ -36,6 +36,7 @@
36
36
  @import "magic/elements/circle_diagram";
37
37
 
38
38
  // load content helper
39
+ @import "magic/content/aside_nav";
39
40
  @import "magic/content/banner";
40
41
  @import "magic/content/box";
41
42
  @import "magic/content/buttons";
@@ -44,6 +45,7 @@
44
45
  @import "magic/content/icons";
45
46
  @import "magic/content/inputs";
46
47
  @import "magic/content/navbar";
48
+ @import "magic/content/notice";
47
49
  @import "magic/content/panel";
48
50
  @import "magic/content/pix";
49
51
 
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.36
4
+ version: 0.0.0.37
5
5
  platform: ruby
6
6
  authors:
7
7
  - Torsten Wetzel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-01 00:00:00.000000000 Z
11
+ date: 2014-08-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -210,13 +210,13 @@ files:
210
210
  - lib/magic_stylez/version.rb
211
211
  - lib/tasks/magic_stylez_tasks.rake
212
212
  - magic_stylez.gemspec
213
- - test/dummy/README.rdoc
213
+ - test/dummy/README.md
214
214
  - test/dummy/Rakefile
215
215
  - test/dummy/app/assets/images/.keep
216
216
  - test/dummy/app/assets/javascripts/app.js.coffee
217
217
  - test/dummy/app/assets/javascripts/application.js
218
218
  - test/dummy/app/assets/javascripts/assets.js.coffee.erb
219
- - test/dummy/app/assets/javascripts/blank.js
219
+ - test/dummy/app/assets/javascripts/blank.js.coffee
220
220
  - test/dummy/app/assets/javascripts/views/app/start.jst.eco
221
221
  - test/dummy/app/assets/javascripts/views/content/box.jst.eco
222
222
  - test/dummy/app/assets/javascripts/views/content/buttons.jst.eco
@@ -238,6 +238,7 @@ files:
238
238
  - test/dummy/app/assets/javascripts/views/layout/layout_table.jst.eco
239
239
  - test/dummy/app/assets/javascripts/views/layout/section.jst.eco
240
240
  - test/dummy/app/assets/javascripts/views/layout/slide_boxes.jst.eco
241
+ - test/dummy/app/assets/javascripts/views/templates/aside-nav.jst.eco
241
242
  - test/dummy/app/assets/javascripts/views/templates/fixed_header.jst.eco
242
243
  - test/dummy/app/assets/javascripts/views/templates/responsive_slidebar.jst.eco
243
244
  - test/dummy/app/assets/stylesheets/application.css.scss
@@ -258,6 +259,7 @@ files:
258
259
  - test/dummy/app/views/layouts/application.html.erb
259
260
  - test/dummy/app/views/layouts/blank.html.erb
260
261
  - test/dummy/app/views/templates/_lorem.html.erb
262
+ - test/dummy/app/views/templates/aside-nav.html.erb
261
263
  - test/dummy/app/views/templates/fixed-header.html.erb
262
264
  - test/dummy/app/views/templates/responsive-slidebar.html.erb
263
265
  - test/dummy/bin/bundle
@@ -287,6 +289,8 @@ files:
287
289
  - test/dummy/public/422.html
288
290
  - test/dummy/public/500.html
289
291
  - test/dummy/public/favicon.ico
292
+ - test/dummy/public/favicon.png
293
+ - test/dummy/public/html/aside-nav.html
290
294
  - test/dummy/public/html/fixed-header.html
291
295
  - test/dummy/public/html/index.html
292
296
  - test/dummy/public/html/responsive-slidebar.html
@@ -348,6 +352,7 @@ files:
348
352
  - vendor/assets/stylesheets/corporate/_variables.scss
349
353
  - vendor/assets/stylesheets/magic-min.scss
350
354
  - vendor/assets/stylesheets/magic-stylez.scss
355
+ - vendor/assets/stylesheets/magic/content/_aside_nav.scss
351
356
  - vendor/assets/stylesheets/magic/content/_banner.scss
352
357
  - vendor/assets/stylesheets/magic/content/_box.scss
353
358
  - vendor/assets/stylesheets/magic/content/_buttons.scss
@@ -356,6 +361,7 @@ files:
356
361
  - vendor/assets/stylesheets/magic/content/_icons.scss
357
362
  - vendor/assets/stylesheets/magic/content/_inputs.scss
358
363
  - vendor/assets/stylesheets/magic/content/_navbar.scss
364
+ - vendor/assets/stylesheets/magic/content/_notice.scss
359
365
  - vendor/assets/stylesheets/magic/content/_panel.scss
360
366
  - vendor/assets/stylesheets/magic/content/_pix.scss
361
367
  - vendor/assets/stylesheets/magic/effects/_noise.scss
@@ -413,13 +419,13 @@ signing_key:
413
419
  specification_version: 4
414
420
  summary: A set of sass helper depending on bourbon and bootstrap-sass.
415
421
  test_files:
416
- - test/dummy/README.rdoc
422
+ - test/dummy/README.md
417
423
  - test/dummy/Rakefile
418
424
  - test/dummy/app/assets/images/.keep
419
425
  - test/dummy/app/assets/javascripts/app.js.coffee
420
426
  - test/dummy/app/assets/javascripts/application.js
421
427
  - test/dummy/app/assets/javascripts/assets.js.coffee.erb
422
- - test/dummy/app/assets/javascripts/blank.js
428
+ - test/dummy/app/assets/javascripts/blank.js.coffee
423
429
  - test/dummy/app/assets/javascripts/views/app/start.jst.eco
424
430
  - test/dummy/app/assets/javascripts/views/content/box.jst.eco
425
431
  - test/dummy/app/assets/javascripts/views/content/buttons.jst.eco
@@ -441,6 +447,7 @@ test_files:
441
447
  - test/dummy/app/assets/javascripts/views/layout/layout_table.jst.eco
442
448
  - test/dummy/app/assets/javascripts/views/layout/section.jst.eco
443
449
  - test/dummy/app/assets/javascripts/views/layout/slide_boxes.jst.eco
450
+ - test/dummy/app/assets/javascripts/views/templates/aside-nav.jst.eco
444
451
  - test/dummy/app/assets/javascripts/views/templates/fixed_header.jst.eco
445
452
  - test/dummy/app/assets/javascripts/views/templates/responsive_slidebar.jst.eco
446
453
  - test/dummy/app/assets/stylesheets/application.css.scss
@@ -461,6 +468,7 @@ test_files:
461
468
  - test/dummy/app/views/layouts/application.html.erb
462
469
  - test/dummy/app/views/layouts/blank.html.erb
463
470
  - test/dummy/app/views/templates/_lorem.html.erb
471
+ - test/dummy/app/views/templates/aside-nav.html.erb
464
472
  - test/dummy/app/views/templates/fixed-header.html.erb
465
473
  - test/dummy/app/views/templates/responsive-slidebar.html.erb
466
474
  - test/dummy/bin/bundle
@@ -490,6 +498,8 @@ test_files:
490
498
  - test/dummy/public/422.html
491
499
  - test/dummy/public/500.html
492
500
  - test/dummy/public/favicon.ico
501
+ - test/dummy/public/favicon.png
502
+ - test/dummy/public/html/aside-nav.html
493
503
  - test/dummy/public/html/fixed-header.html
494
504
  - test/dummy/public/html/index.html
495
505
  - test/dummy/public/html/responsive-slidebar.html
data/test/dummy/README.rdoc DELETED
@@ -1,28 +0,0 @@
1
- == README
2
-
3
- This README would normally document whatever steps are necessary to get the
4
- application up and running.
5
-
6
- Things you may want to cover:
7
-
8
- * Ruby version
9
-
10
- * System dependencies
11
-
12
- * Configuration
13
-
14
- * Database creation
15
-
16
- * Database initialization
17
-
18
- * How to run the test suite
19
-
20
- * Services (job queues, cache servers, search engines, etc.)
21
-
22
- * Deployment instructions
23
-
24
- * ...
25
-
26
-
27
- Please feel free to use a different markup language if you do not plan to run
28
- <tt>rake doc:app</tt>.
data/test/dummy/app/assets/javascripts/blank.js DELETED
@@ -1,14 +0,0 @@
1
- // This is a manifest file that'll be compiled into application.js, which will include all the files
2
- // listed below.
3
- //
4
- // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
5
- // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
6
- //
7
- // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8
- // compiled file.
9
- //
10
- // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
11
- // about supported directives.
12
- //
13
- //= require jquery
14
- //= require magic-min