waterfall_bourbon_neat_rails 1.4.0 → 1.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/waterfall_bourbon_neat_rails/profile-menu.png +0 -0
  3. data/app/assets/stylesheets/custom/_pages.scss +7 -12
  4. data/app/assets/stylesheets/custom/components/_config.scss +1 -0
  5. data/app/assets/stylesheets/custom/components/_profileMenu.scss +74 -0
  6. data/app/assets/stylesheets/custom/components/_topMenu.scss +2 -0
  7. data/app/assets/stylesheets/custom/components/related/_profileMenu.scss +13 -0
  8. data/app/assets/stylesheets/waterfall_bourbon_neat_rails/application.scss +0 -1
  9. data/lib/waterfall_bourbon_neat_rails/version.rb +1 -1
  10. metadata +4 -2
  11. data/app/assets/stylesheets/partials/_nav.scss +0 -58
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 34a36cb76a3e52bf26d6b2371f3669b9a169b0c2
4
- data.tar.gz: 27c87fdda082b0e8c988323d71defe2efc3688b6
3
+ metadata.gz: 17cbd5bb1ac67e8ab1d160c3facae36703d30eaf
4
+ data.tar.gz: 7452fd4e0f25b848cad60fc1dbd40cbeab768eb6
5
5
  SHA512:
6
- metadata.gz: e2082e16bca4b75e80142343b5e8038be144cfc52b8a74db744bcd93022b8b704f5e175aa315a4fad30c4bdca65849996d44937ac487b20b92537f428ad3180d
7
- data.tar.gz: db0aec06804ff18cd2e66fee51734648e563f1e37459dfbb091892abaa2aa81656582d316a42fca038e41480687b514179dae013402972242eb4014cd4756c63
6
+ metadata.gz: 4644d582ef3330fce4f5262f070be78f1a0fe4ba13fae0f93ba8d800ea05368d8e3be61427fcedd0d095988ccfa6bd5a2b3d44244f2a1867ef3f20662b2aa97f
7
+ data.tar.gz: f3b302877c053ce8b4f80a4c3f86e57e786ff8e40a09e6eb8a8b18e91c2e1bcc0f2d4be75bdecdf26b0edbcb6082fdddcde905e1f34d92ab5513e917430c6e56
data/app/assets/stylesheets/custom/_pages.scss CHANGED
@@ -17,7 +17,11 @@ body{
17
17
  }
18
18
  }
19
19
  .header{
20
- z-index: 3;
20
+ z-index: 1;
21
+ display: table;
22
+ width: 100%;
23
+ zoom:1;
24
+ @include pad(5px);
21
25
  }
22
26
  .content{
23
27
  z-index: 2;
@@ -77,21 +81,12 @@ body#main {
77
81
  body#landing-page{
78
82
  .notification{}
79
83
  section.header{
80
- position: relative;
81
- background: rgb(39, 73, 160);
84
+ background: #2749a0;
82
85
  border-bottom: solid 2px rgb(7, 27, 78);
83
- height: 90px;
84
86
  .logo1{
85
- position: absolute;
86
- left: 20px;
87
- top:20px;
87
+ float: left;
88
88
  cursor: pointer;
89
89
  }
90
- .nav_menu{
91
- position: absolute;
92
- right: 20px;
93
- top:30px;
94
- }
95
90
  }
96
91
  .content{
97
92
  #table_structure{
data/app/assets/stylesheets/custom/components/_config.scss CHANGED
@@ -2,6 +2,7 @@
2
2
  @import "forms/config";
3
3
  @import "view_profile";
4
4
 
5
+ @import "profileMenu";
5
6
  @import "topMenu";
6
7
  @import "toolbar";
7
8
  @import "table";
data/app/assets/stylesheets/custom/components/_profileMenu.scss ADDED
@@ -0,0 +1,74 @@
1
+ $header-color: #2749a0;
2
+
3
+ .profileMenu{
4
+ float: right;
5
+ margin-right:20px;
6
+
7
+ .profileMenu-wrapper{
8
+ @include pad(10px 0 0 0);
9
+ }
10
+
11
+ .profileMenu-item{
12
+ @include pad(5px 10px);
13
+ display: inline-block;
14
+ position: relative;
15
+ font-weight: bold;
16
+ color: white;
17
+
18
+ &:hover{
19
+ background: white;
20
+ color: $header-color;
21
+
22
+ .innerProfileMenu{
23
+ display: table;
24
+ }
25
+ }
26
+
27
+ .innerProfileMenu{
28
+ @include pad (5px 10px);
29
+ position: absolute;
30
+ margin: 0;
31
+ top:40px;
32
+ left:0;
33
+ background: white;
34
+ z-index: 99999;
35
+ width: 100%;
36
+ }
37
+
38
+ .innerProfileMenu-item{
39
+ @include pad(5px 10px);
40
+ position: relative;
41
+ font-weight: normal;
42
+ font-size: 16px;
43
+
44
+ &:hover{
45
+ background: $header-color;
46
+ color: white;
47
+ }
48
+
49
+ a{
50
+ color: inherit;
51
+ }
52
+ }
53
+ }
54
+
55
+ .profileMenu-item-link{
56
+ color: inherit;
57
+ margin-left: 5px;
58
+ height: 30px;
59
+ line-height: 30px;
60
+ display: block;
61
+ float: left;
62
+ }
63
+
64
+ .profileMenu-item-icon{
65
+ height: 30px;
66
+ width: 30px;
67
+ padding: 0;
68
+ margin: 0;
69
+ background: white;
70
+ border-radius: 50%;
71
+ display: block;
72
+ float: left;
73
+ }
74
+ }
data/app/assets/stylesheets/custom/components/_topMenu.scss CHANGED
@@ -59,6 +59,8 @@ $menu-item-shadow: #262626;
59
59
 
60
60
  .innerMenu-item{
61
61
  @extend .menu-item;
62
+ font-weight: normal;
63
+ font-size: 14px;
62
64
  border: none;
63
65
  width: 100%;
64
66
  }
data/app/assets/stylesheets/custom/components/related/_profileMenu.scss ADDED
@@ -0,0 +1,13 @@
1
+ .profileMenu{
2
+ float: right;
3
+ margin-right:20px;
4
+ }
5
+
6
+ .profileMenu-wrapper{
7
+ @include pad(10px 0 0 0);
8
+
9
+ .profileMenu-item{
10
+ display: inline-block;
11
+ padding: 5px 10px;
12
+ }
13
+ }
data/app/assets/stylesheets/waterfall_bourbon_neat_rails/application.scss CHANGED
@@ -5,7 +5,6 @@
5
5
  @import "neat/breakpoints";
6
6
  @import "partials/variables";
7
7
  @import "partials/layout";
8
- @import "partials/nav";
9
8
  @import "custom/config";
10
9
  // @import "jquery.autocomplete";
11
10
  // include only jquery-ui modules that are needed
data/lib/waterfall_bourbon_neat_rails/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module WaterfallBourbonNeatRails
2
- VERSION = "1.4.0".freeze
2
+ VERSION = "1.4.1".freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: waterfall_bourbon_neat_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Waterfall Software Inc.
@@ -218,6 +218,7 @@ files:
218
218
  - app/assets/images/waterfall_bourbon_neat_rails/chosen-sprite@2x.png
219
219
  - app/assets/images/waterfall_bourbon_neat_rails/home-bg.jpg
220
220
  - app/assets/images/waterfall_bourbon_neat_rails/home-tile-bg.gif
221
+ - app/assets/images/waterfall_bourbon_neat_rails/profile-menu.png
221
222
  - app/assets/images/waterfall_bourbon_neat_rails/profile.jpg
222
223
  - app/assets/images/waterfall_bourbon_neat_rails/waterfall-software-logo.png
223
224
  - app/assets/javascripts/dialog.js
@@ -275,6 +276,7 @@ files:
275
276
  - app/assets/stylesheets/custom/components/_captcha.scss
276
277
  - app/assets/stylesheets/custom/components/_config.scss
277
278
  - app/assets/stylesheets/custom/components/_modals.scss
279
+ - app/assets/stylesheets/custom/components/_profileMenu.scss
278
280
  - app/assets/stylesheets/custom/components/_table.scss
279
281
  - app/assets/stylesheets/custom/components/_toolbar.scss
280
282
  - app/assets/stylesheets/custom/components/_topMenu.scss
@@ -289,6 +291,7 @@ files:
289
291
  - app/assets/stylesheets/custom/components/related/_flash.scss
290
292
  - app/assets/stylesheets/custom/components/related/_landing_page.scss
291
293
  - app/assets/stylesheets/custom/components/related/_main_page.scss
294
+ - app/assets/stylesheets/custom/components/related/_profileMenu.scss
292
295
  - app/assets/stylesheets/custom/rules.txt
293
296
  - app/assets/stylesheets/neat/_breakpoints.scss
294
297
  - app/assets/stylesheets/neat/_settings.scss
@@ -298,7 +301,6 @@ files:
298
301
  - app/assets/stylesheets/normalize/package.json
299
302
  - app/assets/stylesheets/partials/_footer.scss
300
303
  - app/assets/stylesheets/partials/_layout.scss
301
- - app/assets/stylesheets/partials/_nav.scss
302
304
  - app/assets/stylesheets/partials/_variables.scss
303
305
  - app/assets/stylesheets/waterfall_bourbon_neat_rails.css
304
306
  - app/assets/stylesheets/waterfall_bourbon_neat_rails/application.scss
data/app/assets/stylesheets/partials/_nav.scss DELETED
@@ -1,58 +0,0 @@
1
- #user-nav {
2
- float:right;
3
- li{
4
- float:left;
5
- border-left:1px solid #fff;
6
-
7
- &:first-child{
8
- border:none;
9
- }
10
- &:hover{
11
- background-color:#999;
12
- }
13
- a{
14
- text-transform:uppercase;
15
- color:#fff;
16
- padding: 3px 12px;
17
- display: block;
18
- }
19
- }
20
- }
21
-
22
- #profile {
23
- float:right;
24
- min-width:200px;
25
- li{
26
- &:hover{
27
- background-color: #fff;
28
- a {
29
- color:#477DCA;
30
- }
31
- }
32
- }
33
- a {
34
- font-weight: 800;
35
- padding: 3px 12px;
36
- white-space: nowrap;
37
- color: #FFF;
38
- display: block;
39
- text-transform: uppercase;
40
- }
41
-
42
- #profile_menu{
43
- display:none;
44
- a {
45
- color:#477DCA;
46
- font-weight: normal;
47
- &:hover{
48
- color: #FFF;
49
- background-color: #477DCA;
50
- }
51
- }
52
- }
53
- li:hover {
54
- #profile_menu{
55
- display:block;
56
- }
57
- }
58
- }