waterfall_bourbon_neat_rails 1.2.5 → 1.2.7

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 145d06fa6222fcb283041b2f494263a8ae7d676b
4
- data.tar.gz: f39619bf83fd32fd6ac4d2792034ba4bb00252ff
3
+ metadata.gz: 532a6370b781a38bbf29a2a1d4a620d7f1a87234
4
+ data.tar.gz: a51e243d328a03bbccda27efdf201868ad58419f
5
5
  SHA512:
6
- metadata.gz: 5fa6a74c95ebfe2e1e519907fbb407bb7d22bd902e4e275f72c8543000037a3fc71e20e52f51ebaddc91977167cd11ea576d8f42cce8361bae99b0b3ed476858
7
- data.tar.gz: e19c14beb4ec462fa29b8d992a190e1f4da78f48704a8dce757ba3fcd297dbb7433d9f715c976bf6ea822372c6d23f718e876f16a4d525d5707c9052d432b0f7
6
+ metadata.gz: 7c125c82afd450d8a492e126ea6da705a78e6d7a92901ed473244d21854059a0d636eac67398ed7924c7f3457dec7e014bfda75a3d7f3411e7d318c6d4a42de8
7
+ data.tar.gz: 2bedd9500eb8598a0dc5893efdfc85946324f9ebdb6936f35eb29191a27afd50290d56a6eccffa539d894f178a40990e9350014b64b615e70baa2e5f553ebbc9
@@ -9,7 +9,6 @@
9
9
  @import 'mixins/container';
10
10
 
11
11
  // Extends
12
- @import 'extends/clearfix';
13
12
  @import 'extends/hide-text';
14
13
 
15
14
  // Typography and Elements
@@ -8,3 +8,26 @@
8
8
  margin-left: auto;
9
9
  margin-right: auto;
10
10
  }
11
+
12
+
13
+ //buttons
14
+ .button{
15
+ @include button;
16
+ }
17
+ .button-positive{
18
+ @include button-positive;
19
+ }
20
+
21
+ .button-positive.type2{
22
+ @include button-positive-style2;
23
+ }
24
+
25
+ .button-negative{
26
+ @include button-negative(#000);
27
+ margin-left:30px;
28
+ }
29
+
30
+ .button-negative.type2{
31
+ @include button-negative-style2;
32
+ float:right;
33
+ }
@@ -50,6 +50,7 @@
50
50
  height: $height;
51
51
  line-height: $height;
52
52
  font-weight: bold;
53
+ font: inherit;
53
54
  text-align: center;
54
55
  padding: 0;
55
56
  cursor: pointer;
@@ -64,7 +65,7 @@
64
65
  }
65
66
  }
66
67
 
67
- @mixin button($size: 18px, $side: left, $weight: bold){
68
+ @mixin button($size: 18px, $side: left, $weight: normal){
68
69
  float: $side;
69
70
  font-size: $size;
70
71
  border-radius: 5px;
@@ -73,11 +74,14 @@
73
74
  cursor: pointer;
74
75
  min-width: 100px;
75
76
  text-align: center;
77
+ outline: none;
78
+ width: auto;
76
79
  }
77
80
 
78
81
  @mixin button-negative($color: #fff, $background: transparent) {
79
82
  background:$background;
80
83
  color: $color;
84
+ font-weight: bold;
81
85
  text-decoration: underline;
82
86
 
83
87
  &:hover{
@@ -103,12 +107,12 @@
103
107
  text-transform: uppercase;
104
108
  width: auto;
105
109
  color: $color;
106
- font-weight: bold;
107
110
  border: none;
108
111
  background: url(/assets/login-more-than-014c2c6912a50421788390500c53ba65.png) no-repeat scroll right center transparent;
109
112
 
110
- &:hover{
113
+ &:hover, &:focus{
111
114
  color: $hover-color;
115
+ border: none;
112
116
  }
113
117
  }
114
118
 
@@ -119,6 +123,7 @@
119
123
  color: $color;
120
124
  font-weight: bold;
121
125
  border: none;
126
+ text-decoration: none;
122
127
 
123
128
  &:hover{
124
129
  color: $hover-color;
@@ -10,8 +10,6 @@
10
10
  // from here we can push other styling attributes for each other page
11
11
 
12
12
  body{
13
- font-family: $primaryFontFamily;
14
-
15
13
  .notification{
16
14
  z-index: 4;
17
15
  .flash-error, .flash-notice{
@@ -22,29 +20,6 @@ body{
22
20
  z-index: 3;
23
21
  }
24
22
  .content{
25
- .button{
26
- @include button;
27
- width: auto;
28
- }
29
-
30
- .button.button-positive{
31
- @include button-positive;
32
- }
33
-
34
- .button.button-negative{
35
- @include button-negative(#444);
36
- }
37
-
38
- .button.button-positive.type2{
39
- @include button-positive-style2;
40
- }
41
-
42
- .button.button-negative.type2{
43
- @include button-negative-style2;
44
- float: right;
45
- text-decoration: none;
46
- }
47
-
48
23
  z-index: 2;
49
24
  @include clearfix;
50
25
  .container{
@@ -86,7 +61,7 @@ body#main {
86
61
  section.header {
87
62
  .logo {
88
63
  @include outer-container;
89
- padding: 80px 0;
64
+ padding: 50px 0;
90
65
  img {
91
66
  width: 400px;
92
67
  }
@@ -7,12 +7,16 @@
7
7
  box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.46);
8
8
  background-repeat: round;
9
9
 
10
- .title{
11
- @include span-columns(4);
12
- @include shift(5);
13
- @include pad(10px);
14
- color: #fff;
15
- text-transform: uppercase;
10
+ .title-wrapper{
11
+ @include outer-container;
12
+
13
+ .title{
14
+ @include span-columns(8);
15
+ @include shift(4);
16
+ @include pad(10px 0);
17
+ color: #fff;
18
+ text-transform: uppercase;
19
+ }
16
20
  }
17
21
 
18
22
  #new_user{
@@ -7,15 +7,19 @@
7
7
  box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.46);
8
8
  background-repeat: round;
9
9
 
10
- .title, .info{
11
- @include span-columns(4);
12
- @include shift(5);
13
- @include pad(5px 10px);
14
- color: #fff;
15
- }
10
+ .title-wrapper{
11
+ @include outer-container;
12
+
13
+ .title, .info{
14
+ @include span-columns(8);
15
+ @include shift(4);
16
+ @include pad(5px 0);
17
+ color: #fff;
18
+ }
16
19
 
17
- .title, .label{
18
- text-transform: uppercase;
20
+ .title, .label{
21
+ text-transform: uppercase;
22
+ }
19
23
  }
20
24
 
21
25
  #reset_password_form{
@@ -1,9 +1,11 @@
1
1
  .registration-wrapper, .update-wrapper{
2
- @include outer-container;
2
+ @include span-columns(12);
3
+ @include shift(2);
3
4
  @include pad(20px 0);
4
5
 
5
6
  background-color: $container_color_3;
6
7
  color: $light_blue;
8
+ box-shadow: 0 0 12px 1px #1F1F1F;
7
9
 
8
10
  form{
9
11
  @include row;
@@ -25,6 +27,7 @@
25
27
  @include pad(10px 0);
26
28
 
27
29
  margin-top: 15px;
30
+ border: solid 1px #B6B6B6;
28
31
  }
29
32
 
30
33
  .fieldset-child-legend{
@@ -0,0 +1,3 @@
1
+ body{
2
+ font-family: $primaryFontFamily;
3
+ }
@@ -1,3 +1,3 @@
1
1
  module WaterfallBourbonNeatRails
2
- VERSION = "1.2.5".freeze
2
+ VERSION = "1.2.7".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: waterfall_bourbon_neat_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.5
4
+ version: 1.2.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Waterfall Software Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-01 00:00:00.000000000 Z
11
+ date: 2014-10-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -257,8 +257,6 @@ files:
257
257
  - app/assets/stylesheets/base/_lists.scss
258
258
  - app/assets/stylesheets/base/_typography.scss
259
259
  - app/assets/stylesheets/base/_variables.scss
260
- - app/assets/stylesheets/base/extends/_button.scss
261
- - app/assets/stylesheets/base/extends/_clearfix.scss
262
260
  - app/assets/stylesheets/base/extends/_hide-text.scss
263
261
  - app/assets/stylesheets/base/mixins/_container.scss
264
262
  - app/assets/stylesheets/base/mixins/_flash.scss
@@ -1,17 +0,0 @@
1
- %button {
2
- -webkit-font-smoothing: antialiased;
3
- background-color: $base-button-color;
4
- border-radius: $base-border-radius;
5
- color: white;
6
- display: inline-block;
7
- font-size: $base-font-size;
8
- font-weight: bold;
9
- line-height: 1;
10
- padding: .75em 1em;
11
- text-decoration: none;
12
-
13
- &:hover {
14
- background-color: $hover-button-color;
15
- color: white;
16
- }
17
- }
@@ -1,3 +0,0 @@
1
- %clearfix {
2
- @include clearfix;
3
- }