magic_stylez 0.0.0.39 → 0.0.0.40

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/magic_stylez/version.rb +1 -1
  3. data/test/dummy/app/assets/stylesheets/corporate/_variables.scss +12 -0
  4. data/vendor/assets/stylesheets/corporate/_variables.scss +12 -0
  5. data/vendor/assets/stylesheets/magic/content/_aside_nav.scss +19 -13
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fe4be82df3cd90313e8fedb43e211a3518eb6af3
4
- data.tar.gz: 89c544d78c87ded60a54f8d5a427bc1e5dfb117c
3
+ metadata.gz: 31e00391f1c68e8d07f4638c86ab557747ed883d
4
+ data.tar.gz: 191da1d782d4c727b86cd8f108078ddb472d1485
5
5
  SHA512:
6
- metadata.gz: 9711e7ef16bc519d915666eb1b071eea554d24f187dfc01d7daa56591105fd8b9d0870f3061894bb8b1864427495bedc992b2e3bed0de5812012ee2f1f02efff
7
- data.tar.gz: b87118817cfe65df04e3e776f9aff573f2e4815bef47e3d7d81ca34d555a8ffa4f0d7cf3ba25aa827243c1bbbfea8b7ea7341565d3aad7785b40bc8f85b2f87a
6
+ metadata.gz: 285cd03b4aadcbdd053fed2331ff7c319ae9c11f80c530d485fdb4849f05b6fbd061144f863f0ef77119006ee3bf6fd56ac17c41b7dc31c981fbbae209ec6ca6
7
+ data.tar.gz: 56ec9715127259ce43748b27df0e69d339cbcfa009772d162dc38d6177c8fdd8cf24320a8f4562f5a4696102cad31efc488c6e2ce6a309cc80d6fffe62c8eed5
data/lib/magic_stylez/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MagicStylez
2
- VERSION = "0.0.0.39"
2
+ VERSION = "0.0.0.40"
3
3
  end
data/test/dummy/app/assets/stylesheets/corporate/_variables.scss CHANGED
@@ -264,6 +264,18 @@ $aside-nav-avatar-height: 60px !default;
264
264
  $aside-nav-background: #e1e1e1 !default;
265
265
  $aside-nav-border-color: #cccccc !default;
266
266
 
267
+ $aside-nav-btn-font-size: 22px !default;
268
+ $aside-nav-btn-color: #555 !default;
269
+ $aside-nav-btn-text-shadow: "0 1px 0 rgba( 255,255,255,.42 )" !default;
270
+
271
+ $aside-nav-btn-color-hover: $brand-color !default;
272
+ $aside-nav-btn-bg-hover: transparent !default;
273
+ $aside-nav-btn-text-shadow-hover: "0 1px 0 rgba( 255,255,255,.42 )" !default;
274
+
275
+ $aside-nav-btn-color-active: #fff !default;
276
+ $aside-nav-btn-bg-active: $brand-color !default;
277
+ $aside-nav-btn-text-shadow-active: "0 1px 2px rgba( 0,0,0,.42 )" !default;
278
+
267
279
 
268
280
  //== Navbar
269
281
  //
data/vendor/assets/stylesheets/corporate/_variables.scss CHANGED
@@ -264,6 +264,18 @@ $aside-nav-avatar-height: 60px !default;
264
264
  $aside-nav-background: #e1e1e1 !default;
265
265
  $aside-nav-border-color: #cccccc !default;
266
266
 
267
+ $aside-nav-btn-font-size: 22px !default;
268
+ $aside-nav-btn-color: #555 !default;
269
+ $aside-nav-btn-text-shadow: "0 1px 0 rgba( 255,255,255,.42 )" !default;
270
+
271
+ $aside-nav-btn-color-hover: $brand-color !default;
272
+ $aside-nav-btn-bg-hover: transparent !default;
273
+ $aside-nav-btn-text-shadow-hover: "0 1px 0 rgba( 255,255,255,.42 )" !default;
274
+
275
+ $aside-nav-btn-color-active: #fff !default;
276
+ $aside-nav-btn-bg-active: $brand-color !default;
277
+ $aside-nav-btn-text-shadow-active: "0 1px 2px rgba( 0,0,0,.42 )" !default;
278
+
267
279
 
268
280
  //== Navbar
269
281
  //
data/vendor/assets/stylesheets/magic/content/_aside_nav.scss CHANGED
@@ -18,23 +18,24 @@
18
18
  width: $aside-nav-width;
19
19
  line-height: $aside-nav-btn-height;
20
20
  text-align: center; vertical-align: middle;
21
- font-size: 22px;
22
-
21
+ font-size: $aside-nav-btn-font-size;
23
22
  border: none;
24
-
25
- color: #555;
26
- text-shadow: 0 1px 0 rgba( 255,255,255,.42 );
23
+ color: $aside-nav-btn-color;
24
+ text-shadow: unquote($aside-nav-btn-text-shadow);
27
25
 
28
26
  &:hover {
29
- color: $brand-color;
27
+ color: $aside-nav-btn-color-hover;
28
+ background: $aside-nav-btn-bg-hover;
29
+ text-shadow: unquote($aside-nav-btn-text-shadow-hover);
30
30
  text-decoration: none;
31
31
  }
32
32
  &:active, &.active {
33
- background: $brand-color;
34
- color: #fff;
33
+ text-decoration: none;
34
+ background: $aside-nav-btn-bg-active;
35
+ color: $aside-nav-btn-color-active;
35
36
  @include antialiased_text;
36
37
  // @include box-shadow( inset 0 1px 0 0 rgba(255,255,255,.42) );
37
- text-shadow: 0 1px 2px rgba( 0,0,0,.42 );
38
+ text-shadow: unquote($aside-nav-btn-text-shadow-active);
38
39
  }
39
40
 
40
41
  &.user-pic {
@@ -71,6 +72,10 @@
71
72
  border: solid 1px darken($brand-color, 15%);
72
73
  @include box-shadow( inset 0 1px 0 0 rgba(255,255,255,.42) );
73
74
  }
75
+ &.user-pic {
76
+ margin: -1px -1px 0;
77
+ border: solid 1px #ccc;
78
+ }
74
79
  }
75
80
  }
76
81
  }
@@ -102,6 +107,7 @@
102
107
  // border-bottom: solid 1px #ccc;
103
108
  // &:hover { border-right: solid 2px #999; }
104
109
  // &:active, &.active { border-right: solid 2px $main-active-color; }
110
+ &.user-pic img { vertical-align: top; }
105
111
  }
106
112
  &.bordered {
107
113
  .aside-btn:last-child { @include box-shadow( 0 1px 0 0 rgba(255,255,255,.42) ); }
@@ -111,14 +117,14 @@
111
117
  body {
112
118
 
113
119
  &.with_aside_nav {
114
- padding-left: 50px;
120
+ padding-left: $aside-nav-width;
115
121
 
116
- .application_notice { margin-left: 50px; }
117
- .fixed-top, .navbar-fixed-top { left: 50px; }
122
+ .application_notice { margin-left: $aside-nav-width; }
123
+ .fixed-top, .navbar-fixed-top { left: $aside-nav-width; }
118
124
 
119
125
  &.aside_next_header {
120
126
  #nav-aside { top: 0; }
121
- .fixed-top, .navbar-fixed-top { left: 50px; }
127
+ .fixed-top, .navbar-fixed-top { left: $aside-nav-width; }
122
128
  }
123
129
 
124
130
  &.aside_under_header {
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.39
4
+ version: 0.0.0.40
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-08-02 00:00:00.000000000 Z
11
+ date: 2014-08-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails