flattened_active_admin 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 39020149e138d40355c38e5b38328aed04bc48e5
4
- data.tar.gz: 381e8869fd98674b40abdec0fc0c44c8ae4b0a02
3
+ metadata.gz: 106cfb50e623d4352a6d0311c1d4506898c4d1e1
4
+ data.tar.gz: e9198bf252e50766fe8535a16b3742f107250eaf
5
5
  SHA512:
6
- metadata.gz: 41bbb0be79a6705b7c984519ec9a634a5cb2a8d904fdd99bae11d8c242b11dfb3067ed87083b55b4cfb555d794e8aed59a6638d3bcab9882483531391289abff
7
- data.tar.gz: ce87352d9665569f830f3d0bebc8b295930699dd997407816c7712370079f5510f56fd42d8d47a813bd2cbe9d671ee48d1c85fcfd86e90997dd0d96a644186bf
6
+ metadata.gz: f9482fe2e335da9728e7afb005f3388fd8fe4a8ac7a9f5cd47b2117295c6c297fbc908c5839baec1e0d14fa723d9e9a97b4c4cfc7b01aac5f0ce0ba42a57abe1
7
+ data.tar.gz: b2f077dca76d1033b8fc7731afad1e76995b5793500000cc8ce695075161efefd9bba2d0244be73f7597914f15bab91987bf4cfd98a2b30142315c649cc8206f
@@ -25,7 +25,7 @@
25
25
 
26
26
  // Default font settings. The font-size percentage is of 16px. (0.75 * 16px = 12px) */
27
27
  html { font-size:100.01%; }
28
- body { font-size: 75%; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
28
+ body { font-size: 75%; font-family: $default-font, "Helvetica Neue", Arial, Helvetica, sans-serif; }
29
29
 
30
30
  // Headings
31
31
  h1,h2,h3,h4,h5,h6 {
@@ -40,20 +40,20 @@
40
40
  @mixin light-button {
41
41
  @include basic-button;
42
42
  background: $action-button-default-background;
43
- border: solid 1px #c7c7c7;
44
43
  @include border-colors(#d3d3d3, #c7c7c7, #c2c2c2);
45
- @include text-shadow;
46
- color: $primary-color;
44
+ color: $action-button-default-text;
47
45
 
48
46
  &:not(.disabled) {
49
47
  &:hover {
50
48
  background: $action-button-hover-background;
49
+ color: $action-button-hover-text;
51
50
  }
52
51
 
53
52
  &:active {
54
53
  box-shadow: 0 1px 2px rgba(0,0,0,0.22) inset, 0 1px 0 0px #EEE;
55
54
  @include border-colors(#c2c2c2, #b9b9b9, #b7b7b7);
56
55
  background: $action-button-active-background;
56
+ color: $action-button-active-text;
57
57
  }
58
58
  }
59
59
 
@@ -1,3 +1,3 @@
1
1
  @mixin sans-family {
2
- font-family: Helvetica, Arial, sans-serif;
2
+ font-family: $default-font, Helvetica, Arial, sans-serif;
3
3
  }
@@ -18,6 +18,7 @@ $required-field-marker-color: #aaa !default;
18
18
  $page-header-background-color: #5E6469 !default;
19
19
 
20
20
  // Text
21
+ $default-font: "Helvetica Neue" !default;
21
22
  $text-color: #323537 !default;
22
23
  $link-color: #38678b !default;
23
24
  $header-dropdown-menu-text-color: #cdcdcd !default;
@@ -31,8 +32,12 @@ $form-label-color: $section-header-text-color !default;
31
32
  $action-button-default-background: #fbfbfb !default;
32
33
  $action-button-hover-background: #FFF !default;
33
34
  $action-button-active-background: #fafafa !default;
35
+ $action-button-default-text: $primary-color !default;
36
+ $action-button-hover-text: $primary-color !default;
37
+ $action-button-active-text: $primary-color !default;
34
38
 
35
39
  // Sizes
40
+ $title-bar-font-weight: bold !default;
36
41
  $border-width: 1px !default;
37
42
  $horizontal-page-margin: 30px !default;
38
43
  $sidebar-width: 270px !default;
@@ -12,7 +12,7 @@ $text-color: black;
12
12
  @import "flattened_active_admin/typography";
13
13
 
14
14
  body {
15
- font-family: Helvetica, Arial, sans-serif;
15
+ font-family: $default-font, Helvetica, Arial, sans-serif;
16
16
  line-height: 150%;
17
17
  font-size: 72%;
18
18
  background: #fff;
@@ -25,7 +25,7 @@
25
25
  padding: 0;
26
26
  font-size: 2.6em;
27
27
  line-height: 100%;
28
- font-weight: bold;
28
+ font-weight: $title-bar-font-weight;
29
29
  }
30
30
 
31
31
  .action_items {
@@ -1,3 +1,3 @@
1
1
  module FlattenedActiveAdmin
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flattened_active_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Isaac Norman
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-09 00:00:00.000000000 Z
11
+ date: 2014-05-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.0
19
+ version: 3.2.0
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: 4.0.0
26
+ version: 3.2.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: sqlite3
29
29
  requirement: !ruby/object:Gem::Requirement