arctic_admin 1.0.3 → 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/arctic_admin.js +4 -3
  3. data/app/assets/stylesheets/_variables.scss +19 -7
  4. data/app/assets/stylesheets/layouts/_filter.scss +5 -1
  5. data/app/assets/stylesheets/layouts/_header.scss +17 -4
  6. data/app/assets/stylesheets/layouts/_sidebar.scss +6 -2
  7. data/app/assets/stylesheets/pages/_edit.scss +19 -17
  8. data/app/assets/stylesheets/pages/_index.scss +5 -1
  9. data/app/assets/stylesheets/pages/_show.scss +5 -1
  10. data/arctic_admin.gemspec +1 -1
  11. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7f5eacb97b471ea9c85336afa632436a9b902c06
4
- data.tar.gz: cf47a195b96a39f1919cf4044529089a2daa9670
3
+ metadata.gz: cc7382812a5001ef59eb179f64ea47ca82d39b2b
4
+ data.tar.gz: 5d1e23fe7dae71ec20b426f64d9e938fd1afd094
5
5
  SHA512:
6
- metadata.gz: 3b74787fd0ec6ba8b54583817d62d43bd43793eb99b65b64d5088a47efb2efad98ede47c37b6a7d40d314dbf14acc96644df2b85a03ba5f9628cc0dc3f08245e
7
- data.tar.gz: 700e2b5aa26c70b761a879c03cca6dea963fc9113446d84d6e301f48eb7c7604b9b8f003a6d239f80ecd47dc2fad5a8ea336c1cf85520ab898b454cf270ee39c
6
+ metadata.gz: d509ef3c0e178bb1837c0709358e92827590a368b8490a9466e936c89083dbf622f64665988035255d83a231f75a163bea1d5ac1167f10d5b7ede079a12a1b1d
7
+ data.tar.gz: e3412df9b5579fda6a935257288c0f4f3152fb2343951895c8dd619304a962f5b535d2d72d1258008d670b8900bd79693451f565cf76c245fe7f50458d9b4280
data/app/assets/javascripts/arctic_admin.js CHANGED
@@ -1,14 +1,15 @@
1
1
  $(function() {
2
2
  $('#sidebar').click(function (e) {
3
- var position = $(this).position()
3
+ var position = $(this).position();
4
+ var width = $(this).width();
4
5
  if (e.pageX < position.left) {
5
6
  if ($(this).css('right') == '0px') {
6
7
  $(this).animate({
7
- right: "-=230"
8
+ right: "-="+width
8
9
  }, 600, function() {});
9
10
  } else {
10
11
  $(this).animate({
11
- right: "+=230"
12
+ right: "+="+width
12
13
  }, 600, function() {});
13
14
  }
14
15
  }
data/app/assets/stylesheets/_variables.scss CHANGED
@@ -1,4 +1,4 @@
1
- // COLOR
1
+ // BASIC COLOR
2
2
  $red: #b34247;
3
3
  $green: #2dbb43;
4
4
  $blue: #4bacfe;
@@ -8,19 +8,25 @@ $warning: #f2a654;
8
8
  $success: #46be8a;
9
9
  $info: #57c7d4;
10
10
 
11
+ // body
11
12
  $body-background: #eee !default;
12
13
 
14
+ // header
13
15
  $header-border-color: #e6e6e6 !default;
14
16
  $header-background: #fff !default;
15
17
 
16
- $sidebar-border-color: $header-border-color !default;
17
- $sidebar-border-color: #e6e6e6;
18
+ // nav action
19
+ $header-nav-action-hover-background: #f5f5f5 !default;
20
+ $header-nav-action-active-background: #f0f0f0 !default;
18
21
 
22
+ //sidebar
23
+ $sidebar-border-color: $header-border-color !default;
19
24
  $sidebar-background: #f5f5f5 !default;
20
25
 
21
- $left-menu-item-hover-background: #f0f0f0 !default;
22
- $left-menu-item-nested-hover-background: #e7e7e7 !default;
26
+ $sidebar-item-hover-background: #f0f0f0 !default;
27
+ $sidebar-nested-item-hover-background: #e7e7e7 !default;
23
28
 
29
+ // text
24
30
  $text-color: #5a5a5a !default;
25
31
  $text-color-important: #526069 !default;
26
32
 
@@ -29,6 +35,12 @@ $primary-color: $blue !default;
29
35
  // SIZE
30
36
  $header-width: 200px !default;
31
37
  $screen-header-width: calc(100% - 200px) !default;
38
+ $lg-header-width: 250px !default;
39
+ $lg-screen-header-width: calc(100% - 250px) !default;
40
+
41
+ $filter-width: 230px !default;
42
+ $screen-filter-width: calc(100% - 230px) !default;
43
+ $lg-filter-width: 270px !default;
44
+ $lg-screen-filter-width: calc(100% - 270px) !default;
32
45
 
33
- $sidebar-width: 230px !default;
34
- $screen-sidebar-width: calc(100% - 230px) !default;
46
+ $lg-width: 1300px;
data/app/assets/stylesheets/layouts/_filter.scss CHANGED
@@ -1,10 +1,14 @@
1
1
  #sidebar {
2
- width: $sidebar-width;
2
+ width: $filter-width;
3
3
  background-color: #fff;
4
4
  border-radius: 3px;
5
5
  box-shadow: 0 0 4px 0 rgba(0,0,0,.04);
6
6
  margin-bottom: 30px;
7
7
 
8
+ @media screen and (min-width: $lg-width) {
9
+ width: $lg-filter-width;
10
+ }
11
+
8
12
  .sidebar_section {
9
13
  padding: 15px 20px;
10
14
 
data/app/assets/stylesheets/layouts/_header.scss CHANGED
@@ -2,6 +2,10 @@
2
2
  padding-left: $header-width;
3
3
  padding-top: 60px;
4
4
 
5
+ @media screen and (min-width: $lg-width) {
6
+ padding-left: $lg-header-width;
7
+ }
8
+
5
9
  #active_admin_content {
6
10
  padding: 30px 25px;
7
11
 
@@ -22,6 +26,10 @@
22
26
  text-align: center;
23
27
  margin: 0;
24
28
  line-height: 60px;
29
+
30
+ @media screen and (min-width: $lg-width) {
31
+ width: $lg-header-width;
32
+ }
25
33
  }
26
34
 
27
35
  #utility_nav {
@@ -37,11 +45,11 @@
37
45
  @include transition-button();
38
46
 
39
47
  &:hover {
40
- background-color: $sidebar-background;
48
+ background-color: $header-nav-action-hover-background;
41
49
  }
42
50
 
43
51
  &:active {
44
- background-color: $left-menu-item-hover-background;
52
+ background-color: $header-nav-action-active-background;
45
53
  }
46
54
  }
47
55
 
@@ -111,6 +119,11 @@
111
119
  padding: 0 20px;
112
120
  z-index: 2;
113
121
 
122
+ @media screen and (min-width: $lg-width) {
123
+ width: $lg-screen-header-width;
124
+ left: $lg-header-width;
125
+ }
126
+
114
127
  #titlebar_left {
115
128
  padding-top: 6px;
116
129
  display: inline-block;
@@ -133,11 +146,11 @@
133
146
  float: left;
134
147
 
135
148
  &:hover {
136
- background-color: $sidebar-background;
149
+ background-color: $header-nav-action-hover-background;
137
150
  }
138
151
 
139
152
  &:active {
140
- background-color: $left-menu-item-hover-background;
153
+ background-color: $header-nav-action-active-background;
141
154
  }
142
155
  }
143
156
  }
data/app/assets/stylesheets/layouts/_sidebar.scss CHANGED
@@ -8,6 +8,10 @@
8
8
  border-right: 1px solid $sidebar-border-color;
9
9
  z-index: 1;
10
10
 
11
+ @media screen and (min-width: $lg-width) {
12
+ width: $lg-header-width;
13
+ }
14
+
11
15
  li {
12
16
  width: 100%;
13
17
  font-size: 14px;
@@ -22,7 +26,7 @@
22
26
  padding: 0 20px;
23
27
 
24
28
  &:hover {
25
- background-color: $left-menu-item-hover-background;
29
+ background-color: $sidebar-item-hover-background;
26
30
  }
27
31
  }
28
32
 
@@ -45,7 +49,7 @@
45
49
  color: $text-color;
46
50
 
47
51
  &:hover {
48
- background-color: $left-menu-item-nested-hover-background;
52
+ background-color: $sidebar-nested-item-hover-background;
49
53
  }
50
54
  }
51
55
 
data/app/assets/stylesheets/pages/_edit.scss CHANGED
@@ -1,23 +1,25 @@
1
- body.new, body.edit, body.create, body.update {
2
- .input {
3
- .label {
4
- width: 25%;
5
- float: left;
6
- text-align: left;
7
- padding-right: 20px;
8
- margin: auto 0;
9
- }
1
+ body.logged_in {
2
+ &.new, &.edit, &.create, &.update {
3
+ .input {
4
+ .label {
5
+ width: 25%;
6
+ float: left;
7
+ text-align: left;
8
+ padding-right: 20px;
9
+ margin: auto 0;
10
+ }
11
+
12
+ input {
13
+ width: 50%;
14
+ }
10
15
 
11
- input {
12
- width: 50%;
16
+ .inline-errors {
17
+ padding-left: 25%;
18
+ }
13
19
  }
14
20
 
15
- .inline-errors {
21
+ .actions {
16
22
  padding-left: 25%;
17
23
  }
18
24
  }
19
-
20
- .actions {
21
- padding-left: 25%;
22
- }
23
- }
25
+ }
data/app/assets/stylesheets/pages/_index.scss CHANGED
@@ -78,7 +78,11 @@ body.index {
78
78
 
79
79
  #sidebar {
80
80
  position: fixed;
81
- right: - $sidebar-width;
81
+ right: - $filter-width;
82
+
83
+ @media screen and (min-width: $lg-width) {
84
+ right: - $lg-filter-width;
85
+ }
82
86
 
83
87
  &:before {
84
88
  cursor: pointer;
data/app/assets/stylesheets/pages/_show.scss CHANGED
@@ -1,7 +1,11 @@
1
1
  body.show {
2
2
  #active_admin_content.with_sidebar {
3
3
  #main_content_wrapper {
4
- width: $screen-sidebar-width;
4
+ width: $screen-filter-width;
5
+
6
+ @media screen and (min-width: $lg-width) {
7
+ width: $lg-screen-filter-width;
8
+ }
5
9
  }
6
10
 
7
11
  #sidebar {
data/arctic_admin.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'arctic_admin'
3
- s.version = '1.0.3'
3
+ s.version = '1.0.4'
4
4
  s.date = '2017-02-05'
5
5
  s.summary = "Arctic Admin theme for ActiveAdmin"
6
6
  s.description = "A simple theme for Active Admin"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arctic_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 1.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Clément Prod'homme