hootstrap 0.2.0 → 0.3.0

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: cc6bd784cded17d07383a7e7d2ea984087206cff
4
- data.tar.gz: 20f73f391c359f9ca99f97250ea37b6938c8b6a3
3
+ metadata.gz: da868be7ee40e74865380df9c13233011ea353ce
4
+ data.tar.gz: 3cdc24150b46e029948ddb9f3c06c7a397808e3f
5
5
  SHA512:
6
- metadata.gz: fe25819f5212424580b9274126920bbfa997a5c835408477196d1cefb50212dc024cc359f5c0c72a192db8febf1b1c4f9fb0422c667944974f8eee01d279024a
7
- data.tar.gz: 1aec8e30bc0effb469e57fcea284dd88044b814aec1ebb1daf292e0a11be97ba028949ca036ef9abcff320f04ef7ffb8bc849291547566163e650d2bca2deb19
6
+ metadata.gz: 7f12d2164af5ce0541cceea7750ef98ef530fd5172bd4035dde02b97e06bbcdbccc7f225f245d668dabb41024266a9e18e08cb29f14077b721238b6264814fda
7
+ data.tar.gz: 5d9a56e5838cefb7f3e849f894da3d70085824dd098688212fe83247044448688887698cfc79b02ca192798d4d479cbdefca74a72a6f04031a10a529691ee625
@@ -96,7 +96,7 @@ $theme-color-interval: 8%;
96
96
  $enable-caret: true;
97
97
  $enable-rounded: true;
98
98
  $enable-shadows: true;
99
- $enable-gradients: true;
99
+ $enable-gradients: false;
100
100
  $enable-transitions: true;
101
101
  $enable-hover-media-query: true;
102
102
  $enable-grid-classes: true;
@@ -308,6 +308,10 @@ $input-btn-padding-y: .375rem;
308
308
  $input-btn-padding-x: .75rem;
309
309
  $input-btn-line-height: $line-height-base;
310
310
 
311
+ $input-btn-focus-width: 0.15rem;
312
+ $input-btn-focus-color: rgba($component-active-bg, 0.25);
313
+ $input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width $input-btn-focus-color;
314
+
311
315
  $input-btn-padding-y-sm: .25rem;
312
316
  $input-btn-padding-x-sm: .5rem;
313
317
  $input-btn-line-height-sm: $line-height-sm;
@@ -316,10 +320,14 @@ $input-btn-padding-y-lg: .5rem;
316
320
  $input-btn-padding-x-lg: 1rem;
317
321
  $input-btn-line-height-lg: $line-height-lg;
318
322
 
323
+ $btn-padding-y: 0.4375rem;
324
+ $btn-padding-x: 0.8125rem;
319
325
  $btn-font-weight: $font-weight-normal;
320
- $btn-box-shadow: inset 0 1px 0 rgba($white, .15), 0 1px 1px rgba($black, .075);
326
+ $btn-box-shadow: 0 1px 1px rgba($black, .075);
327
+ $btn-focus-width: $input-btn-focus-width;
328
+ $btn-hover-box-shadow: 0 3px 5px rgba($black, .125);
321
329
  $btn-focus-box-shadow: 0 0 0 3px rgba(theme-color("primary"), .25);
322
- $btn-active-box-shadow: inset 0 3px 5px rgba($black, .125);
330
+ $btn-active-box-shadow: 0 3px 5px rgba($black, .125);
323
331
 
324
332
  $btn-link-disabled-color: $gray-600;
325
333
 
@@ -349,7 +357,7 @@ $input-border-radius-sm: $border-radius-sm;
349
357
 
350
358
  $input-focus-bg: $input-bg;
351
359
  $input-focus-border-color: $blue;
352
- $input-focus-box-shadow: inset 0 0 1px rgba($blue, 0.75);
360
+ $input-focus-box-shadow: $input-btn-focus-box-shadow;
353
361
  $input-focus-color: $input-color;
354
362
 
355
363
  $input-placeholder-color: $gray-600;
@@ -458,9 +466,8 @@ $custom-select-border-width: $input-btn-border-width;
458
466
  $custom-select-border-color: $input-border-color;
459
467
  $custom-select-border-radius: $border-radius;
460
468
 
461
- $custom-select-focus-border-color: lighten(theme-color("primary"), 25%);
462
- $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075),
463
- 0 0 5px rgba($custom-select-focus-border-color, .5);
469
+ $custom-select-focus-border-color: $input-focus-border-color;
470
+ $custom-select-focus-box-shadow: $input-focus-box-shadow;
464
471
 
465
472
  $custom-select-font-size-sm: 75%;
466
473
  $custom-select-height-sm: $input-height-sm;
@@ -3,41 +3,53 @@
3
3
  // Easily pump out default styles, as well as :hover, :focus, :active,
4
4
  // and disabled options for all buttons
5
5
 
6
- @mixin button-variants($background, $border, $active-background: darken($background, 7.5%), $active-border: darken($border, 10%)) {
6
+ @mixin button-variants($background, $border, $hover-background: darken($background, 7.5%), $hover-border: darken($border, 10%), $active-background: darken($background, 10%), $active-border: darken($border, 12.5%)) {
7
7
  color: color-yiq($background);
8
- background: linear-gradient(to right, $background, lighten($background, 5%));
9
- background-color: $background;
8
+ @include gradient-bg($background);
10
9
  border-color: $border;
11
10
  @include box-shadow($btn-box-shadow);
12
11
 
13
12
  @include hover {
14
- color: color-yiq($active-background);
15
- background: linear-gradient(to right, $active-background, $background);
16
- background-color: $active-background;
17
- border-color: $active-border;
18
- // box-shadow: 0 1px 1px 0 rgba($gray-dark, 0.15);
13
+ color: color-yiq($hover-background);
14
+ @include gradient-bg($hover-background);
15
+ border-color: $hover-border;
19
16
  }
20
17
 
21
18
  &:focus,
22
19
  &.focus {
23
- background-color: $active-background;
24
- box-shadow: 0 0 0 1px $white, 0 0 0 3px rgba($active-background, 0.25);
20
+ // Avoid using mixin so we can pass custom focus shadow properly
21
+ @if $enable-shadows {
22
+ box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba($border, .5);
23
+ } @else {
24
+ box-shadow: 0 0 0 $btn-focus-width rgba($border, .5);
25
+ }
25
26
  }
26
27
 
27
28
  // Disabled comes first so active can properly restyle
28
29
  &.disabled,
29
30
  &:disabled {
31
+ color: color-yiq($background);
30
32
  background-color: $background;
31
33
  border-color: $border;
32
- pointer-events: none;
33
34
  }
34
35
 
35
- &:active,
36
- &.active,
36
+ &:not(:disabled):not(.disabled):active,
37
+ &:not(:disabled):not(.disabled).active,
37
38
  .show > &.dropdown-toggle {
39
+ color: color-yiq($active-background);
38
40
  background-color: $active-background;
39
- background-image: none; // Remove the gradient for the pressed/active state
41
+ @if $enable-gradients {
42
+ background-image: none; // Remove the gradient for the pressed/active state
43
+ }
40
44
  border-color: $active-border;
41
- @include box-shadow($btn-active-box-shadow);
45
+
46
+ &:focus {
47
+ // Avoid using mixin so we can pass custom focus shadow properly
48
+ @if $enable-shadows {
49
+ box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($border, .5);
50
+ } @else {
51
+ box-shadow: 0 0 0 $btn-focus-width rgba($border, .5);
52
+ }
53
+ }
42
54
  }
43
55
  }
@@ -1,3 +1,3 @@
1
1
  module Hootstrap
2
- VERSION = '0.2.0'
2
+ VERSION = '0.3.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hootstrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Licata
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-03-01 00:00:00.000000000 Z
11
+ date: 2018-03-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 4.0.0.beta
47
+ version: '4.0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 4.0.0.beta
54
+ version: '4.0'
55
55
  description: The design system of ProctorU, including components, patterns, and utilities.
56
56
  email:
57
57
  - jlicata@proctoru.com