diff --git a/app/assets/javascripts/initializers/initializeBaseUserData.js b/app/assets/javascripts/initializers/initializeBaseUserData.js
index 4bf58c524..afa8a01cc 100644
--- a/app/assets/javascripts/initializers/initializeBaseUserData.js
+++ b/app/assets/javascripts/initializers/initializeBaseUserData.js
@@ -1,6 +1,6 @@
function initializeBaseUserData(){
var user = userData()
- var userProfileLinkHTML = '@'+user.username+'
'
+ var userProfileLinkHTML = '@'+user.username+'
'
document.getElementById("user-profile-link-placeholder").innerHTML = userProfileLinkHTML;
document.getElementById("nav-profile-image").src = user.profile_image_90;
initializeUserSidebar(user);
diff --git a/app/assets/javascripts/initializers/initializeTouchDevice.js b/app/assets/javascripts/initializers/initializeTouchDevice.js
index 25fa8f45a..77f88ee9d 100644
--- a/app/assets/javascripts/initializers/initializeTouchDevice.js
+++ b/app/assets/javascripts/initializers/initializeTouchDevice.js
@@ -12,6 +12,28 @@ function initializeTouchDevice() {
}
} else {
document.getElementById("navbar-menu-wrapper").classList.add('desktop')
+ document.getElementById("navigation-butt").onfocus = function(e){
+ document.getElementById("navbar-menu-wrapper").classList.add('showing');
+ }
+ document.getElementById("last-nav-link").onblur = function(e) {
+ setTimeout(function(){
+ console.log(document.activeElement)
+ if (document.activeElement != document.getElementById("second-last-nav-link")) {
+ document.getElementById("navbar-menu-wrapper").classList.remove('showing');
+ }
+ }, 10)
+ }
+ document.getElementById("navigation-butt").onblur = function(e){
+ setTimeout(function(){
+ console.log(document.activeElement)
+ if (document.activeElement != document.getElementById("first-nav-link")) {
+ document.getElementById("navbar-menu-wrapper").classList.remove('showing');
+ }
+ }, 10)
+ }
+ }
+ document.getElementById("menubg").onclick = function(e) {
+ document.getElementById("navbar-menu-wrapper").classList.remove('showing');
}
},10)
}
diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss
index 6fe1aa29f..d5d1f0753 100644
--- a/app/assets/stylesheets/scaffolds.scss
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -9,9 +9,7 @@ body {
margin:0 !important;
margin-top:-20px !important;
overflow-y:scroll;
- :focus {
- outline: 0;
- }
+
}
.ptr--ptr{
@@ -95,3 +93,7 @@ button{
input[type="submit"]{
cursor:pointer;
};
+
+input[type="text"],textarea, input[type="url"], input[type="email"]{
+ outline: 0;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/top-bar.scss b/app/assets/stylesheets/top-bar.scss
index e2e858c45..395e11379 100644
--- a/app/assets/stylesheets/top-bar.scss
+++ b/app/assets/stylesheets/top-bar.scss
@@ -177,7 +177,7 @@
}
}
&.desktop {
- &:hover {
+ &:hover,&:active,&:focus {
.menu {
display: block;
}
diff --git a/app/views/layouts/_nav_menu.html.erb b/app/views/layouts/_nav_menu.html.erb
index 6936761a3..2d6980d05 100644
--- a/app/views/layouts/_nav_menu.html.erb
+++ b/app/views/layouts/_nav_menu.html.erb
@@ -25,12 +25,12 @@
Settings
-
+
Key Links
-
+
Sign Out
@@ -38,7 +38,7 @@
<% else %>
-
+
Via GitHub
-
+
All about dev.to