TokiCLI 0.2.1 → 0.3.0

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 (129) hide show
  1. checksums.yaml +4 -4
  2. data/.coveralls.yml +1 -0
  3. data/.gitignore +9 -17
  4. data/.rspec +3 -0
  5. data/.travis.yml +3 -0
  6. data/CHANGELOG.md +4 -0
  7. data/README.md +99 -163
  8. data/Rakefile +5 -0
  9. data/TokiCLI.gemspec +5 -4
  10. data/bin/toki +2 -2
  11. data/lib/API/helpers.rb +27 -170
  12. data/lib/API/toki_api.rb +227 -0
  13. data/lib/API/toki_db.rb +67 -0
  14. data/lib/TokiCLI.rb +270 -5
  15. data/lib/TokiCLI/adnimport.rb +202 -0
  16. data/lib/TokiCLI/fileops.rb +187 -0
  17. data/lib/TokiCLI/status.rb +49 -37
  18. data/lib/TokiCLI/version.rb +1 -1
  19. data/lib/TokiCLI/view.rb +133 -86
  20. data/lib/TokiServer/.bowerrc +3 -0
  21. data/lib/TokiServer/.gitignore +2 -0
  22. data/lib/TokiServer/Gemfile +1 -0
  23. data/lib/TokiServer/bower.json +0 -0
  24. data/lib/TokiServer/bower_components/fastclick/.bower.json +4 -4
  25. data/lib/TokiServer/bower_components/fastclick/bower.json +1 -1
  26. data/lib/TokiServer/bower_components/fastclick/lib/fastclick.js +33 -2
  27. data/lib/TokiServer/bower_components/foundation/.bower.json +5 -4
  28. data/lib/TokiServer/bower_components/foundation/bower.json +2 -1
  29. data/lib/TokiServer/bower_components/foundation/css/foundation.css +2173 -922
  30. data/lib/TokiServer/bower_components/foundation/css/foundation.css.map +7 -0
  31. data/lib/TokiServer/bower_components/foundation/css/normalize.css +53 -16
  32. data/lib/TokiServer/bower_components/foundation/css/normalize.css.map +7 -0
  33. data/lib/TokiServer/bower_components/foundation/js/foundation.js +782 -542
  34. data/lib/TokiServer/bower_components/foundation/js/foundation.min.js +4 -3
  35. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.abide.js +45 -31
  36. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.accordion.js +12 -6
  37. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.alert.js +5 -5
  38. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.clearing.js +34 -10
  39. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.dropdown.js +83 -29
  40. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.equalizer.js +3 -3
  41. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.interchange.js +25 -12
  42. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.joyride.js +112 -40
  43. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.js +19 -5
  44. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.magellan.js +22 -11
  45. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.offcanvas.js +52 -8
  46. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.orbit.js +133 -271
  47. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.reveal.js +27 -20
  48. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.slider.js +73 -33
  49. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.tab.js +88 -31
  50. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.tooltip.js +7 -5
  51. data/lib/TokiServer/bower_components/foundation/js/foundation/foundation.topbar.js +44 -24
  52. data/lib/TokiServer/bower_components/foundation/js/vendor/fastclick.js +2 -2
  53. data/lib/TokiServer/bower_components/foundation/js/vendor/modernizr.js +2 -2
  54. data/lib/TokiServer/bower_components/foundation/scss/foundation.scss +38 -38
  55. data/lib/TokiServer/bower_components/foundation/scss/foundation/_functions.scss +3 -3
  56. data/lib/TokiServer/bower_components/foundation/scss/foundation/_settings.scss +417 -271
  57. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_accordion.scss +110 -6
  58. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_alert-boxes.scss +2 -2
  59. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_block-grid.scss +2 -2
  60. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_breadcrumbs.scss +8 -3
  61. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_button-groups.scss +99 -9
  62. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_buttons.scss +66 -28
  63. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_clearing.scss +5 -5
  64. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_dropdown-buttons.scss +4 -4
  65. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_dropdown.scss +48 -35
  66. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_forms.scss +104 -32
  67. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_global.scss +48 -30
  68. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_grid.scss +19 -4
  69. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_icon-bar.scss +293 -0
  70. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_joyride.scss +11 -9
  71. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_keystrokes.scss +4 -4
  72. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_labels.scss +4 -2
  73. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_magellan.scss +1 -1
  74. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_offcanvas.scss +193 -35
  75. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_orbit.scss +92 -147
  76. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_pagination.scss +22 -10
  77. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_panels.scss +10 -7
  78. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_pricing-tables.scss +11 -11
  79. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_progress-bars.scss +2 -2
  80. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_range-slider.scss +29 -9
  81. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_reveal.scss +60 -56
  82. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_side-nav.scss +3 -2
  83. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_split-buttons.scss +2 -2
  84. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_sub-nav.scss +2 -2
  85. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_switches.scss +226 -0
  86. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_tables.scss +13 -7
  87. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_tabs.scss +22 -8
  88. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_thumbs.scss +2 -4
  89. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_toolbar.scss +70 -0
  90. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_tooltips.scss +9 -7
  91. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_top-bar.scss +77 -44
  92. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_type.scss +21 -9
  93. data/lib/TokiServer/bower_components/modernizr/.bower.json +4 -4
  94. data/lib/TokiServer/bower_components/modernizr/feature-detects/workers-blobworkers.js +2 -2
  95. data/lib/TokiServer/bower_components/modernizr/grunt.js +1 -1
  96. data/lib/TokiServer/bower_components/modernizr/modernizr.js +2 -2
  97. data/lib/TokiServer/config.rb +0 -0
  98. data/lib/TokiServer/humans.txt +0 -0
  99. data/lib/TokiServer/{itunesicon.rb → itunesicons.rb} +25 -23
  100. data/lib/TokiServer/js/app.js +0 -0
  101. data/lib/TokiServer/public/stylesheets/app.css +2636 -1610
  102. data/lib/TokiServer/robots.txt +0 -0
  103. data/lib/TokiServer/scss/_settings.scss +0 -0
  104. data/lib/TokiServer/scss/app.scss +7 -1
  105. data/lib/TokiServer/tokiserver.rb +239 -244
  106. data/lib/TokiServer/views/activity.erb +42 -0
  107. data/lib/TokiServer/views/apps_total.erb +8 -2
  108. data/lib/TokiServer/views/error.erb +13 -4
  109. data/lib/TokiServer/views/index.erb +36 -27
  110. data/lib/TokiServer/views/logs_total.erb +34 -0
  111. data/spec/TokiCLI_spec.rb +354 -0
  112. data/spec/mock/mock.sqlite3 +0 -0
  113. data/spec/spec_helper.rb +26 -0
  114. metadata +78 -23
  115. data/lib/API/dbapi.rb +0 -488
  116. data/lib/TokiCLI/app.rb +0 -389
  117. data/lib/TokiCLI/authorize.rb +0 -77
  118. data/lib/TokiCLI/export.rb +0 -81
  119. data/lib/TokiCLI/get_channels.rb +0 -22
  120. data/lib/TokiCLI/get_messages.rb +0 -32
  121. data/lib/TokiCLI/import.rb +0 -122
  122. data/lib/TokiCLI/scan.rb +0 -19
  123. data/lib/TokiCLI/search_messages.rb +0 -23
  124. data/lib/TokiServer/README.md +0 -37
  125. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_reveal-new.scss +0 -0
  126. data/lib/TokiServer/bower_components/foundation/scss/foundation/components/_switch.scss +0 -294
  127. data/lib/TokiServer/views/name_log.erb +0 -50
  128. data/lib/TokiServer/views/name_split.erb +0 -37
  129. data/lib/TokiServer/views/name_total.erb +0 -34
@@ -1,3 +1,7 @@
1
+ // Foundation by ZURB
2
+ // foundation.zurb.com
3
+ // Licensed under MIT Open Source
4
+
1
5
  @import "global";
2
6
 
3
7
  //
@@ -12,18 +16,18 @@
12
16
  $include-html-table-classes: $include-html-classes !default;
13
17
 
14
18
  // These control the background color for the table and even rows
15
- $table-bg: #fff !default;
16
- $table-even-row-bg: #f9f9f9 !default;
19
+ $table-bg: $white !default;
20
+ $table-even-row-bg: $snow !default;
17
21
 
18
22
  // These control the table cell border style
19
23
  $table-border-style: solid !default;
20
24
  $table-border-size: 1px !default;
21
- $table-border-color: #ddd !default;
25
+ $table-border-color: $gainsboro !default;
22
26
 
23
27
  // These control the table head styles
24
- $table-head-bg: #f5f5f5 !default;
28
+ $table-head-bg: $white-smoke !default;
25
29
  $table-head-font-size: rem-calc(14) !default;
26
- $table-head-font-color: #222 !default;
30
+ $table-head-font-color: $jet !default;
27
31
  $table-head-font-weight: $font-weight-bold !default;
28
32
  $table-head-padding: rem-calc(8 10 10) !default;
29
33
 
@@ -43,10 +47,11 @@ $table-caption-font-weight: bold !default;
43
47
  // These control the row padding and font styles
44
48
  $table-row-padding: rem-calc(9 10) !default;
45
49
  $table-row-font-size: rem-calc(14) !default;
46
- $table-row-font-color: #222 !default;
50
+ $table-row-font-color: $jet !default;
47
51
  $table-line-height: rem-calc(18) !default;
48
52
 
49
- // These are for controlling the display and margin of tables
53
+ // These are for controlling the layout, display and margin of tables
54
+ $table-layout: auto !default;
50
55
  $table-display: table-cell !default;
51
56
  $table-margin-bottom: rem-calc(20) !default;
52
57
 
@@ -59,6 +64,7 @@ $table-margin-bottom: rem-calc(20) !default;
59
64
  background: $table-bg;
60
65
  margin-bottom: $table-margin-bottom;
61
66
  border: $table-border-style $table-border-size $table-border-color;
67
+ table-layout: $table-layout;
62
68
 
63
69
  caption {
64
70
  background: $table-caption-bg;
@@ -13,10 +13,10 @@
13
13
  $include-html-tabs-classes: $include-html-classes !default;
14
14
 
15
15
  $tabs-navigation-padding: rem-calc(16) !default;
16
- $tabs-navigation-bg-color: #efefef !default;
17
- $tabs-navigation-active-bg-color: #fff !default;
16
+ $tabs-navigation-bg-color: $silver !default;
17
+ $tabs-navigation-active-bg-color: $white !default;
18
18
  $tabs-navigation-hover-bg-color: scale-color($tabs-navigation-bg-color, $lightness: -6%) !default;
19
- $tabs-navigation-font-color: #222 !default;
19
+ $tabs-navigation-font-color: $jet !default;
20
20
  $tabs-navigation-active-font-color: $tabs-navigation-font-color !default;
21
21
  $tabs-navigation-font-size: rem-calc(16) !default;
22
22
  $tabs-navigation-font-family: $body-font-family !default;
@@ -39,14 +39,25 @@ $tabs-vertical-navigation-margin-bottom: 1.25rem !default;
39
39
  float: $default-float;
40
40
  > a {
41
41
  display: block;
42
- background: $tabs-navigation-bg-color;
42
+ background: {
43
+ color: $tabs-navigation-bg-color;
44
+ }
43
45
  color: $tabs-navigation-font-color;
44
46
  padding: $tabs-navigation-padding $tabs-navigation-padding * 2;
45
47
  font-family: $tabs-navigation-font-family;
46
48
  font-size: $tabs-navigation-font-size;
47
- &:hover { background: $tabs-navigation-hover-bg-color; }
49
+ &:hover {
50
+ background: {
51
+ color: $tabs-navigation-hover-bg-color;
52
+ }
53
+ }
48
54
  }
49
- &.active a { background: $tabs-navigation-active-bg-color; color:$tabs-navigation-active-font-color; }
55
+ &.active a {
56
+ background: {
57
+ color: $tabs-navigation-active-bg-color;
58
+ }
59
+ color:$tabs-navigation-active-font-color;
60
+ }
50
61
  }
51
62
  &.radius {
52
63
  dd:first-child, .tab:first-child {
@@ -57,7 +68,7 @@ $tabs-vertical-navigation-margin-bottom: 1.25rem !default;
57
68
  }
58
69
  }
59
70
  &.vertical {
60
- dd, .tab {
71
+ dd, .tab-title {
61
72
  position: inherit;
62
73
  float: none;
63
74
  display: block;
@@ -87,15 +98,18 @@ $tabs-vertical-navigation-margin-bottom: 1.25rem !default;
87
98
  .tabs {
88
99
  &.vertical {
89
100
  width: 20%;
101
+ max-width: 20%;
90
102
  float: $default-float;
91
- margin-bottom: $tabs-vertical-navigation-margin-bottom;
103
+ margin: 0 0 $tabs-vertical-navigation-margin-bottom;
92
104
  }
93
105
  }
94
106
  .tabs-content {
95
107
  &.vertical {
96
108
  width: 80%;
109
+ max-width: 80%;
97
110
  float: $default-float;
98
111
  margin-#{$default-float}: -1px;
112
+ padding-#{$default-float}: 1rem;
99
113
  }
100
114
  }
101
115
  }
@@ -4,8 +4,6 @@
4
4
 
5
5
  @import "global";
6
6
 
7
-
8
-
9
7
  //
10
8
  // @name _thumbs.scss
11
9
  // @dependencies _globals.scss
@@ -20,8 +18,8 @@ $include-html-media-classes: $include-html-classes !default;
20
18
  // We use these to control border styles
21
19
  $thumb-border-style: solid !default;
22
20
  $thumb-border-width: 4px !default;
23
- $thumb-border-color: #fff !default;
24
- $thumb-box-shadow: 0 0 0 1px rgba(#000,.2) !default;
21
+ $thumb-border-color: $white !default;
22
+ $thumb-box-shadow: 0 0 0 1px rgba($black,.2) !default;
25
23
  $thumb-box-shadow-hover: 0 0 6px 1px rgba($primary-color,0.5) !default;
26
24
 
27
25
  // Radius and transition speed for thumbs
@@ -0,0 +1,70 @@
1
+ // Foundation by ZURB
2
+ // foundation.zurb.com
3
+ // Licensed under MIT Open Source
4
+ // toolbar styles
5
+
6
+ .toolbar {
7
+ background: $oil;
8
+ width: 100%;
9
+ font-size: 0;
10
+ display: inline-block;
11
+
12
+ &.label-bottom .tab .tab-content {
13
+ i, img { margin-bottom: 10px; }
14
+ }
15
+
16
+ &.label-right .tab .tab-content {
17
+ i, img { margin-right: 10px; display: inline-block;}
18
+ label { display: inline-block; }
19
+ }
20
+
21
+ &.vertical.label-right .tab .tab-content {
22
+ text-align: left;
23
+ }
24
+
25
+ &.vertical {
26
+ height: 100%;
27
+ width: auto;
28
+
29
+ .tab {
30
+ width: auto;
31
+ margin: auto;
32
+ float: none;
33
+ }
34
+ }
35
+
36
+ .tab {
37
+ text-align: center;
38
+ width: 25%;
39
+ margin: 0 auto;
40
+ display: block;
41
+ padding: 20px;
42
+ float: left;
43
+
44
+ &:hover {
45
+ background: rgba($white, 0.1);
46
+ }
47
+ }
48
+ }
49
+
50
+ .toolbar .tab-content {
51
+ font-size: 16px;
52
+ text-align: center;
53
+
54
+ label { color: $iron; }
55
+
56
+ i {
57
+ font-size: 30px;
58
+ display: block;
59
+ margin: 0 auto;
60
+ color: $iron;
61
+ vertical-align: middle;
62
+ }
63
+
64
+ img {
65
+ width: 30px;
66
+ height: 30px;
67
+ display: block;
68
+ margin: 0 auto;
69
+ }
70
+ }
@@ -9,26 +9,27 @@
9
9
  //
10
10
  $include-html-tooltip-classes: $include-html-classes !default;
11
11
 
12
- $has-tip-border-bottom: dotted 1px #ccc !default;
12
+ $has-tip-border-bottom: dotted 1px $iron !default;
13
13
  $has-tip-font-weight: $font-weight-bold !default;
14
- $has-tip-font-color: #333 !default;
14
+ $has-tip-font-color: $oil !default;
15
15
  $has-tip-border-bottom-hover: dotted 1px scale-color($primary-color, $lightness: -55%) !default;
16
16
  $has-tip-font-color-hover: $primary-color !default;
17
17
  $has-tip-cursor-type: help !default;
18
18
 
19
19
  $tooltip-padding: rem-calc(12) !default;
20
- $tooltip-bg: #333 !default;
20
+ $tooltip-bg: $oil !default;
21
21
  $tooltip-font-size: rem-calc(14) !default;
22
22
  $tooltip-font-weight: $font-weight-normal !default;
23
- $tooltip-font-color: #fff !default;
23
+ $tooltip-font-color: $white !default;
24
24
  $tooltip-line-height: 1.3 !default;
25
25
  $tooltip-close-font-size: rem-calc(10) !default;
26
26
  $tooltip-close-font-weight: $font-weight-normal !default;
27
- $tooltip-close-font-color: #777 !default;
27
+ $tooltip-close-font-color: $monsoon !default;
28
28
  $tooltip-font-size-sml: rem-calc(14) !default;
29
29
  $tooltip-radius: $global-radius !default;
30
30
  $tooltip-rounded: $global-rounded !default;
31
31
  $tooltip-pip-size: 5px !default;
32
+ $tooltip-max-width: 300px !default;
32
33
 
33
34
  @include exports("tooltip") {
34
35
  @if $include-html-tooltip-classes {
@@ -53,12 +54,12 @@ $tooltip-pip-size: 5px !default;
53
54
  .tooltip {
54
55
  display: none;
55
56
  position: absolute;
56
- z-index: 999;
57
+ z-index: 1006;
57
58
  font-weight: $tooltip-font-weight;
58
59
  font-size: $tooltip-font-size;
59
60
  line-height: $tooltip-line-height;
60
61
  padding: $tooltip-padding;
61
- max-width: 85%;
62
+ max-width: $tooltip-max-width;
62
63
  #{$default-float}: 50%;
63
64
  width: 100%;
64
65
  color: $tooltip-font-color;
@@ -73,6 +74,7 @@ $tooltip-pip-size: 5px !default;
73
74
  border: solid $tooltip-pip-size;
74
75
  border-color: transparent transparent $tooltip-bg transparent;
75
76
  top: -($tooltip-pip-size * 2);
77
+ pointer-events: none;
76
78
 
77
79
  &.rtl {
78
80
  left: auto;
@@ -12,7 +12,7 @@
12
12
  $include-html-top-bar-classes: $include-html-classes !default;
13
13
 
14
14
  // Background color for the top bar
15
- $topbar-bg-color: #333 !default;
15
+ $topbar-bg-color: $oil !default;
16
16
  $topbar-bg: $topbar-bg-color !default;
17
17
 
18
18
  // Height and margin
@@ -24,47 +24,49 @@ $topbar-title-weight: $font-weight-normal !default;
24
24
  $topbar-title-font-size: rem-calc(17) !default;
25
25
 
26
26
  // Style the top bar dropdown elements
27
- $topbar-dropdown-bg: #333 !default;
28
- $topbar-dropdown-link-color: #fff !default;
29
- $topbar-dropdown-link-bg: #333 !default;
27
+ $topbar-dropdown-bg: $oil !default;
28
+ $topbar-dropdown-link-color: $white !default;
29
+ $topbar-dropdown-link-bg: $oil !default;
30
30
  $topbar-dropdown-link-weight: $font-weight-normal !default;
31
31
  $topbar-dropdown-toggle-size: 5px !default;
32
- $topbar-dropdown-toggle-color: #fff !default;
32
+ $topbar-dropdown-toggle-color: $white !default;
33
33
  $topbar-dropdown-toggle-alpha: 0.4 !default;
34
34
 
35
35
  // Set the link colors and styles for top-level nav
36
- $topbar-link-color: #fff !default;
37
- $topbar-link-color-hover: #fff !default;
38
- $topbar-link-color-active: #fff !default;
39
- $topbar-link-color-active-hover: #fff !default;
36
+ $topbar-link-color: $white !default;
37
+ $topbar-link-color-hover: $white !default;
38
+ $topbar-link-color-active: $white !default;
39
+ $topbar-link-color-active-hover: $white !default;
40
40
  $topbar-link-weight: $font-weight-normal !default;
41
41
  $topbar-link-font-size: rem-calc(13) !default;
42
42
  $topbar-link-hover-lightness: -10% !default; // Darken by 10%
43
43
  $topbar-link-bg: $topbar-bg !default;
44
44
  $topbar-link-bg-hover: #272727 !default;
45
+ $topbar-link-bg-color-hover: $charcoal !default;
45
46
  $topbar-link-bg-active: $primary-color !default;
46
47
  $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%) !default;
47
48
  $topbar-link-font-family: $body-font-family !default;
48
49
  $topbar-link-text-transform: none !default;
49
50
  $topbar-link-padding: $topbar-height / 3 !default;
50
-
51
+ $topbar-back-link-size: rem-calc(18) !default;
52
+ $topbar-link-dropdown-padding: 20px;
51
53
  $topbar-button-font-size: 0.75rem !default;
52
54
  $topbar-button-top: 7px !default;
53
55
 
54
- $topbar-dropdown-label-color: #777 !default;
56
+ $topbar-dropdown-label-color: $monsoon !default;
55
57
  $topbar-dropdown-label-text-transform: uppercase !default;
56
58
  $topbar-dropdown-label-font-weight: $font-weight-bold !default;
57
59
  $topbar-dropdown-label-font-size: rem-calc(10) !default;
58
- $topbar-dropdown-label-bg: #333 !default;
60
+ $topbar-dropdown-label-bg: $oil !default;
59
61
 
60
62
  // Top menu icon styles
61
63
  $topbar-menu-link-transform: uppercase !default;
62
64
  $topbar-menu-link-font-size: rem-calc(13) !default;
63
65
  $topbar-menu-link-weight: $font-weight-bold !default;
64
- $topbar-menu-link-color: #fff !default;
65
- $topbar-menu-icon-color: #fff !default;
66
- $topbar-menu-link-color-toggled: #888 !default;
67
- $topbar-menu-icon-color-toggled: #888 !default;
66
+ $topbar-menu-link-color: $white !default;
67
+ $topbar-menu-icon-color: $white !default;
68
+ $topbar-menu-link-color-toggled: $jumbo !default;
69
+ $topbar-menu-icon-color-toggled: $jumbo !default;
68
70
 
69
71
  // Transitions and breakpoint styles
70
72
  $topbar-transition-speed: 300ms !default;
@@ -159,16 +161,21 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
159
161
  form,
160
162
  input { margin-bottom: 0; }
161
163
 
162
- input { height: auto; padding-top: .35rem; padding-bottom: .35rem; font-size: $topbar-button-font-size; }
164
+ input { height: 1.8rem; padding-top: .35rem; padding-bottom: .35rem; font-size: $topbar-button-font-size; }
163
165
 
164
166
  .button, button {
165
- padding-top: .45rem;
166
- padding-bottom: .35rem;
167
+ padding-top: .35rem + rem-calc(1);
168
+ padding-bottom: .35rem + rem-calc(1);
167
169
  margin-bottom: 0;
168
170
  font-size: $topbar-button-font-size;
169
171
  // position: relative;
170
172
  // top: -1px;
171
-
173
+
174
+ // Corrects a slight misalignment when put next to an input field
175
+ @media #{$small-only} {
176
+ position: relative;
177
+ top: -1px;
178
+ }
172
179
  }
173
180
 
174
181
  // Title Area
@@ -216,10 +223,8 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
216
223
 
217
224
  // Adding the class "menu-icon" will add the 3-line icon people love and adore.
218
225
  &.menu-icon {
219
- #{$opposite-direction}: $topbar-link-padding;
220
226
  top: 50%;
221
227
  margin-top: -16px;
222
- padding-#{$default-float}: 40px;
223
228
 
224
229
  a {
225
230
  @if $text-direction == rtl {
@@ -227,11 +232,11 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
227
232
  }
228
233
  height: 34px;
229
234
  line-height: 33px;
230
- padding: 0;
235
+ padding: 0 $topbar-link-padding+25 0 $topbar-link-padding;
231
236
  color: $topbar-menu-link-color;
232
237
  position: relative;
233
238
 
234
- &::after {
239
+ & {
235
240
  // @include hamburger icon
236
241
  //
237
242
  // We use this to create the icon with three lines aka the hamburger icon, the menu-icon or the navicon
@@ -243,8 +248,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
243
248
  // $color - icon color
244
249
  // $hover-color - icon color during hover, here it is set the same as $color because the values are changed on line 264
245
250
  // $offcanvas - Set to false of @include in topbar
246
- @include hamburger(16px, false, 0, 1px, 6px, $topbar-menu-icon-color, $topbar-menu-icon-color, false );
247
- #{$opposite-direction}: 0;
251
+ @include hamburger(16px, false, 0, 1px, 6px, $topbar-menu-icon-color, $topbar-menu-icon-color, false);
248
252
  }
249
253
  }
250
254
  }
@@ -268,9 +272,6 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
268
272
  }
269
273
  }
270
274
  }
271
-
272
-
273
-
274
275
  }
275
276
 
276
277
  // Right and Left Navigation that stacked by default
@@ -335,7 +336,10 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
335
336
 
336
337
  // Apply the hover link color when it has that class
337
338
  &:hover:not(.has-form) > a {
338
- background: $topbar-link-bg-hover;
339
+ background-color: $topbar-link-bg-color-hover;
340
+ @if ($topbar-link-bg-hover) {
341
+ background: $topbar-link-bg-hover;
342
+ }
339
343
  color: $topbar-link-color-hover;
340
344
 
341
345
  }
@@ -403,13 +407,16 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
403
407
  }
404
408
  }
405
409
 
406
- &.title h5 {
410
+ &.title h5, &.parent-link {
411
+ // Back Button
407
412
  margin-bottom: 0;
408
413
  margin-top: 0;
414
+ font-size: $topbar-back-link-size;
409
415
  a {
410
416
  color: $topbar-link-color;
411
- line-height: $topbar-height / 2;
417
+ // line-height: $topbar-height / 2;
412
418
  display: block;
419
+ &:hover { background:none; }
413
420
  }
414
421
  }
415
422
  &.has-form { padding: 8px $topbar-link-padding; }
@@ -477,7 +484,10 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
477
484
  li {
478
485
  &.hover {
479
486
  > a:not(.button) {
480
- background: $topbar-link-bg-hover;
487
+ background-color: $topbar-link-bg-color-hover;
488
+ @if ($topbar-link-bg-hover) {
489
+ background: $topbar-link-bg-hover;
490
+ }
481
491
  color: $topbar-link-color-hover;
482
492
  }
483
493
  }
@@ -486,7 +496,12 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
486
496
  padding: 0 $topbar-link-padding;
487
497
  line-height: $topbar-height;
488
498
  background: $topbar-link-bg;
489
- &:hover { background: $topbar-link-bg-hover; }
499
+ &:hover {
500
+ background-color: $topbar-link-bg-color-hover;
501
+ @if ($topbar-link-bg-hover) {
502
+ background: $topbar-link-bg-hover;
503
+ }
504
+ }
490
505
  }
491
506
  }
492
507
  &.active:not(.has-form) {
@@ -495,7 +510,10 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
495
510
  line-height: $topbar-height;
496
511
  color: $topbar-link-color-active;
497
512
  background: $topbar-link-bg-active;
498
- &:hover { background: $topbar-link-bg-active-hover; }
513
+ &:hover {
514
+ background: $topbar-link-bg-active-hover;
515
+ color: $topbar-link-color-active-hover;
516
+ }
499
517
  }
500
518
  }
501
519
  }
@@ -505,7 +523,7 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
505
523
  @if($topbar-arrows){
506
524
 
507
525
  & > a {
508
- padding-#{$opposite-direction}: $topbar-link-padding + 20 !important;
526
+ padding-#{$opposite-direction}: $topbar-link-padding + $topbar-link-dropdown-padding !important;
509
527
  &:after {
510
528
  @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), top);
511
529
  margin-top: -($topbar-dropdown-toggle-size / 2);
@@ -526,6 +544,9 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
526
544
  @include topbar-show-dropdown();
527
545
  }
528
546
  }
547
+ > a:focus + .dropdown {
548
+ @include topbar-show-dropdown();
549
+ }
529
550
 
530
551
  .dropdown li.has-dropdown {
531
552
  & > a {
@@ -557,13 +578,19 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
557
578
  background: $topbar-dropdown-link-bg;
558
579
  }
559
580
 
560
- &:not(.has-form) a:not(.button) {
561
- color: $topbar-dropdown-link-color;
562
- background: $topbar-dropdown-link-bg;
563
- }
564
- &:not(.has-form):hover > a:not(.button) {
565
- color: $topbar-link-color-hover;
566
- background: $topbar-link-bg-hover;
581
+ &:not(.has-form):not(.active) {
582
+ & > a:not(.button) {
583
+ color: $topbar-dropdown-link-color;
584
+ background: $topbar-dropdown-link-bg;
585
+ }
586
+
587
+ &:hover > a:not(.button) {
588
+ color: $topbar-link-color-hover;
589
+ background-color: $topbar-link-bg-color-hover;
590
+ @if ($topbar-link-bg-hover) {
591
+ background: $topbar-link-bg-hover;
592
+ }
593
+ }
567
594
  }
568
595
 
569
596
  label {
@@ -620,7 +647,10 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
620
647
  ul li {
621
648
  // Apply the hover link color when it has that class
622
649
  &:hover > a {
623
- background: $topbar-link-bg-hover;
650
+ background-color: $topbar-link-bg-color-hover;
651
+ @if ($topbar-link-bg-hover) {
652
+ background: $topbar-link-bg-hover;
653
+ }
624
654
  color: $topbar-link-color-hover;
625
655
  }
626
656
 
@@ -637,6 +667,9 @@ $topbar-arrows: true !default; //Set false to remove the triangle icon from the
637
667
  @include topbar-show-dropdown();
638
668
  }
639
669
  }
670
+ > a:focus + .dropdown {
671
+ @include topbar-show-dropdown();
672
+ }
640
673
  }
641
674
  }
642
675
  }