diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
index 0e3719cc3..125a6e3ce 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsNewOpenPgpKey.html
@@ -14,7 +14,7 @@
-
diff --git a/vendors/bootstrap/less/button-groups.less b/vendors/bootstrap/less/button-groups.less
index 3e26ecb6f..c17b30b2b 100644
--- a/vendors/bootstrap/less/button-groups.less
+++ b/vendors/bootstrap/less/button-groups.less
@@ -81,14 +81,6 @@
z-index: 2;
}
-// On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
- outline: 0;
-}
-
-
-
// Split button dropdowns
// ----------------------
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 45e64cc1d..03e6f4822 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -40,7 +40,6 @@
&.active,
&:active {
opacity: 0.9;
- outline: 0;
box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
}
diff --git a/vendors/bootstrap/less/dropdowns.less b/vendors/bootstrap/less/dropdowns.less
index 6cbe547d7..8154a6bc8 100644
--- a/vendors/bootstrap/less/dropdowns.less
+++ b/vendors/bootstrap/less/dropdowns.less
@@ -7,10 +7,6 @@
.dropdown {
position: relative;
}
-.dropdown-toggle:active,
-.open .dropdown-toggle {
- outline: 0;
-}
// Dropdown arrow/caret
// --------------------
@@ -80,7 +76,6 @@
.dropdown-menu .active > a:hover {
color: @dropdownLinkColorHover;
text-decoration: none;
- outline: 0;
background-color: @dropdownLinkBackgroundActive;
}
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index d066054fc..8e16d3dcc 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -65,7 +65,7 @@ textarea {
// Shared size and type resets
select,
textarea,
-input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) {
+input {
box-sizing: border-box;
display: inline-block;
height: @baseLineHeight + 10;
@@ -87,7 +87,7 @@ textarea {
}
// Everything else
textarea,
-input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) {
+input {
background-color: @inputBackground;
border: 1px solid @inputBorder;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
@@ -98,7 +98,6 @@ input:not([type="radio"]):not([type="checkbox"]):not([type="hidden"]) {
background-color: #fff;
border-color: darken(@inputBorder, 20%);
box-shadow: none;
- outline: 0;
}
}
@@ -199,21 +198,6 @@ input[type="checkbox"][readonly] {
.formFieldState(@errorText, @errorText, @errorBackground);
}
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:required:invalid,
-textarea:focus:required:invalid,
-select:focus:required:invalid {
- color: #b94a48;
- border-color: #ee5f5b;
- &:focus {
- border-color: darken(#ee5f5b, 10%);
- box-shadow: 0 0 6px lighten(#ee5f5b, 20%);
- }
-}
-
-
-
// INPUT GROUPS
// ------------
@@ -222,28 +206,20 @@ select:focus:required:invalid {
margin-bottom: 5px;
font-size: 0;
white-space: nowrap; // Prevent span and input from separating
+ position: relative;
input,
select {
- position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
font-size: @baseFontSize;
vertical-align: top;
border-radius: @inputBorderRadius;
- // Make input on top when focused so blue border and shadow always show
- &:focus {
- z-index: 2;
- }
}
.btn {
margin-left: -1px;
vertical-align: top;
border-radius: 0;
}
- .active {
- background-color: lighten(@green, 30);
- border-color: @green;
- }
.btn:last-child {
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}