magic_stylez 0.0.0.54 → 0.0.0.55
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 +4 -4
- data/README.md +5 -0
- data/lib/magic_stylez/version.rb +1 -1
- data/test/dummy/app/assets/javascripts/app.js.coffee +5 -0
- data/test/dummy/app/assets/javascripts/views/app/start.jst.eco +21 -2
- data/test/dummy/app/assets/stylesheets/application.css.scss +63 -13
- data/test/dummy/app/assets/stylesheets/corporate/_colors.scss +1 -1
- data/test/dummy/app/assets/stylesheets/corporate/_fonts.scss +83 -122
- data/test/dummy/app/views/front/start.html.erb +10 -2
- data/test/dummy/app/views/layouts/application.html.erb +17 -0
- data/test/dummy/app/views/layouts/blank.html.erb +1 -0
- data/test/dummy/public/html/aside-nav.html +3 -2
- data/test/dummy/public/html/fixed-header.html +3 -2
- data/test/dummy/public/html/fixed-subnav.html +3 -2
- data/test/dummy/public/html/index.html +28 -5
- data/test/dummy/public/html/slidebar-header.html +3 -2
- data/test/dummy/public/html/slidebar-subnav.html +3 -2
- data/vendor/assets/stylesheets/corporate/_colors.scss +1 -1
- data/vendor/assets/stylesheets/corporate/_fonts.scss +83 -122
- data/vendor/assets/stylesheets/magic/helper/_text.scss +68 -0
- data/vendor/assets/stylesheets/magic/layout/_section.scss +13 -0
- data/vendor/assets/stylesheets/magic/lib/_text.scss +47 -0
- data/vendor/assets/stylesheets/magic/lib/_twbs.scss +0 -1
- data/vendor/assets/stylesheets/magic-min.scss +3 -0
- data/vendor/assets/stylesheets/magic-stylez.scss +3 -0
- metadata +3 -5
- data/test/dummy/app/assets/stylesheets/corporate/_typo.scss +0 -85
- data/vendor/assets/stylesheets/corporate/_typo.scss +0 -85
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5c37b2b4c964bd60532d73de7d9612720c3f4c73
|
|
4
|
+
data.tar.gz: 06b874af648d1d469235c4303c2d217b38c3a42f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 69a3816d91757d2d492ee4cbf1b69a0fc6be162c0d5a2f740076915d53d05678960d3c13c8ebc14d8590eb296f04655e0eef6755c9d02c03091039e4605d56e2
|
|
7
|
+
data.tar.gz: c1251269fe2fd600835bfdc6082a4bc56f951f71479e6f8f0aae3d928a9c4135848d8d16c1df0a2dbcf97a5428935fb97abf51c0a154fea4dbc22a81eec53748
|
data/README.md
CHANGED
|
@@ -44,6 +44,11 @@
|
|
|
44
44
|
$ rails g magic_stylez:update
|
|
45
45
|
```
|
|
46
46
|
|
|
47
|
+
#### Changes when update to <small>0.0.0.55</small>:</h4>
|
|
48
|
+
- *corporate/typo* is removed!
|
|
49
|
+
- *corporate/fonts* doesn't contain css anymore, just variables
|
|
50
|
+
With Version **0.0.0.55** I merged *corporate/typo* into *corporate/fonts* (they where so similar). I also removed all css from *corporate/fonts*, because it causes trouble with update generator (and also is not a variable).
|
|
51
|
+
|
|
47
52
|
|
|
48
53
|
|
|
49
54
|
### Thanks
|
data/lib/magic_stylez/version.rb
CHANGED
|
@@ -29,12 +29,17 @@ navigate = ->
|
|
|
29
29
|
else
|
|
30
30
|
nul.closest("li").addClass("current")
|
|
31
31
|
lnk.addClass("active")
|
|
32
|
+
$("body").removeClass("aside-on")
|
|
32
33
|
loadCircles()
|
|
34
|
+
$("#current-view-name").text( lnk.text() )
|
|
33
35
|
currentPath = path
|
|
34
36
|
|
|
35
37
|
|
|
36
38
|
|
|
37
39
|
$ ->
|
|
40
|
+
$("body").on "click", "#mobile_header", ->
|
|
41
|
+
$("body").toggleClass("aside-on")
|
|
42
|
+
false
|
|
38
43
|
|
|
39
44
|
$("body").on "click", ".hide_da_notice", ->
|
|
40
45
|
$("body").toggleClass("with_important_notice")
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<div class="section head">
|
|
2
2
|
<div class="corset">
|
|
3
3
|
<div class="row">
|
|
4
|
-
<div class="col-sm-9">
|
|
4
|
+
<div class="col-sm-9 col-xs-6">
|
|
5
5
|
<h1>magic-stylez</h1>
|
|
6
6
|
</div>
|
|
7
|
-
<div class="col-sm-3">
|
|
7
|
+
<div class="col-sm-3 col-xs-6">
|
|
8
8
|
<a href="https://github.com/berlinmagic/magic_stylez/tree/master" target="_blank" class="btn btn-sm btn-default btn-divided pull-right">
|
|
9
9
|
<span class="icn"><i class="icomoon-github3"></i></span>
|
|
10
10
|
<span>SourceCode</span>
|
|
@@ -65,6 +65,25 @@ CSS:
|
|
|
65
65
|
</div>
|
|
66
66
|
</div>
|
|
67
67
|
|
|
68
|
+
<div class="section hard-top">
|
|
69
|
+
<div class="corset tight">
|
|
70
|
+
<h2 class="loud">NEW*</h2>
|
|
71
|
+
<hr/>
|
|
72
|
+
<p class="highlight"><i class="olicons-hide-filter"></i> magic-styles update generator</p>
|
|
73
|
+
<p class="loud"><i class="olicons-hide-filter"></i> in the process I often add new variables to the corporate files</p>
|
|
74
|
+
<p class="loud"><i class="olicons-hide-filter"></i> what causes "Missing variable!" when you update to new version</p>
|
|
75
|
+
<p class="loud"><i class="olicons-hide-filter"></i> this generator adds all new variables without touching your settings</p>
|
|
76
|
+
<pre><code>$ rails g magic_stylez:update</code></pre>
|
|
77
|
+
<br/>
|
|
78
|
+
<br/>
|
|
79
|
+
<h4>Changes when update to <small>0.0.0.55</small>:</h4>
|
|
80
|
+
<ul>
|
|
81
|
+
<li><em>corporate/typo</em> is removed!</li>
|
|
82
|
+
<li><em>corporate/fonts</em> doesn't contain css, just variables</li>
|
|
83
|
+
</ul>
|
|
84
|
+
<p>With Version <strong>0.0.0.55</strong> I merged <em>corporate/typo</em> into <em>corporate/fonts</em> (they where so similar). I also removed all css from <em>corporate/fonts</em>, because it causes trouble with update generator (and also is not a variable).</p>
|
|
85
|
+
</div>
|
|
86
|
+
</div>
|
|
68
87
|
|
|
69
88
|
<div class="section hard-top">
|
|
70
89
|
<div class="corset tight">
|
|
@@ -10,7 +10,7 @@ body {
|
|
|
10
10
|
background: #fff;
|
|
11
11
|
}
|
|
12
12
|
&.main_template {
|
|
13
|
-
padding: 0 0 0
|
|
13
|
+
padding: 40px 0 0 0;
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
|
|
@@ -29,6 +29,66 @@ body {
|
|
|
29
29
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
|
|
33
|
+
#aside {
|
|
34
|
+
// @mixin single_shine( $color, $times: 3, $position: right, $width: 5px, $blur: 5px, $size: 0, $corner: 100 )
|
|
35
|
+
display: block; position: fixed;
|
|
36
|
+
top: 40px; right: auto; bottom: 0; left: 0;
|
|
37
|
+
width: 220px;
|
|
38
|
+
z-index: 99999;
|
|
39
|
+
background: #e5e5e5;
|
|
40
|
+
// box-shadow: inset -2px 0 3px 0 #000;
|
|
41
|
+
border-right: solid 1px #ccc;
|
|
42
|
+
overflow-y: scroll;
|
|
43
|
+
.btn { width: 90%; margin: 0 auto; }
|
|
44
|
+
@include transform( translateZ( 0 ) );
|
|
45
|
+
@include transform( translateX( -222px ) );
|
|
46
|
+
@include transition (all 0.5s ease-in-out);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
#mobile_header {
|
|
52
|
+
position: fixed;
|
|
53
|
+
top: 0; right: 0; left: 0;
|
|
54
|
+
height: 40px; line-height: 40px;
|
|
55
|
+
z-index: 999999;
|
|
56
|
+
@include linear-gradient( #222, #111 );
|
|
57
|
+
color: #ccc;
|
|
58
|
+
text-shadow: 0 1px 1px #000;
|
|
59
|
+
i, i:before { font-size: 24px; line-height: 40px;}
|
|
60
|
+
text-decoration: none;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
body.aside-on {
|
|
64
|
+
#aside { @include transform( translateX( 0 ) ); }
|
|
65
|
+
#mobile_header { color: #069; }
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
@include responsiveStep-sm {
|
|
70
|
+
|
|
71
|
+
body {
|
|
72
|
+
&.main_template {
|
|
73
|
+
padding: 0 0 0 220px;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
#aside {
|
|
78
|
+
@include single_shine( rgba(0,0,0,.23), 1, right, 10px );
|
|
79
|
+
display: block; position: fixed;
|
|
80
|
+
top: 0;
|
|
81
|
+
@include transform( translateX( 0 ) );
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
#mobile_header {
|
|
85
|
+
display: none;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
|
|
32
92
|
.check_switch {
|
|
33
93
|
display: block; position: relative; margin: 0; padding: 0;
|
|
34
94
|
margin: 7px 0 0 7px;
|
|
@@ -105,18 +165,8 @@ body {
|
|
|
105
165
|
}
|
|
106
166
|
|
|
107
167
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
@include single_shine( rgba(0,0,0,.23), 1, right, 10px );
|
|
111
|
-
display: block; position: fixed;
|
|
112
|
-
top: 0; right: auto; bottom: 0; left: 0;
|
|
113
|
-
width: 220px;
|
|
114
|
-
z-index: 99;
|
|
115
|
-
// box-shadow: inset -2px 0 3px 0 #000;
|
|
116
|
-
border-right: solid 1px #ccc;
|
|
117
|
-
overflow-y: scroll;
|
|
118
|
-
.btn { width: 90%; margin: 0 auto; }
|
|
119
|
-
}
|
|
168
|
+
|
|
169
|
+
|
|
120
170
|
|
|
121
171
|
ul.list {
|
|
122
172
|
display: block; position: relative;
|
|
@@ -1,159 +1,120 @@
|
|
|
1
1
|
//
|
|
2
2
|
// Magic-Stylez - Fonts
|
|
3
3
|
//
|
|
4
|
-
// if you like to change values, remove the '!default' flag!
|
|
5
4
|
//
|
|
5
|
+
// webfonts
|
|
6
6
|
//
|
|
7
|
-
//
|
|
7
|
+
// goolge
|
|
8
|
+
// $magicSans: "Open Sans", $sansFontFamily;
|
|
9
|
+
// $magicCondensedSans: "Open Sans Condensed", $sansFontFamily;
|
|
10
|
+
// $magicHandwritten: 'Satisfy', cursive;
|
|
8
11
|
//
|
|
9
|
-
|
|
10
|
-
$
|
|
11
|
-
$
|
|
12
|
-
$
|
|
13
|
-
|
|
12
|
+
// typekit (Adobe)
|
|
13
|
+
// $magicSans: "Montserrat", $sansFontFamily;
|
|
14
|
+
// $magicCondensedSans: "Lato", $sansFontFamily;
|
|
15
|
+
// $magicHandwritten: "ff-market-web", cursive;
|
|
14
16
|
|
|
15
17
|
//
|
|
16
|
-
//
|
|
18
|
+
// F O N T S
|
|
17
19
|
//
|
|
20
|
+
$sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
|
|
21
|
+
$serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
|
|
22
|
+
$monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace !default;
|
|
18
23
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
// $magicHandwritten: 'Satisfy', cursive;
|
|
24
|
+
$magicSans: $sansFontFamily !default;
|
|
25
|
+
$magicCondensedSans: $sansFontFamily !default;
|
|
26
|
+
$magicHandwritten: 'Gloria Hallelujah', cursive !default;
|
|
23
27
|
|
|
24
|
-
//
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
$
|
|
30
|
-
$magicCondensedSans: $sansFontFamily;
|
|
31
|
-
$magicHandwritten: 'Gloria Hallelujah', cursive;
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
// Open Sans
|
|
37
|
-
.sans {
|
|
38
|
-
font-family: $magicSans;
|
|
39
|
-
font-weight: 400;
|
|
40
|
-
&.thin, .thin { font-weight: 300; }
|
|
41
|
-
&.regular, .regular { font-weight: 400; }
|
|
42
|
-
&.sbold, .sbold { font-weight: 600; }
|
|
43
|
-
&.bold, .bold { font-weight: 700; }
|
|
44
|
-
&.ebold, .ebold { font-weight: 800; }
|
|
45
|
-
}
|
|
46
|
-
@mixin sansThin {
|
|
47
|
-
// font-family: 'Open Sans', sans-serif;
|
|
48
|
-
font-family: $magicSans;
|
|
49
|
-
font-weight: 300;
|
|
50
|
-
}
|
|
51
|
-
@mixin sansRegular {
|
|
52
|
-
font-family: $magicSans;
|
|
53
|
-
font-weight: 400;
|
|
54
|
-
}
|
|
55
|
-
@mixin sansSemi {
|
|
56
|
-
font-family: $magicSans;
|
|
57
|
-
font-weight: 600;
|
|
58
|
-
}
|
|
59
|
-
@mixin sansBold {
|
|
60
|
-
font-family: $magicSans;
|
|
61
|
-
font-weight: 700;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
// Open Sans Condensed
|
|
66
|
-
.sansCondensed {
|
|
67
|
-
font-family: $magicCondensedSans;
|
|
68
|
-
font-weight: 300;
|
|
69
|
-
&.thin, .thin { font-weight: 300; }
|
|
70
|
-
&.bold, .bold { font-weight: 700; }
|
|
71
|
-
}
|
|
72
|
-
@mixin sansCondensedThin {
|
|
73
|
-
font-family: $magicCondensedSans;
|
|
74
|
-
font-weight: 300;
|
|
75
|
-
}
|
|
76
|
-
@mixin sansCondensedBold {
|
|
77
|
-
font-family: $magicCondensedSans;
|
|
78
|
-
font-weight: 700;
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
// Specials
|
|
83
|
-
.handWrittenFont {
|
|
84
|
-
font-family: $magicHandwritten;
|
|
85
|
-
font-weight: 400;
|
|
86
|
-
}
|
|
87
|
-
@mixin handWrittenFont {
|
|
88
|
-
font-family: $magicHandwritten;
|
|
89
|
-
font-weight: 400;
|
|
90
|
-
}
|
|
28
|
+
// variable
|
|
29
|
+
$smallReadFont: $magicCondensedSans !default;
|
|
30
|
+
$readFont: $magicSans !default;
|
|
31
|
+
$bigFont: $magicSans !default;
|
|
32
|
+
$alternateBigFont: $magicSans !default;
|
|
33
|
+
$dekoFont: $magicHandwritten !default;
|
|
91
34
|
|
|
92
35
|
|
|
36
|
+
$font-family-sans-serif: $readFont !default;
|
|
37
|
+
$font-family-serif: $serifFontFamily !default;
|
|
38
|
+
$font-family-base: $smallReadFont !default;
|
|
39
|
+
$font-family-monospace: $monoFontFamily !default;
|
|
40
|
+
$font-family-handwriten: $magicHandwritten !default;
|
|
93
41
|
|
|
94
|
-
// variable
|
|
95
|
-
$smallReadFont: $magicCondensedSans;
|
|
96
|
-
$readFont: $magicSans;
|
|
97
|
-
$bigFont: $magicSans;
|
|
98
|
-
$alternateBigFont: $magicSans;
|
|
99
|
-
$dekoFont: $magicHandwritten;
|
|
100
42
|
|
|
43
|
+
// Short-Forms
|
|
44
|
+
$font-family-sans: $font-family-sans-serif !default;
|
|
45
|
+
$font-family-mono: $font-family-monospace !default;
|
|
46
|
+
$font-family-hand: $font-family-handwriten !default;
|
|
47
|
+
$font-family-sm: $smallReadFont !default;
|
|
48
|
+
$font-family-lg: $bigFont !default;
|
|
101
49
|
|
|
102
|
-
//
|
|
103
|
-
|
|
104
|
-
@mixin readFont { font-family: $readFont; }
|
|
105
|
-
@mixin bigFont { font-family: $bigFont; }
|
|
106
|
-
@mixin alternateBigFont { font-family: $alternateBigFont; }
|
|
107
|
-
@mixin dekoFont { font-family: $dekoFont; }
|
|
50
|
+
// $headings-font-family: inherit !default;
|
|
51
|
+
$headings-font-family: $bigFont !default;
|
|
108
52
|
|
|
109
|
-
.smallReadFont { @include smallReadFont; }
|
|
110
|
-
.readFont { @include readFont; }
|
|
111
|
-
.bigFont { @include bigFont; }
|
|
112
|
-
.alternateBigFont { @include alternateBigFont; }
|
|
113
|
-
.dekoFont { @include dekoFont; }
|
|
114
53
|
|
|
54
|
+
//
|
|
55
|
+
// F O N T - S I Z E S
|
|
56
|
+
//
|
|
57
|
+
$font-size-base: 15px !default;
|
|
58
|
+
$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
|
|
59
|
+
$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
|
|
115
60
|
|
|
61
|
+
$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
|
|
62
|
+
$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
|
|
63
|
+
$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
|
|
64
|
+
$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
|
|
65
|
+
$font-size-h5: $font-size-base !default;
|
|
66
|
+
$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
|
|
116
67
|
|
|
68
|
+
$magicDefaultFontSize: 13px !default;
|
|
69
|
+
$magicDefaultLineHight: 18px !default;
|
|
117
70
|
|
|
71
|
+
$loud-factor: 1.25 !default;
|
|
72
|
+
$louder-factor: 1.75 !default;
|
|
118
73
|
|
|
119
74
|
|
|
120
75
|
|
|
76
|
+
//
|
|
77
|
+
// L I N E - H E I G H T S
|
|
78
|
+
//
|
|
79
|
+
//** Unit-less `line-height` for use in components like buttons.
|
|
80
|
+
$line-height-base: 1.428571429 !default; // 20/14
|
|
81
|
+
$line-height-large: 1.33 !default;
|
|
82
|
+
$line-height-small: 1.5 !default;
|
|
121
83
|
|
|
84
|
+
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
|
|
85
|
+
$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
|
|
86
|
+
$line-height-computed-lg: floor(($font-size-large * $line-height-large)) !default; // ~20px
|
|
87
|
+
$line-height-computed-sm: floor(($font-size-small * $line-height-small)) !default; // ~20px
|
|
88
|
+
$line-height-computed-xs: floor(($font-size-small * $line-height-small)) !default; // ~20px
|
|
89
|
+
//== Headings
|
|
90
|
+
$headings-line-height: 1.1 !default;
|
|
122
91
|
|
|
123
92
|
|
|
124
|
-
// C S S - F O N T S
|
|
125
93
|
|
|
126
|
-
|
|
94
|
+
//
|
|
95
|
+
// F O N T - W E I G H T S
|
|
96
|
+
//
|
|
97
|
+
$font-weight-bold: 600 !default;
|
|
98
|
+
$font-weight-thin: 200 !default;
|
|
99
|
+
//== Headings
|
|
100
|
+
$headings-font-weight: 500 !default;
|
|
101
|
+
//== Buttons
|
|
102
|
+
$btn-font-weight: normal !default;
|
|
127
103
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
}
|
|
104
|
+
$magicSans-font-weight-thin: 300 !default;
|
|
105
|
+
$magicSans-font-weight-regular: 400 !default;
|
|
106
|
+
$magicSans-font-weight-semi: 600 !default;
|
|
107
|
+
$magicSans-font-weight-bold: 700 !default;
|
|
108
|
+
$magicSans-font-weight-extra: 800 !default;
|
|
134
109
|
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
line-height: 20px;
|
|
139
|
-
}
|
|
110
|
+
$magicCondensedSans-font-weight-thin: 300 !default;
|
|
111
|
+
$magicCondensedSans-font-weight-regular: 400 !default;
|
|
112
|
+
$magicCondensedSans-font-weight-bold: 700 !default;
|
|
140
113
|
|
|
141
|
-
|
|
142
|
-
@include sansRegular;
|
|
143
|
-
font-size: 12px;
|
|
144
|
-
line-height: 20px;
|
|
145
|
-
}
|
|
114
|
+
$magicHandwritten-font-weight: 400 !default;
|
|
146
115
|
|
|
147
116
|
|
|
148
|
-
// ------------------------------- S C H R I F T G R O E S S E N -------------------------------
|
|
149
117
|
|
|
150
|
-
$magicDefaultFontSize: 13px;
|
|
151
|
-
$magicDefaultLineHight: 18px;
|
|
152
118
|
|
|
153
119
|
|
|
154
|
-
@mixin magicDefaultFont {
|
|
155
|
-
@include readFont;
|
|
156
|
-
font-size: $magicDefaultFontSize;
|
|
157
|
-
line-height: $magicDefaultLineHight;
|
|
158
|
-
} // ..
|
|
159
120
|
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<div class="section head">
|
|
2
2
|
<div class="corset">
|
|
3
3
|
<div class="row">
|
|
4
|
-
<div class="col-sm-9">
|
|
4
|
+
<div class="col-sm-9 col-xs-6">
|
|
5
5
|
<h1>magic-stylez</h1>
|
|
6
6
|
</div>
|
|
7
|
-
<div class="col-sm-3">
|
|
7
|
+
<div class="col-sm-3 col-xs-6">
|
|
8
8
|
<a href="https://github.com/berlinmagic/magic_stylez/tree/master" target="_blank" class="btn btn-sm btn-default btn-divided pull-right">
|
|
9
9
|
<span class="icn"><i class="icomoon-github3"></i></span>
|
|
10
10
|
<span>SourceCode</span>
|
|
@@ -75,6 +75,14 @@ CSS:
|
|
|
75
75
|
<p class="loud"><i class="olicons-hide-filter"></i> what causes "Missing variable!" when you update to new version</p>
|
|
76
76
|
<p class="loud"><i class="olicons-hide-filter"></i> this generator adds all new variables without touching your settings</p>
|
|
77
77
|
<pre><code>$ rails g magic_stylez:update</code></pre>
|
|
78
|
+
<br/>
|
|
79
|
+
<br/>
|
|
80
|
+
<h4>Changes when update to <small>0.0.0.55</small>:</h4>
|
|
81
|
+
<ul>
|
|
82
|
+
<li><em>corporate/typo</em> is removed!</li>
|
|
83
|
+
<li><em>corporate/fonts</em> doesn't contain css, just variables</li>
|
|
84
|
+
</ul>
|
|
85
|
+
<p>With Version <strong>0.0.0.55</strong> I merged <em>corporate/typo</em> into <em>corporate/fonts</em> (they where so similar). I also removed all css from <em>corporate/fonts</em>, because it causes trouble with update generator (and also is not a variable).</p>
|
|
78
86
|
</div>
|
|
79
87
|
</div>
|
|
80
88
|
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
<!DOCTYPE html>
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
|
+
<meta charset="UTF-8" />
|
|
4
5
|
<title>Magic-Stylez</title>
|
|
6
|
+
<%# === App-View === #%>
|
|
7
|
+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
|
8
|
+
<%# === iOS-App-View === #%>
|
|
9
|
+
<meta name="apple-mobile-web-app-capable" content="yes" />
|
|
10
|
+
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
|
5
11
|
<%= stylesheet_link_tag 'application', media: 'all' %>
|
|
6
12
|
<%= javascript_include_tag 'application' %>
|
|
7
13
|
<%= csrf_meta_tags %>
|
|
@@ -25,6 +31,17 @@
|
|
|
25
31
|
</script>
|
|
26
32
|
</head>
|
|
27
33
|
<body class="main_template">
|
|
34
|
+
<a href="#" id="mobile_header" class="inline_table center_text">
|
|
35
|
+
<div class="cell icn col-1 middle">
|
|
36
|
+
<i class="olicons-show-sb"></i>
|
|
37
|
+
</div>
|
|
38
|
+
<div class="cell col-10 middle">
|
|
39
|
+
<span id="current-view-name">Magic-Stylez</span>
|
|
40
|
+
</div>
|
|
41
|
+
<div class="cell icn col-1 middle">
|
|
42
|
+
<i class="olicons-show-sb"></i>
|
|
43
|
+
</div>
|
|
44
|
+
</a>
|
|
28
45
|
<%= render "front/aside" %>
|
|
29
46
|
<div class="clearfix"></div>
|
|
30
47
|
<div id="app_content">
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
|
5
6
|
<%= stylesheet_link_tag 'application', media: 'all' %>
|
|
6
7
|
<%= javascript_include_tag 'blank' %>
|
|
7
8
|
<%= csrf_meta_tags %>
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
<html>
|
|
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
7
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
8
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
9
|
+
<meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
|
|
9
10
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
11
|
<script type="text/javascript" charset="utf-8">
|
|
11
12
|
App = {};
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
<html>
|
|
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
7
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
8
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
9
|
+
<meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
|
|
9
10
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
11
|
<script type="text/javascript" charset="utf-8">
|
|
11
12
|
App = {};
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
<html>
|
|
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
7
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
8
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
9
|
+
<meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
|
|
9
10
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
11
|
<script type="text/javascript" charset="utf-8">
|
|
11
12
|
App = {};
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
<!DOCTYPE html>
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
|
+
<meta charset="UTF-8" />
|
|
4
5
|
<title>Magic-Stylez</title>
|
|
5
|
-
<
|
|
6
|
-
<
|
|
6
|
+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
|
7
|
+
<meta name="apple-mobile-web-app-capable" content="yes" />
|
|
8
|
+
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
|
|
9
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-12830c6ac7643ebdf44bcc14c1cc31f4.css" media="all" rel="stylesheet" />
|
|
10
|
+
<script src="//berlinmagic.github.io/magic_stylez/assets/application-b98c80dd9c6251a3604503083de5ae19.js"></script>
|
|
7
11
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
12
|
+
<meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
|
|
9
13
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
14
|
<link href="//berlinmagic.github.io/magic_stylez/assets/ico/favicon-f1706407301f788c54691b6995f60a8f.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
|
|
11
15
|
<link href="//berlinmagic.github.io/magic_stylez/assets/ico/favicon-f34b54df445838a4f6bdac98bd904570.png" rel="shortcut icon" type="image/png" />
|
|
@@ -20,6 +24,17 @@
|
|
|
20
24
|
</script>
|
|
21
25
|
</head>
|
|
22
26
|
<body class="main_template">
|
|
27
|
+
<a href="#" id="mobile_header" class="inline_table center_text">
|
|
28
|
+
<div class="cell icn col-1 middle">
|
|
29
|
+
<i class="olicons-show-sb"></i>
|
|
30
|
+
</div>
|
|
31
|
+
<div class="cell col-10 middle">
|
|
32
|
+
<span id="current-view-name">Magic-Stylez</span>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="cell icn col-1 middle">
|
|
35
|
+
<i class="olicons-show-sb"></i>
|
|
36
|
+
</div>
|
|
37
|
+
</a>
|
|
23
38
|
<div id="aside">
|
|
24
39
|
<div class="aside-content">
|
|
25
40
|
<ul class="nav_list flat">
|
|
@@ -92,10 +107,10 @@
|
|
|
92
107
|
<div class="section head">
|
|
93
108
|
<div class="corset">
|
|
94
109
|
<div class="row">
|
|
95
|
-
<div class="col-sm-9">
|
|
110
|
+
<div class="col-sm-9 col-xs-6">
|
|
96
111
|
<h1>magic-stylez</h1>
|
|
97
112
|
</div>
|
|
98
|
-
<div class="col-sm-3">
|
|
113
|
+
<div class="col-sm-3 col-xs-6">
|
|
99
114
|
<a href="https://github.com/berlinmagic/magic_stylez/tree/master" target="_blank" class="btn btn-sm btn-default btn-divided pull-right">
|
|
100
115
|
<span class="icn"><i class="icomoon-github3"></i></span>
|
|
101
116
|
<span>SourceCode</span>
|
|
@@ -166,6 +181,14 @@ CSS:
|
|
|
166
181
|
<p class="loud"><i class="olicons-hide-filter"></i> what causes "Missing variable!" when you update to new version</p>
|
|
167
182
|
<p class="loud"><i class="olicons-hide-filter"></i> this generator adds all new variables without touching your settings</p>
|
|
168
183
|
<pre><code>$ rails g magic_stylez:update</code></pre>
|
|
184
|
+
<br/>
|
|
185
|
+
<br/>
|
|
186
|
+
<h4>Changes when update to <small>0.0.0.55</small>:</h4>
|
|
187
|
+
<ul>
|
|
188
|
+
<li><em>corporate/typo</em> is removed!</li>
|
|
189
|
+
<li><em>corporate/fonts</em> doesn't contain css, just variables</li>
|
|
190
|
+
</ul>
|
|
191
|
+
<p>With Version <strong>0.0.0.55</strong> I merged <em>corporate/typo</em> into <em>corporate/fonts</em> (they where so similar). I also removed all css from <em>corporate/fonts</em>, because it causes trouble with update generator (and also is not a variable).</p>
|
|
169
192
|
</div>
|
|
170
193
|
</div>
|
|
171
194
|
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
<html>
|
|
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
7
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
8
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
9
|
+
<meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
|
|
9
10
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
11
|
<script type="text/javascript" charset="utf-8">
|
|
11
12
|
App = {};
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
<html>
|
|
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
7
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
8
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
9
|
+
<meta content="txTtp+28PvfPT1b/DHXUvHmIXVtMBciKw3krvzJZJiM=" name="csrf-token" />
|
|
9
10
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
11
|
<script type="text/javascript" charset="utf-8">
|
|
11
12
|
App = {};
|