waterfall_bourbon_neat_rails 1.1.2 → 1.1.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: a6873534e2fc27b18f31ffb00d0ca9e78e5c142a
4
- data.tar.gz: 703007c3c545058b0e71b6821762e6183c2dfc12
3
+ metadata.gz: 2046ac83744d510552b412b812d7afee8ddb6827
4
+ data.tar.gz: a8a541726a932416f08d284e5643d25afb3d8981
5
5
  SHA512:
6
- metadata.gz: 71e255a419b5e4a9a0e286a238352c4dfd002495e62cfc3356c71f1b38700569b60abe5acb22ac8a9d59a2a386486e61fb2bfc46adfc8e19e6058eb3b670f2a6
7
- data.tar.gz: b089fcbb4e03cd4171a537e3f585d7e0ce2f884623600339da02df7d6e023f7e5024b7e18b87eae2354d791fd744b6b20bb6f515c177c7e5636dff4ca5e22295
6
+ metadata.gz: 9cf6490f5a556170fbbfc672bc420c328e5eb3fe0c5b24997178fec3bb089a1545e63976a4c0e9df28561fcfe6a2722fb5633b0b5d565d1caa219ad2a41b0dd1
7
+ data.tar.gz: 828c6ba919348d59f9904e83b89af7805b18ef2c335b20d91707de3bbe239a95b865866ddb3aef2aa0fb8911d93f9b35ff7feb2dabdf78dbc69e21ec726965d9
@@ -9,7 +9,6 @@
9
9
  @import 'mixins/container';
10
10
 
11
11
  // Extends
12
- @import 'extends/button';
13
12
  @import 'extends/clearfix';
14
13
  @import 'extends/hide-text';
15
14
 
@@ -18,4 +17,3 @@
18
17
  @import 'forms';
19
18
  @import 'lists';
20
19
  @import 'flashes';
21
- @import 'buttons';
@@ -74,7 +74,7 @@
74
74
  }
75
75
 
76
76
  @mixin button-negative($color: #fff, $background: transparent) {
77
- background-color:$background;
77
+ background:$background;
78
78
  color: $color;
79
79
  text-decoration: underline;
80
80
 
@@ -86,7 +86,7 @@
86
86
 
87
87
  @mixin button-positive($color: #fff, $background: #4f91cd) {
88
88
  text-decoration: none;
89
- background-color:$background;
89
+ background:$background;
90
90
  color: $color;
91
91
  border: solid 2px transparent;
92
92
 
@@ -95,4 +95,17 @@
95
95
  color:$background;
96
96
  border: solid 2px $background;
97
97
  }
98
+ }
99
+
100
+ @mixin button-positive-login($color: #fff, $hover-color: #eee){
101
+ text-transform: uppercase;
102
+ width: auto;
103
+ color: $color;
104
+ font-weight: bold;
105
+ border: none;
106
+ background: url(/assets/login-more-than-014c2c6912a50421788390500c53ba65.png) no-repeat scroll right center transparent;
107
+
108
+ &:hover{
109
+ color: $hover-color;
110
+ }
98
111
  }
@@ -35,6 +35,10 @@ body{
35
35
  @include button-negative(#444);
36
36
  }
37
37
 
38
+ .button.button-positive-login{
39
+ @include button-positive-login;
40
+ }
41
+
38
42
  z-index: 2;
39
43
  @include clearfix;
40
44
  .container{
@@ -82,40 +86,6 @@ body#main{
82
86
  }
83
87
  }
84
88
  .content{
85
- .login{
86
- margin-top:100px;
87
- background-repeat: round;
88
- padding: 10px;
89
-
90
- form{
91
- width: 500px;
92
- margin: 10px auto;
93
-
94
- .form-inputs{
95
- padding: 10px;
96
- background-color: $light_grey_op;
97
- position: relative;
98
- box-shadow: 0 0 25px 1px #00154B;
99
- color: $medium_grey;
100
- border-radius: 5px;
101
- width:100%;
102
-
103
- .forgot-password{
104
- position: absolute;
105
- bottom: 5px;
106
- right: 5px;
107
-
108
- a{
109
- color:$medium_blue;
110
- }
111
- }
112
- }
113
-
114
- .form-actions{
115
- padding: 10px;
116
- }
117
- }
118
- }
119
89
  .password-reset{
120
90
 
121
91
  form{
@@ -1,3 +1,5 @@
1
+ @import "related/config";
2
+
1
3
  @import "toolbar";
2
4
  @import "table";
3
5
  @import "ajax_spinner";
@@ -1 +1,2 @@
1
+ @import "login";
1
2
  @import "registration_and_edit";
@@ -0,0 +1,35 @@
1
+ .login-wrapper{
2
+ @include row;
3
+ @include pad(10px 0 0 0);
4
+
5
+ margin-top: 50px;
6
+ background: image-url('home-tile-bg.gif') repeat scroll left top #0057A7;
7
+ box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.46);
8
+ background-repeat: round;
9
+
10
+ #new_user{
11
+ @include outer-container;
12
+ }
13
+
14
+ .login-inputs{
15
+ @include span-columns(8);
16
+ @include shift(4);
17
+ @include pad(20px);
18
+
19
+ background-color: $light_grey_op;
20
+ box-shadow: 0 0 25px 1px #00154B;
21
+ color: $medium_grey;
22
+ border-radius: 5px;
23
+ }
24
+
25
+ .login-actions{
26
+ @include span-columns(8);
27
+ @include shift(4);
28
+ @include pad(10px 0);
29
+ }
30
+
31
+ .forgot-password{
32
+ @include row;
33
+ text-transform: uppercase;
34
+ }
35
+ }
@@ -64,6 +64,11 @@
64
64
  height: 200px;
65
65
  overflow: hidden;
66
66
  box-shadow: 0 0 1px 1px;
67
+
68
+ img{
69
+ max-width: 100%;
70
+ max-height: 100%;
71
+ }
67
72
  }
68
73
 
69
74
  .headshot{
@@ -114,6 +119,11 @@
114
119
  height: 200px;
115
120
  overflow: hidden;
116
121
  box-shadow: 0 0 1px 1px;
122
+
123
+ img{
124
+ max-width: 100%;
125
+ max-height: 100%;
126
+ }
117
127
  }
118
128
 
119
129
  .headshot{
@@ -0,0 +1,2 @@
1
+ @import "main_page";
2
+ @import "landing_page";
@@ -0,0 +1,5 @@
1
+
2
+ .welcome-shared{
3
+ color: $white;
4
+ text-align: center;
5
+ }
@@ -1,155 +1,6 @@
1
- .container {
2
- @include outer-container;
3
- text-align: left;
4
-
5
- ul, ol {
6
- font-size: 1em;
7
- font-weight: 500;
8
-
9
- li {
10
- margin: .5em 0;
11
-
12
- span {
13
- display: inline-block;
14
- }
15
- }
16
- }
17
-
18
- h2, h3 {
19
- color: #FFF;
20
- }
21
- }
22
-
23
- .large-column {
24
- @include span-columns(8 of 12);
25
- }
26
-
27
- .small-column {
28
- @include span-columns(4 of 12);
29
- }
30
-
31
- .side-bar {
32
- @include span-columns(4);
33
- }
34
-
35
- .main-content {
36
- @include span-columns(5);
37
- }
38
-
39
- .right-side-content {
40
- @include span-columns(3);
41
- @include omega();
42
- }
43
-
44
- body {
45
- height: 100%;
46
- }
47
-
48
- .login {
49
- //position: fixed;
50
- bottom: 0px;
51
- width: 100%;
52
- background: image-url('home-tile-bg.gif') repeat scroll left top #0057A7;
53
- height: 35%;
54
- box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.46);
55
- //margin-left: 0.5em;
56
- z-index: 100;
57
- color: #FFF;
58
-
59
- .form {
60
- width: 100%;
61
- overflow: hidden;
62
-
63
- label {
64
- text-align: left;
65
- &.error {
66
- color: rgba(255, 0, 0, 1);
67
- font-weight: 200;
68
- }
69
- }
70
-
71
- .forgot-password {
72
- text-transform: uppercase;
73
- a {
74
- display: block;
75
- float: right;
76
- color: #A8C7E3;
77
- &:hover {
78
- color: #FFF;
79
- }
80
- }
81
- }
82
-
83
- .form-inputs {
84
- margin-top: 1em;
85
- text-align: left;
86
-
87
- input.error {
88
- border-color: #F00;
89
- border-radius: 3px;
90
- }
91
-
92
- .glowing-border {
93
- border: 2px solid #dadada;
94
- border-radius: 7px;
95
- &:focus {
96
- outline: none;
97
- border-color: #9ecaed;
98
- box-shadow: 0 0 10px #9ecaed;
99
- }
100
- }
101
- }
102
-
103
- .form-actions {
104
- width: 28%;
105
- }
106
-
107
- input[type=submit] {
108
- padding: 3px 1em 0px 0px;
109
- display: inline-block;
110
- text-transform: uppercase;
111
- color: #FFF;
112
- font-size: 20px;
113
- border: medium none;
114
- font-family: $font-stack;
115
- font-weight: 400;
116
- margin-left: auto;
117
- background: image-url('login-more-than.png') no-repeat scroll right center transparent;
118
- &:hover {
119
- color: #A8C7E3;
120
- }
121
- }
122
- }
123
-
124
- form {
125
- display: inline-block;
126
- width: 25%;
127
- }
128
-
129
- input {
130
- background: none repeat scroll 0% 0% #FFF;
131
- padding: 0.5em;
132
- color: #0057A7;
133
- border-radius: 5px;
134
- border: medium none;
135
- width: 100%;
136
- font-family: $font-stack;
137
- font-weight: 400;
138
- }
139
-
140
- }
141
-
142
- .password-reset {
143
- @extend .login;
144
- text-align: center;
145
- height: 50%;
146
- }
147
-
148
1
  body#main {
149
2
  background: image-url('home-bg.jpg') no-repeat fixed center center / cover #383A3D;
150
3
  position: relative;
151
- // text-align: center;
152
- color:white;
153
4
 
154
5
  .header{
155
6
  .logo {
@@ -1,3 +1,3 @@
1
1
  module WaterfallBourbonNeatRails
2
- VERSION = "1.1.2".freeze
2
+ VERSION = "1.1.3".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.1.2
4
+ version: 1.1.3
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-09-22 00:00:00.000000000 Z
11
+ date: 2014-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -227,7 +227,6 @@ files:
227
227
  - app/assets/javascripts/waterfall_bourbon_neat_rails/application.js
228
228
  - app/assets/libs/abc.js
229
229
  - app/assets/stylesheets/base/_base.scss
230
- - app/assets/stylesheets/base/_buttons.scss
231
230
  - app/assets/stylesheets/base/_flashes.scss
232
231
  - app/assets/stylesheets/base/_forms.scss
233
232
  - app/assets/stylesheets/base/_lists.scss
@@ -253,7 +252,11 @@ files:
253
252
  - app/assets/stylesheets/custom/components/_toolbar.scss
254
253
  - app/assets/stylesheets/custom/components/_view_profile.scss
255
254
  - app/assets/stylesheets/custom/components/forms/_config.scss
255
+ - app/assets/stylesheets/custom/components/forms/_login.scss
256
256
  - app/assets/stylesheets/custom/components/forms/_registration_and_edit.scss
257
+ - app/assets/stylesheets/custom/components/related/_config.scss
258
+ - app/assets/stylesheets/custom/components/related/_landing_page.scss
259
+ - app/assets/stylesheets/custom/components/related/_main_page.scss
257
260
  - app/assets/stylesheets/custom/rules.txt
258
261
  - app/assets/stylesheets/libs/jquery-ui-1.10.4.min.css
259
262
  - app/assets/stylesheets/libs/jquery.ui.timepicker.css
@@ -1,10 +0,0 @@
1
- button,
2
- input[type="submit"] {
3
- @extend %button;
4
- @include appearance(none);
5
- border: none;
6
- cursor: pointer;
7
- user-select: none;
8
- vertical-align: middle;
9
- white-space: nowrap;
10
- }