edge_framework 1.2.2 → 1.2.3

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.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- OTJiZTBmYzgxMTljNzM0NTBhMjYwNjZiZDc3OWVkOTFmNjRkOTQyOQ==
4
+ NmM1NjExZjRhOWU0NDkwMTVmMWM3NDdjMjhlNzM3MTBjN2U3MWI3Zg==
5
5
  data.tar.gz: !binary |-
6
- ZTczMTRkYTA2YzZhN2MzOWZiOTQyMWI2ZGIwYTZiNTk4NmU5YTBhYQ==
6
+ ZjZkMzY2MzNmYWUzOTI0M2MxZTIyNmUyNjFjODk3ZjJhNzY5NTJlYw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NjI2ZGU2YTJjMjE1NzBjY2E5N2FkZmE0Y2IxNTMzNzFhYTBkYjcwMzA3YjI1
10
- NjJlNGYxNTlmNjhlMjg5MTZjYjRiZGU0ODgyNWFiODRlMmE1MmFmMjNjMDNh
11
- ODBiYzYzNWQyM2Q5YjIxNTE0NzZmYmZiZjhlN2FjZDgxYTVjZTk=
9
+ MWMwNzUzZDA1Yzc5NTViOGZhNDVmMGE1ODkzNTY1MWNmMjFlNTM1YjA5ZGIw
10
+ ODA5ZWU5MWExNjYzNTdjNzUyN2FlNWY4N2Q0YzlkMDU4NTc0ZDM0ZGRkMDA5
11
+ YmMwZjYwNDk2MTJlMTFkZjRlMTBjN2VjNjMyMzAzZGZjNzBjNTI=
12
12
  data.tar.gz: !binary |-
13
- ZmM2MjViMjgwMDRkOWE0Y2M3NWIzMzZhMDBiNzRhODU2Mjc3NDRlZDhlMDZm
14
- NDkyYWIwMzgwYWRjNTE1NDI0ZWNiYWJmNzM4OTA5N2FhYzM5MDcxYmFmOThi
15
- ZDkyMDY2MzMzNGIzNjYxYzVmYTc1NTJlM2FmMmEyNDMyNDkxN2M=
13
+ Nzc2MjQ4NzJkNGZkNTE0MzlhZDI4YWI1MmYzYzM5YTAwMmRjM2NmMGE1N2E0
14
+ YzJlNThmNWJiMDE3ZWFiYmYxMmJiNTI3MmY4YTEyYTkyYTk2Y2Q5YTJjMDUw
15
+ OWY1YmUxNjdiNjZkOGRjYzA1ZDg3MmViOWMzNzNkMjE1ZGEzNTg=
@@ -433,39 +433,56 @@
433
433
  </div>
434
434
  </div> -->
435
435
 
436
- <div class="row" data-page="grid">
437
- <div class="large-12 columns">
436
+ <!-- <div data-page="grid">
437
+ <div>
438
438
  <div class="demo-grid">
439
439
  <h1>Grid</h1>
440
440
  <div class="row">
441
- <div class="large-6 columns"><p>6</p></div>
442
- <div class="large-6 columns"><p>6</p></div>
441
+ <div class="large-4 small-4 columns"><p>l4 s4</p></div>
442
+ <div class="large-4 small-4 columns"><p>l4 s4</p></div>
443
+ <div class="large-4 small-4 columns"><p>l4 s4</p></div>
443
444
  </div>
444
445
  <div class="row">
445
- <div class="large-8 columns"><p>8</p></div>
446
- <div class="large-4 columns"><p>4</p></div>
446
+ <div class="large-6 small-9 columns"><p>l6</p></div>
447
+ <div class="large-6 small-3 columns"><p>l6</p></div>
447
448
  </div>
448
449
 
449
450
  <h1>Collapsed Grid</h1>
450
451
  <div class="row collapse">
451
- <div class="large-6 columns"><p>6</p></div>
452
- <div class="large-6 columns"><p>6</p></div>
452
+ <div class="large-6 small-6 columns"><p>l6 s6</p></div>
453
+ <div class="large-6 small-6 columns"><p>l6 s6</p></div>
453
454
  </div>
454
455
  <div class="row collapse">
455
456
  <div class="large-8 columns"><p>8</p></div>
456
457
  <div class="large-4 columns"><p>4</p></div>
457
458
  </div>
458
459
 
459
- <h1>Responsive Grid</h1>
460
- <div class="row">
461
- <div class="large-4 small-4 columns"><p>large-4 small-4</p></div>
462
- <div class="large-4 small-4 columns"><p>large-4 small-4</p></div>
463
- <div class="large-4 small-4 columns"><p>large-4 small-4</p></div>
464
- </div>
460
+ <h1>Nested Collapsed vs. Nested</h1>
465
461
  <div class="row">
466
- <div class="large-6 small-9 columns"><p>large-6 small-9</p></div>
467
- <div class="large-6 small-3 columns"><p>large-6 small-3</p></div>
462
+ <div class="large-6 small-6 columns">
463
+ <p>l6 s6</p>
464
+ <div class="row collapse">
465
+ <div class="large-9 small-6 column">
466
+ <p>l9 s6</p>
467
+ </div>
468
+ <div class="large-3 small-6 column">
469
+ <p>l3 s6</p>
470
+ </div>
471
+ </div>
472
+ </div>
473
+ <div class="large-6 small-6 columns">
474
+ <p>l6 s6</p>
475
+ <div class="row">
476
+ <div class="large-9 small-6 column">
477
+ <p>l9 s6</p>
478
+ </div>
479
+ <div class="large-3 small-6 column">
480
+ <p>l3 s6</p>
481
+ </div>
482
+ </div>
483
+ </div>
468
484
  </div>
485
+
469
486
 
470
487
  <h1>Offset and Source Ordering</h1>
471
488
  <div class="row">
@@ -564,7 +581,7 @@
564
581
 
565
582
  </div>
566
583
  </div>
567
- </div>
584
+ </div> -->
568
585
 
569
586
  <!-- <section class="row" data-page="visibility">
570
587
  <div class="large-12 column">
@@ -676,7 +693,7 @@
676
693
  </section>
677
694
  -->
678
695
 
679
- <!-- <section class="row" data-page="custom-grid">
696
+ <section class="row" data-page="custom-grid">
680
697
  <div class="large-12 column">
681
698
  <div class="demo-grid">
682
699
 
@@ -795,7 +812,7 @@
795
812
 
796
813
  </div>
797
814
  </div>
798
- </section> -->
815
+ </section>
799
816
 
800
817
  <!-- <section class="row" data-page="design-grid">
801
818
  <div class="large-12 column demo-grid">
@@ -2,7 +2,6 @@
2
2
  @import "helpers/sprites";
3
3
  @import "helpers/sticky-footer";
4
4
 
5
- $disable-output : true;
6
5
  $user-mode : true; // add extra feature to some Component's mixin
7
6
 
8
7
  @import "components";
@@ -68,6 +68,8 @@ $column-gutter : 20px !default;
68
68
  // Only collapsed
69
69
  @else if $collapse {
70
70
  margin: 0 auto;
71
+ padding-right: $gutter / 2;
72
+ padding-left: $gutter / 2;
71
73
  width: 100%;
72
74
  max-width: $width;
73
75
 
@@ -84,24 +86,38 @@ $column-gutter : 20px !default;
84
86
 
85
87
  @mixin row(
86
88
  $gutter : 0px,
87
- $width : $row-max-width,
89
+ $width : 0px,
88
90
  $collapse : false) {
89
91
 
90
- // If gutter is passed as param, calculate it
91
- @if $gutter != $column-gutter {
92
- max-width: $width + $gutter;
93
-
94
- @if not $responsive {
95
- min-width: $width + $gutter;
96
- }
97
- }
98
-
92
+ // Nested row, only output if gutter is specified
99
93
  @if $gutter > 0 {
100
94
  .row & {
101
95
  margin-right: -($gutter / 2);
102
96
  margin-left: -($gutter / 2);
97
+ min-width: 0;
98
+ }
99
+ } @else {
100
+ .row & {
101
+ min-width: 0;
103
102
  }
104
103
  }
104
+
105
+ // Set default value if 0
106
+ @if $width == 0 { $width: $row-max-width; }
107
+ @if $gutter == 0 { $gutter: $column-gutter; }
108
+
109
+ // Max width for outer row
110
+ max-width: $width + $gutter;
111
+
112
+ @if not $responsive {
113
+ min-width: $width + $gutter;
114
+ }
115
+
116
+ // Collapsed behavior
117
+ @if $collapse {
118
+ padding-right: $gutter / 2;
119
+ padding-left: $gutter / 2;
120
+ }
105
121
  }
106
122
 
107
123
  // ------------------------------
@@ -281,6 +297,11 @@ $column-gutter : 20px !default;
281
297
  // Collapsed row
282
298
  &.collapse {
283
299
  @include base-row($collapse:true);
300
+
301
+ .row {
302
+ @include base-row($nest:true, $collapse:true);
303
+ }
304
+
284
305
  .column,
285
306
  .columns {
286
307
  @include base-column($collapse:true);
@@ -1,6 +1,6 @@
1
1
  /* ------------------------------------------
2
2
  - EDGE Framework - github.com/HennerS/Edge
3
- - v1.2.2 (Ezalor)
3
+ - v1.2.3 (Ezalor)
4
4
  ------------------------------------------ */
5
5
 
6
6
  @import "edge/base";
@@ -19,30 +19,33 @@ module Edge
19
19
  style_file = File.join(File.dirname(__FILE__), "..", "..", "template", "base", "assets", "sass", "app.scss")
20
20
  create_file "app/assets/stylesheets/app.scss", File.read(style_file)
21
21
 
22
+ script_file = File.join(File.dirname(__FILE__), "..", "..", "template", "rails", "app.js")
23
+ create_file "app/assets/javascripts/app.js", File.read(script_file)
24
+
22
25
  insert_into_file "app/assets/stylesheets/application#{detect_css_format[0]}", "#{detect_css_format[1]} require framework\n", after: "require_self\n"
23
26
  end
24
27
 
25
28
  def detect_js_format
26
- return ['.coffee', '#='] if File.exist?('app/assets/javascripts/application.coffee')
27
- return ['.js.coffee', '#='] if File.exist?('app/assets/javascripts/application.js.coffee')
28
- return ['.js', '//='] if File.exist?('app/assets/javascripts/application.js')
29
+ return [".coffee", "#="] if File.exist?("app/assets/javascripts/application.coffee")
30
+ return [".js.coffee", "#="] if File.exist?("app/assets/javascripts/application.js.coffee")
31
+ return [".js", "//="] if File.exist?("app/assets/javascripts/application.js")
29
32
  end
30
33
 
31
34
  def detect_css_format
32
- return ['.css', ' *='] if File.exist?('app/assets/stylesheets/application.css')
33
- return ['.css.sass', ' //='] if File.exist?('app/assets/stylesheets/application.css.sass')
34
- return ['.sass', ' //='] if File.exist?('app/assets/stylesheets/application.sass')
35
- return ['.css.scss', ' //='] if File.exist?('app/assets/stylesheets/application.css.scss')
36
- return ['.scss', ' //='] if File.exist?('app/assets/stylesheets/application.scss')
35
+ return [".css", " *="] if File.exist?("app/assets/stylesheets/application.css")
36
+ return [".css.sass", " //="] if File.exist?("app/assets/stylesheets/application.css.sass")
37
+ return [".sass", " //="] if File.exist?("app/assets/stylesheets/application.sass")
38
+ return [".css.scss", " //="] if File.exist?("app/assets/stylesheets/application.css.scss")
39
+ return [".scss", " //="] if File.exist?("app/assets/stylesheets/application.scss")
37
40
  end
38
41
 
39
42
  def create_layout
40
43
  if options.haml?||(defined?(Haml) && options.haml?)
41
- template 'application.html.haml', "app/views/layouts/#{file_name}.html.haml"
44
+ template "application.html.haml", "app/views/layouts/#{file_name}.html.haml"
42
45
  elsif options.slim?||(defined?(Slim) && options.slim?)
43
- template 'application.html.slim', "app/views/layouts/#{file_name}.html.slim"
46
+ template "application.html.slim", "app/views/layouts/#{file_name}.html.slim"
44
47
  else
45
- template 'application.html.erb', "app/views/layouts/#{file_name}.html.erb"
48
+ template "application.html.erb", "app/views/layouts/#{file_name}.html.erb"
46
49
  end
47
50
  end
48
51
 
data/lib/edge/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Edge
2
- VERSION = "1.2.2"
2
+ VERSION = "1.2.3"
3
3
  CODENAME = "Ezalor"
4
4
  end
@@ -0,0 +1,6 @@
1
+ function ready() {
2
+ // Your app-specific script here
3
+ }
4
+
5
+ $(document).ready(ready);
6
+ $(document).on("page:load", ready);
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: edge_framework
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.2
4
+ version: 1.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Henner Setyono
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-12 00:00:00.000000000 Z
11
+ date: 2014-06-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
@@ -141,6 +141,7 @@ files:
141
141
  - template/base/gitignore
142
142
  - template/base/robots.txt
143
143
  - template/html/index.html
144
+ - template/rails/app.js
144
145
  - template/rails/application.html.erb
145
146
  - template/wordpress/404.php
146
147
  - template/wordpress/category.php