magic_stylez 0.0.0.50 → 0.0.0.51
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/lib/magic_stylez/version.rb +1 -1
- data/test/dummy/app/views/templates/fixed-subnav.html.erb +19 -20
- data/test/dummy/app/views/templates/slidebar-subnav.html.erb +4 -2
- data/test/dummy/public/html/aside-nav.html +2 -2
- data/test/dummy/public/html/fixed-header.html +2 -2
- data/test/dummy/public/html/fixed-subnav.html +2 -2
- data/test/dummy/public/html/index.html +2 -2
- data/test/dummy/public/html/slidebar-header.html +2 -2
- data/test/dummy/public/html/slidebar-subnav.html +2 -2
- data/vendor/assets/stylesheets/magic/content/_navbar.scss +7 -4
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a9872ea2e618f8be66348ee7aad8da1eda3326f8
|
|
4
|
+
data.tar.gz: e578c8994a0aa03e0ad6da0964f79afcc58bc525
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 33168999bd9c6dd634c5af8b98ff0a62573d56160165dcdeff494374956362d789c1993c582cd8b830762f709efbf68d20c18be3d7b7bb29b44c6044f97f5111
|
|
7
|
+
data.tar.gz: e9de0152588887a9c980274d9d874518d04578365596a39c92e3910a1f2dd6f4d487cfe219fb6d470bc70eafbae7532d7603cf59811e1b0286c634aa7e069761
|
data/lib/magic_stylez/version.rb
CHANGED
|
@@ -33,26 +33,25 @@
|
|
|
33
33
|
</ul>
|
|
34
34
|
<div class="clearfix"></div>
|
|
35
35
|
<div class="navbar-sub-nav">
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
</
|
|
55
|
-
|
|
36
|
+
<div class="corset">
|
|
37
|
+
<ul class="nav navbar-nav navbar-left">
|
|
38
|
+
<li><%= link_to "Link", "#" %></li>
|
|
39
|
+
<li><%= link_to "Link", "#" %></li>
|
|
40
|
+
</ul>
|
|
41
|
+
<ul class="nav navbar-nav navbar-right">
|
|
42
|
+
<li class="dropdown">
|
|
43
|
+
<%= link_to "#", class: "dropdown-toggle", data: {toggle: "dropdown"} do %>
|
|
44
|
+
Dropdown <b class="caret"></b>
|
|
45
|
+
<% end %>
|
|
46
|
+
<ul class="dropdown-menu">
|
|
47
|
+
<li><%= link_to "Link 1", "#" %></li>
|
|
48
|
+
<li><%= link_to "Link 2", "#" %></li>
|
|
49
|
+
<li><%= link_to "Link 3", "#" %></li>
|
|
50
|
+
</ul>
|
|
51
|
+
</li>
|
|
52
|
+
<li><%= link_to "Button", "#", class: "btn btn-success" %></li>
|
|
53
|
+
</ul>
|
|
54
|
+
</div>
|
|
56
55
|
</div>
|
|
57
56
|
</div>
|
|
58
57
|
|
|
@@ -34,11 +34,12 @@
|
|
|
34
34
|
</ul>
|
|
35
35
|
<div class="clearfix"></div>
|
|
36
36
|
<div class="navbar-sub-nav">
|
|
37
|
+
<div class="corset">
|
|
38
|
+
|
|
37
39
|
|
|
38
40
|
<ul class="nav navbar-nav navbar-left">
|
|
39
41
|
<li><%= link_to "Link", "#" %></li>
|
|
40
42
|
<li><%= link_to "Link", "#" %></li>
|
|
41
|
-
|
|
42
43
|
</ul>
|
|
43
44
|
<ul class="nav navbar-nav navbar-right">
|
|
44
45
|
<li class="dropdown">
|
|
@@ -53,7 +54,8 @@
|
|
|
53
54
|
</li>
|
|
54
55
|
<li><%= link_to "Button", "#", class: "btn btn-success" %></li>
|
|
55
56
|
</ul>
|
|
56
|
-
|
|
57
|
+
<div class="clearfix"></div>
|
|
58
|
+
</div>
|
|
57
59
|
</div>
|
|
58
60
|
</div>
|
|
59
61
|
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
-
<link href="//berlinmagic.github.io/magic_stylez/assets/application-
|
|
5
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
|
|
6
6
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
7
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
8
|
+
<meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
|
|
9
9
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
10
|
<script type="text/javascript" charset="utf-8">
|
|
11
11
|
App = {};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
-
<link href="//berlinmagic.github.io/magic_stylez/assets/application-
|
|
5
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
|
|
6
6
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
7
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
8
|
+
<meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
|
|
9
9
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
10
|
<script type="text/javascript" charset="utf-8">
|
|
11
11
|
App = {};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
-
<link href="//berlinmagic.github.io/magic_stylez/assets/application-
|
|
5
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
|
|
6
6
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
7
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
8
|
+
<meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
|
|
9
9
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
10
|
<script type="text/javascript" charset="utf-8">
|
|
11
11
|
App = {};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
-
<link href="//berlinmagic.github.io/magic_stylez/assets/application-
|
|
5
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
|
|
6
6
|
<script src="//berlinmagic.github.io/magic_stylez/assets/application-0f7b4393eed52dca4ecec8d36e95122e.js"></script>
|
|
7
7
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
8
|
+
<meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
|
|
9
9
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
10
|
<script type="text/javascript" charset="utf-8">
|
|
11
11
|
App = {};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
-
<link href="//berlinmagic.github.io/magic_stylez/assets/application-
|
|
5
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
|
|
6
6
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
7
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
8
|
+
<meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
|
|
9
9
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
10
|
<script type="text/javascript" charset="utf-8">
|
|
11
11
|
App = {};
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
<head>
|
|
4
4
|
<title>Magic-Stylez</title>
|
|
5
|
-
<link href="//berlinmagic.github.io/magic_stylez/assets/application-
|
|
5
|
+
<link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
|
|
6
6
|
<script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
|
|
7
7
|
<meta content="authenticity_token" name="csrf-param" />
|
|
8
|
-
<meta content="
|
|
8
|
+
<meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
|
|
9
9
|
<link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
|
|
10
10
|
<script type="text/javascript" charset="utf-8">
|
|
11
11
|
App = {};
|
|
@@ -193,7 +193,7 @@ body, #body, #container, .main-content, .main_content {
|
|
|
193
193
|
// a:not(.btn) { }
|
|
194
194
|
|
|
195
195
|
|
|
196
|
-
&, & > .nav.navbar-nav {
|
|
196
|
+
&, & > .nav.navbar-nav, & > .corset > .nav.navbar-nav, & > .container > .nav.navbar-nav {
|
|
197
197
|
list-style: none;
|
|
198
198
|
|
|
199
199
|
&, & > li, & > li > a { color: $subnav-color; }
|
|
@@ -261,7 +261,7 @@ body, #body, #container, .main-content, .main_content {
|
|
|
261
261
|
|
|
262
262
|
}
|
|
263
263
|
|
|
264
|
-
.corset .navbar-sub-nav { @include horizontal-padding( 5% ); }
|
|
264
|
+
// .corset .navbar-sub-nav { @include horizontal-padding( 5% ); }
|
|
265
265
|
|
|
266
266
|
.navbar.navbar-fixed-top {
|
|
267
267
|
.navbar-collapse {
|
|
@@ -274,7 +274,10 @@ body, #body, #container, .main-content, .main_content {
|
|
|
274
274
|
|
|
275
275
|
}
|
|
276
276
|
|
|
277
|
-
@include responsiveStep-
|
|
278
|
-
.corset .navbar-sub-nav {
|
|
277
|
+
@include responsiveStep-xs-only {
|
|
278
|
+
.navbar-sub-nav > .corset, .navbar-sub-nav > .container { width: auto !important; padding: 0 !important; margin: 0 !important; }
|
|
279
279
|
}
|
|
280
280
|
|
|
281
|
+
// @include responsiveStep-lg {
|
|
282
|
+
// // .corset .navbar-sub-nav { @include horizontal-padding( 10% ); }
|
|
283
|
+
// }
|