solidus_backend 1.2.0.beta1 → 1.2.0.rc1
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.
Potentially problematic release.
This version of solidus_backend might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend.js +0 -1
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +42 -14
- data/app/assets/stylesheets/spree/backend/globals/_variables.scss +15 -4
- data/app/assets/stylesheets/spree/backend/themes/blue_steel/globals/_variables_override.scss +25 -0
- metadata +7 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5381b574b397f6a99877569672b6ccb8904f181d
|
|
4
|
+
data.tar.gz: 538f3b43e8c81cb0baa968b7ed823b22b1750cd9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 594b76778244fa6b4cf51405c2dcaff37f1fac7bd1aabf974e378fdac0075a0ef4ea5f25f08648a8ca885c7d95c304301f87c88df48971fb4a040fcd9b9cdc4f
|
|
7
|
+
data.tar.gz: 43077d6c655248219d956108f5af1faf55bee38becfb37e67a486f04f873adf746f2f905d5627959d73b1519c17febb7389c81220c408f75c5bffa9b79af966d
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
$padding-x-navbar: 26px;
|
|
2
|
+
$padding-y-navbar: 13px;
|
|
3
|
+
$padding-y-navbar-submenu: 9px;
|
|
4
|
+
|
|
1
5
|
nav.menu {
|
|
2
6
|
ul {
|
|
3
7
|
list-style: none;
|
|
@@ -24,14 +28,12 @@ nav.menu {
|
|
|
24
28
|
}
|
|
25
29
|
|
|
26
30
|
.admin-nav {
|
|
27
|
-
border-right:
|
|
31
|
+
border-right: $border-sidebar;
|
|
28
32
|
background: $color-sidebar-bg;
|
|
29
33
|
z-index: $z-index-navbar-flyout;
|
|
30
34
|
}
|
|
31
35
|
|
|
32
36
|
.admin-nav-menu {
|
|
33
|
-
text-transform: uppercase;
|
|
34
|
-
|
|
35
37
|
ul {
|
|
36
38
|
margin: 0;
|
|
37
39
|
padding: 0;
|
|
@@ -41,9 +43,20 @@ nav.menu {
|
|
|
41
43
|
li {
|
|
42
44
|
background: $color-navbar-bg;
|
|
43
45
|
|
|
44
|
-
&:hover
|
|
46
|
+
&:hover {
|
|
47
|
+
background: $color-navbar-active-bg;
|
|
48
|
+
|
|
49
|
+
> a {
|
|
50
|
+
color: $color-navbar-active;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
45
54
|
&.selected {
|
|
46
55
|
background: $color-navbar-active-bg;
|
|
56
|
+
|
|
57
|
+
> a {
|
|
58
|
+
color: $color-navbar-active;
|
|
59
|
+
}
|
|
47
60
|
}
|
|
48
61
|
|
|
49
62
|
&.selected li {
|
|
@@ -64,15 +77,14 @@ nav.menu {
|
|
|
64
77
|
left: 100%;
|
|
65
78
|
width: $width-sidebar-flyout;
|
|
66
79
|
margin-left: 0;
|
|
67
|
-
|
|
68
|
-
border: 1px solid $color-sidebar-border;
|
|
80
|
+
border: $border-sidebar;
|
|
69
81
|
background: $color-navbar-submenu-bg;
|
|
70
82
|
box-shadow: $box-shadow;
|
|
71
83
|
@include caret($direction: left, $color-caret: $color-navbar-submenu-bg);
|
|
72
84
|
|
|
73
85
|
&:before {
|
|
74
86
|
z-index: 1;
|
|
75
|
-
top:
|
|
87
|
+
top: 1.5em;
|
|
76
88
|
}
|
|
77
89
|
}
|
|
78
90
|
}
|
|
@@ -80,8 +92,8 @@ nav.menu {
|
|
|
80
92
|
|
|
81
93
|
a {
|
|
82
94
|
display: block;
|
|
83
|
-
padding:
|
|
84
|
-
color: $color-navbar
|
|
95
|
+
padding: $padding-y-navbar $padding-x-navbar;
|
|
96
|
+
color: $color-navbar;
|
|
85
97
|
font-weight: normal;
|
|
86
98
|
}
|
|
87
99
|
|
|
@@ -103,32 +115,48 @@ nav.menu {
|
|
|
103
115
|
}
|
|
104
116
|
|
|
105
117
|
.admin-subnav {
|
|
118
|
+
background: $color-navbar-submenu-bg;
|
|
119
|
+
@include padding($padding-y-navbar - $padding-y-navbar-submenu null);
|
|
120
|
+
|
|
106
121
|
li {
|
|
107
122
|
background: $color-navbar-submenu-bg;
|
|
108
123
|
}
|
|
109
124
|
|
|
110
125
|
a {
|
|
111
|
-
color: $color-navbar-
|
|
112
|
-
@include padding(
|
|
126
|
+
color: $color-navbar-submenu;
|
|
127
|
+
@include padding($padding-y-navbar-submenu null);
|
|
113
128
|
|
|
114
129
|
&:hover {
|
|
115
|
-
color: $color-navbar-active
|
|
130
|
+
color: $color-navbar-submenu-active;
|
|
116
131
|
}
|
|
117
132
|
}
|
|
118
133
|
|
|
119
134
|
.selected {
|
|
120
135
|
a {
|
|
121
|
-
color: $color-navbar-active
|
|
136
|
+
color: $color-navbar-submenu-active;
|
|
122
137
|
}
|
|
123
138
|
}
|
|
124
139
|
}
|
|
125
140
|
}
|
|
126
141
|
|
|
142
|
+
.admin-nav-footer {
|
|
143
|
+
background-color: $color-navbar-footer-bg;
|
|
144
|
+
|
|
145
|
+
a {
|
|
146
|
+
color: $color-navbar-footer;
|
|
147
|
+
|
|
148
|
+
&:hover {
|
|
149
|
+
color: $color-navbar-footer-active;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
|
|
127
154
|
.admin-nav.fits .admin-nav-footer {
|
|
128
155
|
position: fixed;
|
|
129
156
|
bottom: 0;
|
|
130
157
|
width: $width-sidebar;
|
|
131
|
-
border-top:
|
|
158
|
+
border-top: $border-sidebar;
|
|
159
|
+
border-right: $border-sidebar;
|
|
132
160
|
}
|
|
133
161
|
|
|
134
162
|
.admin-login-nav {
|
|
@@ -19,7 +19,7 @@ $color-6: #FF9300 !default; // Yellow
|
|
|
19
19
|
$color-7: #F4F4F4 !default; // Light Gray
|
|
20
20
|
|
|
21
21
|
// Basic accents for admin
|
|
22
|
-
$box-shadow: 0px 3px 3px -2px hsla(0, 0%, 0%, 0.2);
|
|
22
|
+
$box-shadow: 0px 3px 3px -2px hsla(0, 0%, 0%, 0.2) !default;
|
|
23
23
|
|
|
24
24
|
// Body base colors
|
|
25
25
|
$color-body-bg: $color-1 !default;
|
|
@@ -34,11 +34,18 @@ $color-border: very-light($color-3, 12) !default;
|
|
|
34
34
|
|
|
35
35
|
// Basic navigation colors
|
|
36
36
|
$color-sidebar-bg: $color-body-bg !default;
|
|
37
|
-
$color-sidebar-border: $color-border
|
|
37
|
+
$color-sidebar-border: $color-border !default;
|
|
38
|
+
$color-navbar: $color-1 !default;
|
|
38
39
|
$color-navbar-bg: $color-3 !default;
|
|
40
|
+
$color-navbar-active: $color-1 !default;
|
|
39
41
|
$color-navbar-active-bg: $color-2 !default;
|
|
42
|
+
$color-navbar-submenu: $color-3 !default;
|
|
40
43
|
$color-navbar-submenu-bg: very-light($color-navbar-bg, 4) !default;
|
|
41
|
-
$color-navbar-
|
|
44
|
+
$color-navbar-submenu-active: $color-2 !default;
|
|
45
|
+
$color-navbar-submenu-active-bg: $color-navbar-submenu-bg !default;
|
|
46
|
+
$color-navbar-footer: $color-3 !default;
|
|
47
|
+
$color-navbar-footer-bg: $color-sidebar-bg !default;
|
|
48
|
+
$color-navbar-footer-active: $color-2 !default;
|
|
42
49
|
|
|
43
50
|
// Basic flash colors
|
|
44
51
|
$color-success: $color-2 !default;
|
|
@@ -194,4 +201,8 @@ $width-sidebar-flyout: 225px !default;
|
|
|
194
201
|
|
|
195
202
|
// Stacking
|
|
196
203
|
//--------------------------------------------------------------
|
|
197
|
-
$z-index-navbar-flyout: 1000;
|
|
204
|
+
$z-index-navbar-flyout: 1000 !default;
|
|
205
|
+
|
|
206
|
+
// Sidebar
|
|
207
|
+
//--------------------------------------------------------------
|
|
208
|
+
$border-sidebar: 1px solid $color-sidebar-border !default;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
$cerulean: hsl(216, 57, 47);
|
|
2
|
+
|
|
3
|
+
$white: hsl(220, 0, 100);
|
|
4
|
+
$gray-light: hsl(220, 9, 71);
|
|
5
|
+
$gray: hsl(220, 8, 23);
|
|
6
|
+
$gray-dark: hsl(220, 12, 18);
|
|
7
|
+
$black: hsl(220, 19, 13);
|
|
8
|
+
|
|
9
|
+
$color-primary: $cerulean;
|
|
10
|
+
|
|
11
|
+
$color-sidebar-bg: $gray;
|
|
12
|
+
$color-sidebar-border: very-light(#5498DA, 12); // $color-border
|
|
13
|
+
$color-navbar: $gray-light;
|
|
14
|
+
$color-navbar-bg: $gray;
|
|
15
|
+
$color-navbar-active: $white;
|
|
16
|
+
$color-navbar-active-bg: $color-primary;
|
|
17
|
+
$color-navbar-submenu: tint($gray-light, 40%);
|
|
18
|
+
$color-navbar-submenu-bg: $gray-dark;
|
|
19
|
+
$color-navbar-submenu-active: tint($color-primary, 20%);
|
|
20
|
+
$color-navbar-footer: $color-navbar;
|
|
21
|
+
$color-navbar-footer-active: $color-navbar-active;
|
|
22
|
+
|
|
23
|
+
// Sidebar
|
|
24
|
+
//--------------------------------------------------------------
|
|
25
|
+
$border-sidebar: none;
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: solidus_backend
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.0.
|
|
4
|
+
version: 1.2.0.rc1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Solidus Team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-01-
|
|
11
|
+
date: 2016-01-15 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: solidus_api
|
|
@@ -16,28 +16,28 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 1.2.0.
|
|
19
|
+
version: 1.2.0.rc1
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - '='
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 1.2.0.
|
|
26
|
+
version: 1.2.0.rc1
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: solidus_core
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
30
30
|
requirements:
|
|
31
31
|
- - '='
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 1.2.0.
|
|
33
|
+
version: 1.2.0.rc1
|
|
34
34
|
type: :runtime
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - '='
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: 1.2.0.
|
|
40
|
+
version: 1.2.0.rc1
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: bourbon
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -238,6 +238,7 @@ files:
|
|
|
238
238
|
- app/assets/stylesheets/spree/backend/shared/_tables.scss
|
|
239
239
|
- app/assets/stylesheets/spree/backend/shared/_typography.scss
|
|
240
240
|
- app/assets/stylesheets/spree/backend/spree_admin.scss
|
|
241
|
+
- app/assets/stylesheets/spree/backend/themes/blue_steel/globals/_variables_override.scss
|
|
241
242
|
- app/assets/stylesheets/spree/frontend/backend.css
|
|
242
243
|
- app/controllers/spree/admin/adjustment_reasons_controller.rb
|
|
243
244
|
- app/controllers/spree/admin/adjustments_controller.rb
|