waterfall_bourbon_neat_rails 2.0.1.7 → 2.0.1.8

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.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/custom/_components.scss +1 -1
  3. data/app/assets/stylesheets/custom/_pages.scss +1 -1
  4. data/app/assets/stylesheets/custom/_variables.scss +7 -0
  5. data/app/assets/stylesheets/custom/components/_config.scss +1 -1
  6. data/app/assets/stylesheets/custom/components/_modal_filters.scss +7 -0
  7. data/app/assets/stylesheets/custom/components/_modal_lead.scss +4 -1
  8. data/app/assets/stylesheets/custom/components/_modal_leadDetails.scss +4 -0
  9. data/app/assets/stylesheets/custom/components/_modal_leadReassign.scss +16 -0
  10. data/app/assets/stylesheets/custom/components/_modal_noteform.scss +45 -5
  11. data/app/assets/stylesheets/custom/components/_modal_user.scss +3 -0
  12. data/app/assets/stylesheets/custom/components/_modals.scss +3 -7
  13. data/lib/waterfall_bourbon_neat_rails/version.rb +1 -1
  14. metadata +3 -3
  15. data/app/assets/stylesheets/custom/components/_modal_new.scss +0 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 394ec64f3e75bede348d86511714c5e81c199282
4
- data.tar.gz: 17ded001cf182423f72e1437ce3eb8b86806fa66
3
+ metadata.gz: 716e26bea83d1ae2d38c6e213c579041bab659fc
4
+ data.tar.gz: 80b9baafce4c15075c1953ea7a7335b5e34b4628
5
5
  SHA512:
6
- metadata.gz: 946426dccc170857b487c5d1c10382e27305e10d2134c3f666aa196f37ef52089252414af56f3fc6851a719ae3dbe77fad5955f5a685dc9eb4e680ff302d848e
7
- data.tar.gz: 9ebeff3ee37b26ef88bf985470d269e05c5287611572685f34dc9e409a6ba6de7709c9e331aebed1f85357f8a9b79cceb9f140d34d8059d7277843cd75547acb
6
+ metadata.gz: 9e7038bf07ad9aae007dfa74b409e84839dc9109040f3e57c91c3fb5b62f4743ce7cf568908862e887d2645cce96dd5a986cc8e9c1e9b7434f92b46ff2102bf7
7
+ data.tar.gz: 9da01703b81de3ebbd4378df9905ed048c29b3ed1e4b4f6cf838fca95fe1889150cebd695d1087bd51b640ff47f98e1f9fa75f60f877527f70222c8e482b90d3
data/app/assets/stylesheets/custom/_components.scss CHANGED
@@ -1,4 +1,4 @@
1
- /* to be moved in shared assets gem */
1
+ /* to be removed after the refactoring */
2
2
 
3
3
  /*general classes*/
4
4
 
data/app/assets/stylesheets/custom/_pages.scss CHANGED
@@ -90,7 +90,7 @@ body#landing-page{
90
90
  }
91
91
  }
92
92
  .content{
93
- #table_structure, #leads_structure{
93
+ #table_structure, #leads_structure, #disabledUsers_structure{
94
94
  padding: 0 10px;
95
95
  position: relative;
96
96
  }
data/app/assets/stylesheets/custom/_variables.scss CHANGED
@@ -46,3 +46,10 @@ $default_border_radius: 5px;
46
46
  $default_font_size: 1em;
47
47
  $default_font_color: #000;
48
48
  $default_font_weight: normal;
49
+
50
+ //modals
51
+
52
+ $modal_color : #ddd;
53
+ $modal_section_color : #f7f7f7;
54
+ $modal_section_font_size : 20px;
55
+ $modal_title_font_size : 32px;
data/app/assets/stylesheets/custom/components/_config.scss CHANGED
@@ -11,7 +11,7 @@
11
11
  @import "modals";
12
12
  @import "modal_leadDetails";
13
13
  @import "modal_noteform";
14
- @import "modal_new";
14
+ @import "modal_leadReassign";
15
15
  @import "modal_lead";
16
16
  @import "modal_filters";
17
17
  @import "modal_user";
data/app/assets/stylesheets/custom/components/_modal_filters.scss CHANGED
@@ -1,5 +1,12 @@
1
1
  .filters-wrapper{
2
2
  width: 400px;
3
+
4
+ .filters{
5
+ @include pad(10px);
6
+ background: $modal_section_color;
7
+ border:solid 1px orange;
8
+ }
9
+
3
10
  .controls{
4
11
  display: table;
5
12
  margin-top:30px;
data/app/assets/stylesheets/custom/components/_modal_lead.scss CHANGED
@@ -1,7 +1,10 @@
1
1
  .leadModal-wrapper{
2
- width: 600px;
2
+ width: 620px;
3
3
 
4
4
  ul{
5
+ @include pad(10px);
6
+ border: solid 1px orange;
7
+ background: $modal_section_color;
5
8
  display: table;
6
9
  zoom: 1;
7
10
  }
data/app/assets/stylesheets/custom/components/_modal_leadDetails.scss CHANGED
@@ -1,5 +1,9 @@
1
1
  .leadDetails-wrapper{
2
2
  width: 500px;
3
+ padding: 10px;
4
+ border: solid 1px orange;
5
+ background: $modal_section_color;
6
+
3
7
  li{
4
8
  width: 100%;
5
9
  padding: 5px 10px;
data/app/assets/stylesheets/custom/components/_modal_leadReassign.scss ADDED
@@ -0,0 +1,16 @@
1
+ .reassign-body{
2
+ .reassign-section{
3
+ display: table;
4
+ @include pad(10px);
5
+ border: solid 1px orange;
6
+ background : $modal_section_color;
7
+
8
+ li{
9
+ margin-top:10px;
10
+ }
11
+ }
12
+
13
+ .modal-actions{
14
+ margin-top:20px;
15
+ }
16
+ }
data/app/assets/stylesheets/custom/components/_modal_noteform.scss CHANGED
@@ -1,6 +1,46 @@
1
- .modal-note{
2
- input[type='submit']{
3
- @include button;
4
- @include button-positive;
1
+ .notes-body{
2
+ .notes-section{
3
+ @include pad(10px);
4
+
5
+ background: $modal_section_color;
6
+ border:solid 1px orange;
5
7
  }
6
- }
8
+
9
+ .notes-stage{
10
+ display: table;
11
+ margin-top: 10px;
12
+ }
13
+
14
+ .modal-actions{
15
+ display: table;
16
+ margin-top:20px;
17
+ }
18
+
19
+ .leadNotes-wrapper{
20
+ margin-top: 10px;
21
+ display: table;
22
+
23
+ li{
24
+ display: table;
25
+ width: 600px;
26
+ margin: 10px 0;
27
+ }
28
+
29
+ .leadNote-datepicker{
30
+ width: 100px;
31
+ float: left;
32
+ }
33
+
34
+ .leadNote-content{
35
+ width:420px;
36
+ margin-left:10px;
37
+ float: left;
38
+ }
39
+
40
+ .leadNote-actions{
41
+ float: left;
42
+ width: 60px;
43
+ margin-left: 10px;
44
+ }
45
+ }
46
+ }
data/app/assets/stylesheets/custom/components/_modal_user.scss CHANGED
@@ -15,6 +15,8 @@
15
15
  .fieldset-main{
16
16
  @include span-columns(16);
17
17
  @include pad(10px 0 20px);
18
+ background: none;
19
+ font-size: inherit;
18
20
 
19
21
  input{
20
22
  height: 30px;
@@ -35,6 +37,7 @@
35
37
 
36
38
  margin-top: 10px;
37
39
  border: solid 1px #D09700;
40
+ background: $modal_section_color;
38
41
  }
39
42
 
40
43
  .fieldset-child-legend{
data/app/assets/stylesheets/custom/components/_modals.scss CHANGED
@@ -4,27 +4,23 @@
4
4
  @include pad(20px);
5
5
  top: 20px !important;
6
6
 
7
- background: #ddd;
7
+ background: $modal_color;
8
8
  border-radius: 3px;
9
9
  border: solid 1px black;
10
10
  box-shadow: 0 0 10px 1px rgb(32, 32, 32);
11
11
 
12
12
  .header-text{
13
- @include pad(0 20px 20px 0);
14
-
15
- font-size: 40px;
13
+ font-size: $modal_title_font_size;
16
14
  }
17
15
 
18
16
  .question{
19
17
  @include pad(0 0 10px 0);
20
-
21
18
  font-size: 25px;
22
19
  }
23
20
 
24
21
  .text{
25
22
  @include pad(0 0 10px 0);
26
-
27
- font-size: 20px;
23
+ font-size: $modal_section_font_size;
28
24
  }
29
25
 
30
26
  .other_html{
data/lib/waterfall_bourbon_neat_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module WaterfallBourbonNeatRails
2
- VERSION = "2.0.1.7".freeze
2
+ VERSION = "2.0.1.8".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: 2.0.1.7
4
+ version: 2.0.1.8
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-12-22 00:00:00.000000000 Z
11
+ date: 2014-12-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -302,7 +302,7 @@ files:
302
302
  - app/assets/stylesheets/custom/components/_modal_filters.scss
303
303
  - app/assets/stylesheets/custom/components/_modal_lead.scss
304
304
  - app/assets/stylesheets/custom/components/_modal_leadDetails.scss
305
- - app/assets/stylesheets/custom/components/_modal_new.scss
305
+ - app/assets/stylesheets/custom/components/_modal_leadReassign.scss
306
306
  - app/assets/stylesheets/custom/components/_modal_noteform.scss
307
307
  - app/assets/stylesheets/custom/components/_modal_user.scss
308
308
  - app/assets/stylesheets/custom/components/_modals.scss
data/app/assets/stylesheets/custom/components/_modal_new.scss DELETED
@@ -1,15 +0,0 @@
1
- .modal-new{
2
- width: 500px;
3
- li{
4
- width: 45%;
5
- float: left;
6
- margin-left: 15px;
7
- margin-top: 15px;
8
- }
9
- }
10
- .modal-new-submit{
11
- position: absolute;
12
- bottom: -425px;
13
- @include button;
14
- @include button-positive;
15
- }