Skip to content

Commit 45d4ed1

Browse files
committed
Fix Firefox Styles
1 parent 0d6cbc2 commit 45d4ed1

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

app/assets/stylesheets/application.css.scss

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ html {
4646
margin: 1.2rem 3rem 1.2rem 1rem;
4747
}
4848

49+
.language-selector a span {
50+
display: block;
51+
float: left;
52+
}
53+
4954
.actions-menu > .dropdown > .language b {
5055
display: inline-block;
5156
margin-left: 0.7rem;
@@ -83,31 +88,33 @@ html {
8388
}
8489

8590
input:-webkit-autofill {
86-
-webkit-box-shadow: 0 0 0 1000px $form-input-bg-color inset !important;
91+
-webkit-box-shadow: 0 0 0px 1000px $form-input-bg-color inset;
92+
transition: background-color 100000s ease-in-out 0s;
8793
}
8894

8995
span.input-group-addon {
9096
padding: 2rem 2rem 2rem 3rem;
9197
}
9298

9399
span.show-password {
100+
border-radius: 0 0.3rem 0.3rem 0;
94101
cursor: pointer;
95102
}
96103

97104
::-webkit-input-placeholder { /* Chrome/Opera/Safari */
98-
color: $form-login-gray-text;
105+
color: $form-input-glyph;
99106
}
100107

101108
::-moz-placeholder { /* Firefox 19+ */
102-
color: $form-login-gray-text;
109+
color: $form-input-glyph;
103110
}
104111

105112
::-ms-input-placeholder { /* IE 10+ */
106-
color: $form-login-gray-text;
113+
color: $form-input-glyph;
107114
}
108115

109116
::-moz-placeholder { /* Firefox 18- */
110-
color: $form-login-gray-text;
117+
color: $form-input-glyph;
111118
}
112119

113120
.panel-heading {
@@ -136,13 +143,18 @@ html {
136143
border-radius: 0.3rem 0 0 0.3rem;
137144
}
138145

139-
.input-lg {
146+
.input-lg, #user_email {
140147
border-radius: 0 0.3rem 0.3rem 0;
141148
}
142149

150+
#user_password {
151+
border-radius: 0;
152+
}
153+
143154
.input-group-addon, .input-lg {
144155
background-color: $form-input-bg-color;
145156
border: 0;
157+
box-shadow: none;
146158
color: $form-input-glyph;
147159
font-size: 2.24rem;
148160
letter-spacing: -0.0040rem;
@@ -152,7 +164,7 @@ html {
152164
.form-control {
153165
border: 0;
154166
font-weight: 400;
155-
padding: 4rem 0;
167+
height: 7.5rem;
156168
}
157169

158170
.form-control:focus {

app/views/application/menus/_language_switcher.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="language-selector">
33
<div class="dropdown dropdown-language-selector">
44
<a class="btn btn-default dropdown-toggle language" type="button" id="dropdownLanguage">
5-
<%= t("locales.#{locale}") %>
5+
<span><%= t("locales.#{locale}") %></span>
66
<b class="caret"></b>
77
</a>
88
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1" >

0 commit comments

Comments
 (0)