magic_stylez 0.0.0.28 → 0.0.0.29

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2604b92598681e084f115c2c17583a37b798244e
4
- data.tar.gz: b96a41ee41fe954be9b6916d5e7fe942e4cdf342
3
+ metadata.gz: 80720a105f0b4ff4530a9e109b276ee0ea3120ba
4
+ data.tar.gz: df80a94d1b0e878bd8a47f3a2442c7233d0f0bcc
5
5
  SHA512:
6
- metadata.gz: 2bd6cf50f4d1c01b255f27f7393bfb8d319770c5cef81d80e033e06ccf4a9ca5ac94bb0ee815c104d476dd4460fb2102e0b99d88d94018d9975b927645dff46f
7
- data.tar.gz: a1c023a289e79f62140f50d4c6b4a1a495632148975318c64188ec72ff04ab635bb8ace6d861522680328e57e5ec6fb60e24f57f61a8c7974b92ad27efb4133e
6
+ metadata.gz: 7d045bb77cf38c411d3e532a90e62242ed628c496cb8006f45502643c694129fb0e432aaf316fb2de30862b5144272304307a903550a63d8835d45eebeacf49b
7
+ data.tar.gz: eaa422c4a9aa429a1128122be3f8ff7d8c50f1366fde1ebeecdc3bd846e4398e218b08f55adc86331f80f9e121afa8e972efb9fc508daa617b62dabfd34b8fb1
@@ -7,10 +7,10 @@ module MagicStylez
7
7
  initializer "magic-stylez.assets.precompile" do |app|
8
8
 
9
9
  # compile pictures (this way also from vendor)
10
- config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
10
+ app.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
11
11
 
12
12
  # compile fonts (this way also from vendor)
13
- config.assets.precompile += %w(*.eot *.svg *.ttf *.woff)
13
+ app.config.assets.precompile += %w(*.eot *.svg *.ttf *.woff)
14
14
 
15
15
  end
16
16
  end
@@ -1,3 +1,3 @@
1
1
  module MagicStylez
2
- VERSION = "0.0.0.28"
2
+ VERSION = "0.0.0.29"
3
3
  end
@@ -4,7 +4,14 @@
4
4
  </div>
5
5
  </div>
6
6
 
7
- <div class="section">
7
+ <div class="section dark flatted">
8
+ <div class="corset">
9
+ <h4>dependency:</h4>
10
+ <code>@import "magic/content/box";</code>
11
+ </div>
12
+ </div>
13
+
14
+ <div class="section hard-top">
8
15
  <div class="corset">
9
16
 
10
17
 
@@ -4,9 +4,14 @@
4
4
  </div>
5
5
  </div>
6
6
 
7
+ <div class="section dark flatted">
8
+ <div class="corset">
9
+ <h4>dependency:</h4>
10
+ <code>@import "magic/content/buttons";</code>
11
+ </div>
12
+ </div>
7
13
 
8
-
9
- <div class="section">
14
+ <div class="section hard-top">
10
15
  <div class="corset tight">
11
16
 
12
17
 
@@ -21,7 +26,7 @@
21
26
 
22
27
  <div class="btn btn-default btn-lg btn-block btn-splited half">
23
28
  <div class="icn">
24
- <i class="icomoon-globe"></i>
29
+ <i class="olicons-message-full"></i>
25
30
  </div>
26
31
  <div class="text">
27
32
  .btn-splited.half
@@ -30,7 +35,7 @@
30
35
 
31
36
  <div class="btn btn-primary btn-lg btn-block btn-divided">
32
37
  <div class="icn">
33
- <i class="icomoon-globe"></i>
38
+ <i class="olicons-overview"></i>
34
39
  </div>
35
40
  <div class="text">
36
41
  .btn-divided
@@ -39,7 +44,7 @@
39
44
 
40
45
  <div class="btn btn-warning btn-block btn-divided half">
41
46
  <div class="icn">
42
- <i class="icomoon-globe"></i>
47
+ <i class="olicons-overview"></i>
43
48
  </div>
44
49
  <div class="text">
45
50
  .btn-divided.half
@@ -48,25 +53,25 @@
48
53
 
49
54
  <div class="btn btn-danger btn-sm btn-divided">
50
55
  <div class="icn">
51
- <i class="icomoon-rocket"></i>
56
+ <i class="olicons-contact-data"></i>
52
57
  </div>
53
58
  <div class="text">
54
59
  .btn-divided
55
60
  </div>
56
61
  <div class="icn">
57
- <i class="icomoon-rocket"></i>
62
+ <i class="olicons-male"></i>
58
63
  </div>
59
64
  </div>
60
65
 
61
- <div class="btn btn-danger btn-xs btn-divided">
66
+ <div class="btn btn-default btn-xs btn-splited">
62
67
  <div class="icn">
63
- <i class="icomoon-rocket"></i>
68
+ <i class="olicons-ok"></i>
64
69
  </div>
65
70
  <div class="text">
66
- .btn-divided
71
+ .btn-splited
67
72
  </div>
68
73
  <div class="icn">
69
- <i class="icomoon-rocket"></i>
74
+ <i class="olicons-close"></i>
70
75
  </div>
71
76
  </div>
72
77
 
@@ -74,9 +79,9 @@
74
79
  </div>
75
80
 
76
81
 
77
- <div class="section head">
82
+ <div class="section flat-bottom hard-top">
78
83
  <div class="corset">
79
- <h1>Social Buttons</h1>
84
+ <h2>Social Buttons</h2>
80
85
  </div>
81
86
  </div>
82
87
 
@@ -0,0 +1,176 @@
1
+ <div class="section head">
2
+ <div class="corset">
3
+ <h1>Inputs</h1>
4
+ </div>
5
+ </div>
6
+
7
+ <div class="section dark flatted">
8
+ <div class="corset">
9
+ <h4>dependency:</h4>
10
+ <code>@import "magic/content/forms";</code>
11
+ </div>
12
+ </div>
13
+
14
+ <div class="section hard-top">
15
+ <div class="corset tight">
16
+
17
+ <div class="input-group labeled">
18
+ <div class="input-group-addon">
19
+ <input id="that_check_box" name="user[remember_me]" type="checkbox" value="1">
20
+ </div>
21
+ <label for="that_check_box" class="form-control">
22
+ This is a input-group .labeled
23
+ </label>
24
+ </div>
25
+
26
+ <div class="input-group">
27
+ <div class="input-group-addon">
28
+ <input id="that_check_box2" name="user[remember_me]" type="checkbox" value="1">
29
+ </div>
30
+ <label for="that_check_box2" class="form-control">
31
+ This is a input-group
32
+ </label>
33
+ </div>
34
+
35
+ </div>
36
+ </div>
37
+
38
+ <div class="section dark shine-top">
39
+ <div class="corset">
40
+ <pre><code> &lt;div class=&quot;input-group labeled&quot;&gt;<br/> &lt;div class=&quot;input-group-addon&quot;&gt;<br/> &lt;input id=&quot;that_check_box&quot; name=&quot;user[remember_me]&quot; type=&quot;checkbox&quot; value=&quot;1&quot;&gt; <br/> &lt;/div&gt;<br/> &lt;label for=&quot;that_check_box&quot; class=&quot;form-control&quot;&gt;<br/> This is a label<br/> &lt;/label&gt;<br/> &lt;/div&gt;</code></pre>
41
+ </div>
42
+ </div>
43
+
44
+ <div class="section flat hard-top"></div>
45
+
46
+ <div class="fullpage-table">
47
+ <div class="table-row">
48
+ <div class="banner-box responsive-hero fill">
49
+ <div class="clearfix"></div>
50
+ <form accept-charset="UTF-8" action="#" class="centered-form"method="get">
51
+ <h3>form.centered-form</h3>
52
+ <div class="inpt-group">
53
+ <input class="form-control" id="that_email" name="email" placeholder="Email" type="email">
54
+ <input class="form-control" id="that_password" name="password" placeholder="Passwort" type="password">
55
+ </div>
56
+ <div class="press">
57
+ <input id="that_remember_me" name="user[remember_me]" type="checkbox" value="1">
58
+ <label for="that_remember_me">Remember me</label>
59
+ </div>
60
+ <input class="btn btn-lg btn-primary btn-block" name="commit" type="submit" value="Sign in">
61
+ </form>
62
+ <div class="clearfix"></div>
63
+ </div>
64
+ </div>
65
+ <div class="table-row">
66
+ <div class="form-table-footer">
67
+ <div class="corset center_text">
68
+ <p>This is a form with class <em>.centered-form</em> in a <a href="#layout/fullpage_table"><em>fullpage-table</em></a></p>
69
+ <p>&copy; 2014 berlinmagic</p>
70
+ </div>
71
+ </div>
72
+ </div>
73
+ </div>
74
+
75
+
76
+
77
+
78
+
79
+ <div class="section hard-top dark">
80
+ <div class="corset tight">
81
+ <div class="box">
82
+ <div class="header">
83
+ <h3>Some Form</h3>
84
+ </div>
85
+ <div class="body">
86
+ <form action="#" method="get" accept-charset="utf-8" class="form">
87
+ <div class="row">
88
+ <div class="col-sm-5 press">
89
+ <label>Text-Field</label>
90
+ </div>
91
+ <div class="col-sm-7 press">
92
+ <input type="text" class="form-control">
93
+ </div>
94
+ </div>
95
+ <div class="row">
96
+ <div class="col-sm-5 press">
97
+ <label>check_switch</label>
98
+ </div>
99
+ <div class="col-sm-3 press">
100
+ <div class="check_switch">
101
+ <div class="switch_toggle"></div>
102
+ </div>
103
+ </div>
104
+ <div class="col-sm-4 press">
105
+ <div class="check">
106
+ <a href="#" class="checka"><i class="icon-ok"></i></a>
107
+ </div>
108
+ </div>
109
+ </div>
110
+ <div class="row">
111
+ <div class="col-sm-5 press">
112
+ <label>Text-Field</label>
113
+ </div>
114
+ <div class="col-sm-7 press">
115
+ <input type="text" class="form-control">
116
+ </div>
117
+ </div>
118
+ <div class="row">
119
+ <div class="col-sm-5 press">
120
+ <label>Text-Field</label>
121
+ </div>
122
+ <div class="col-sm-7 press">
123
+ <textarea class="form-control"></textarea>
124
+ </div>
125
+ </div>
126
+ <hr/>
127
+ <div class="row">
128
+ <div class="col-sm-4">
129
+ <button class="btn btn-success btn-splited" type="submit">
130
+ <span>Continue</span>
131
+ <span class="icn">→</span>
132
+ </button>
133
+ </div>
134
+ <div class="col-sm-4">
135
+ <button class="btn btn-default btn-block" type="reset">
136
+ Reset
137
+ </button>
138
+ </div>
139
+ <div class="col-sm-4 press">
140
+ &nbsp;
141
+ </div>
142
+ </div>
143
+ </form>
144
+ </div>
145
+ </div>
146
+ </div>
147
+ </div>
148
+
149
+ <div class="section shine-top shine-bottom">
150
+ <div class="corset tight">
151
+ <div class="row">
152
+ <div class="col-sm-4">
153
+ <div class="inpt-splited">
154
+ <span class="icn"><i class="icomoon-mail2"></i></span>
155
+ <div class="inpt">
156
+ <input placeholder="Email" type="email" value="">
157
+ </div>
158
+ </div>
159
+ </div>
160
+ <div class="col-sm-4">
161
+ <div class="inpt-splited">
162
+ <span class="icn"><i class="icomoon-lock"></i></span>
163
+ <div class="inpt">
164
+ <input placeholder="Password" type="password" value="">
165
+ </div>
166
+ </div>
167
+ </div>
168
+ <div class="col-sm-4">
169
+ <button class="btn btn-success btn-splited" type="submit">
170
+ <span>Continue</span>
171
+ <span class="icn">→</span>
172
+ </button>
173
+ </div>
174
+ </div>
175
+ </div>
176
+ </div>
@@ -4,9 +4,14 @@
4
4
  </div>
5
5
  </div>
6
6
 
7
+ <div class="section dark flatted">
8
+ <div class="corset">
9
+ <h4>dependency:</h4>
10
+ <code>@import "magic/content/inputs";</code>
11
+ </div>
12
+ </div>
7
13
 
8
-
9
- <div class="section">
14
+ <div class="section hard-top">
10
15
  <div class="corset tight">
11
16
 
12
17
  <div class="inpt-splited input-lg">
@@ -7,7 +7,16 @@
7
7
  <div class="section dark flatted">
8
8
  <div class="corset">
9
9
  <h4>dependency:</h4>
10
- <code>@import "magic/elements/circle_diagram";</code>
10
+ <table class="table table-condensed">
11
+ <tr>
12
+ <th>sass</th>
13
+ <td><code>@import "magic/elements/circle_diagram";</code></td>
14
+ </tr>
15
+ <tr>
16
+ <th>js </th>
17
+ <td><code>//= magic/circle_diagram</code></td>
18
+ </tr>
19
+ </table>
11
20
  </div>
12
21
  </div>
13
22
 
@@ -27,13 +27,12 @@
27
27
  <div class="corset">
28
28
 
29
29
  <p class="loud">Arrow Hints can be used on every element, just add class 'help_arrow' and data-intro attribute with your Hint text.</p>
30
- <p class="loud"><strong>Be carefull! Arrow and Hint are absolute positioned, so they may overlap other content.</strong></p>
31
30
  <pre>
32
31
  <code>
33
32
  &lt;button class=&quot;btn btn-success help_arrow&quot; data-text=&quot;Go baby Go!&quot;&gt;<br/> Click Me<br/> &lt;/button&gt;
34
33
  </code>
35
34
  </pre>
36
-
35
+ <p class="highlight">Be carefull! Arrow and Hint are absolute positioned, so they may overlap other content.</p>
37
36
  </div>
38
37
  </div>
39
38
 
@@ -19,22 +19,32 @@
19
19
  </div>
20
20
  </div>
21
21
 
22
- <div class="section head">
22
+
23
+
24
+ <div class="section shine-top">
23
25
  <div class="corset">
24
- <h3>Usage:</h3>
26
+ <h2>Usage:</h2>
27
+ <pre><code>
28
+ &lt;span class=&quot;crossed&quot; data-text=&quot;power&quot;&gt;help&lt;/span&gt;
29
+ </code></pre>
30
+ <p class="loud"><strong>Absolute positioned .. needs space!</strong></p>
25
31
  </div>
26
32
  </div>
27
33
 
28
34
 
29
35
 
30
-
31
- <div class="section shine-top">
36
+ <div class="section hard-top fat">
32
37
  <div class="corset">
33
- <pre>
34
- <code>
35
- &lt;span class=&quot;crossed&quot; data-text=&quot;power&quot;&gt;help&lt;/span&gt;
36
- </code>
37
- </pre>
38
- <p class="loud"><strong>Absolute psitioned .. needs space!</strong></p>
38
+ <p class="loud">Allways provide enough space over the changed text</p>
39
+ <div class="divider">
40
+ <p>Good example:</p>
41
+ </div>
42
+ <br/>
43
+ <p class="loud">Hello <span class="crossed" data-text="You!">World</span> you look great today!</p>
44
+ <div class="divider">
45
+ <p>Bad example:</p>
46
+ </div>
47
+ <p class="loud">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in <span class="crossed" data-text="consectetur">voluptate</span> velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
48
+
39
49
  </div>
40
50
  </div>
@@ -4,13 +4,6 @@
4
4
  </div>
5
5
  </div>
6
6
 
7
- <div class="section dark flatted">
8
- <div class="corset">
9
- <h4>dependency: <small>(packable)</small></h4>
10
- <code>@import "magic/icons/glyphicons";</code>
11
- </div>
12
- </div>
13
-
14
7
  <div class="section hard-top">
15
8
  <div class="corset">
16
9
 
@@ -37,16 +37,17 @@
37
37
 
38
38
  <div class="main_content fixed-nav-xl">
39
39
 
40
-
41
40
  <div class="section brand">
42
41
  <div class="corset">
43
42
  <h1>usual twbs header plus some improvements</h1>
44
43
  <br/>
45
44
  <p class="loud">just niced up button alignment (no <em>.navbar-btn</em> needed) .. add sizes: <em>.navbar-xs, .navbar-sm, .navbar-lg, .navbar-xl</em></p>
46
-
45
+ <br/>
46
+ <h4>dependency:</h4>
47
+ <code>@import "magic/content/navbar";</code>
47
48
  </div>
48
49
  </div>
49
-
50
+
50
51
  <%= render "templates/lorem" %>
51
52
 
52
53
 
@@ -38,7 +38,6 @@
38
38
 
39
39
  <div class="main_content fixed-nav">
40
40
 
41
-
42
41
  <div class="section brand">
43
42
  <div class="corset">
44
43
  <h1>Responsive Slidebar</h1>
@@ -47,6 +46,9 @@
47
46
  Turns the usual twbs <em>navbar-collapse</em> into a nice slidebar. .. try it out:<br/>
48
47
  make your screen smaller than 768px and press the header-toggle
49
48
  </p>
49
+ <br/>
50
+ <h4>dependency:</h4>
51
+ <code>@import "magic/content/navbar";</code>
50
52
  </div>
51
53
  </div>
52
54
 
@@ -9,7 +9,7 @@
9
9
  .form-control {
10
10
  position: relative;
11
11
  @include border-radius(0);
12
- margin: 0 0 -1px;
12
+ margin: 0 0 -1px !important;
13
13
  padding: 10px;
14
14
  font-size: 16px;
15
15
 
@@ -145,6 +145,8 @@ form.corset, .form {
145
145
 
146
146
 
147
147
 
148
+
149
+
148
150
  .fullpage-table > .table-row > * {
149
151
  .btn-group-block { margin: 0; }
150
152
  .btn-group-block.dropdown-toggle, .btn-group-block.new_order_link {
@@ -175,6 +177,12 @@ form.corset, .form {
175
177
  margin-top: 10px;
176
178
  }
177
179
 
180
+ .inpt-group {
181
+ display: block; position: relative;
182
+ margin: 0 0 20px; padding: 0;
183
+ .form-control { margin-top: 0; margin-bottom: 0; }
184
+ }
185
+
178
186
 
179
187
  @include all_form_elements {
180
188
  &.form-control.half { @include horizontal-margin( auto ); width: 50%; }
@@ -104,6 +104,7 @@ body, #body, #container, .main-content, .main_content {
104
104
  .navbar-collapse {
105
105
  display: block; position: fixed;
106
106
  top: 0; right: auto; bottom: 0; left: 0;
107
+ margin: 0;
107
108
  background: $dark-bg;
108
109
  @include transform( translateZ( 0 ) );
109
110
  @include transform( translateX( -222px ) );
@@ -31,6 +31,7 @@ $olicons-class-name: "olicons";
31
31
  font-family: orderlifticonsregular;
32
32
  font-weight: normal;
33
33
  font-style: normal;
34
+ font-size: 1.4em; // make them bigger
34
35
  display: block;
35
36
  position: relative;
36
37
  // top: 0; right: 0; bottom: 0; left: 0;
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.28
4
+ version: 0.0.0.29
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-06-27 00:00:00.000000000 Z
11
+ date: 2014-06-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -219,11 +219,12 @@ files:
219
219
  - test/dummy/app/assets/javascripts/blank.js
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
+ - test/dummy/app/assets/javascripts/views/content/buttons.jst.eco
223
+ - test/dummy/app/assets/javascripts/views/content/forms.jst.eco
224
+ - test/dummy/app/assets/javascripts/views/content/inputs.jst.eco
222
225
  - test/dummy/app/assets/javascripts/views/effects/reflections.jst.eco
223
226
  - test/dummy/app/assets/javascripts/views/effects/shadows.jst.eco
224
- - test/dummy/app/assets/javascripts/views/elements/buttons.jst.eco
225
227
  - test/dummy/app/assets/javascripts/views/elements/circle_diagram.jst.eco
226
- - test/dummy/app/assets/javascripts/views/elements/inputs.jst.eco
227
228
  - test/dummy/app/assets/javascripts/views/helper/arrow_infos.jst.eco
228
229
  - test/dummy/app/assets/javascripts/views/helper/crossed_text.jst.eco
229
230
  - test/dummy/app/assets/javascripts/views/helper/divider.jst.eco
@@ -420,11 +421,12 @@ test_files:
420
421
  - test/dummy/app/assets/javascripts/blank.js
421
422
  - test/dummy/app/assets/javascripts/views/app/start.jst.eco
422
423
  - test/dummy/app/assets/javascripts/views/content/box.jst.eco
424
+ - test/dummy/app/assets/javascripts/views/content/buttons.jst.eco
425
+ - test/dummy/app/assets/javascripts/views/content/forms.jst.eco
426
+ - test/dummy/app/assets/javascripts/views/content/inputs.jst.eco
423
427
  - test/dummy/app/assets/javascripts/views/effects/reflections.jst.eco
424
428
  - test/dummy/app/assets/javascripts/views/effects/shadows.jst.eco
425
- - test/dummy/app/assets/javascripts/views/elements/buttons.jst.eco
426
429
  - test/dummy/app/assets/javascripts/views/elements/circle_diagram.jst.eco
427
- - test/dummy/app/assets/javascripts/views/elements/inputs.jst.eco
428
430
  - test/dummy/app/assets/javascripts/views/helper/arrow_infos.jst.eco
429
431
  - test/dummy/app/assets/javascripts/views/helper/crossed_text.jst.eco
430
432
  - test/dummy/app/assets/javascripts/views/helper/divider.jst.eco