Skip to content

Commit 24bb8da

Browse files
committed
Fix CSS issue with login page due to input classes
1 parent b8b9acd commit 24bb8da

File tree

9 files changed

+18
-14
lines changed

9 files changed

+18
-14
lines changed

app/Services/Helpers/AssetHashService.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public function css(string $resource): string
9191
{
9292
return '<link href="' . $this->url($resource) . '"
9393
rel="stylesheet preload"
94+
as="style"
9495
crossorigin="anonymous"
9596
integrity="' . $this->integrity($resource) . '"
9697
referrerpolicy="no-referrer">';

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --watch --progress",
5858
"build": "NODE_ENV=development ./node_modules/.bin/webpack --progress",
5959
"build:production": "NODE_ENV=production ./node_modules/.bin/webpack",
60-
"serve": "NODE_ENV=development webpack-serve --hot --config ./webpack.config.js",
60+
"serve": "NODE_ENV=development webpack-serve --hot --config ./webpack.config.js --no-clipboard",
6161
"v:serve": "PUBLIC_PATH=http://192.168.50.2:8080 NODE_ENV=development webpack-serve --hot --config ./webpack.config.js --host 192.168.50.2 --no-clipboard"
6262
}
6363
}

resources/assets/scripts/app.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@ import Vuex from 'vuex';
33
import vuexI18n from 'vuex-i18n';
44
import VueRouter from 'vue-router';
55

6+
Vue.config.productionTip = false;
67
require('./bootstrap');
78

89
// Helpers
910
import { Ziggy } from './helpers/ziggy';
1011
import Locales from './../../../resources/lang/locales';
1112
import { flash } from './mixins/flash';
1213
import { routes } from './routes';
13-
import storeData from './store/index.js';
14+
import store from './store/index.js';
1415

1516
window.events = new Vue;
1617
window.Ziggy = Ziggy;
1718

18-
Vue.config.productionTip = false;
1919
Vue.use(Vuex);
2020

21-
const store = new Vuex.Store(storeData);
2221
const route = require('./../../../vendor/tightenco/ziggy/src/js/route').default;
2322

2423
Vue.mixin({ methods: { route } });

resources/assets/scripts/components/auth/ForgotPassword.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
>
66
<div class="flex flex-wrap -mx-3 mb-6">
77
<div class="input-open">
8-
<input class="input" id="grid-email" type="email" aria-labelledby="grid-email-label" required
8+
<input class="input open-label" id="grid-email" type="email" aria-labelledby="grid-email-label" required
99
ref="email"
1010
v-bind:class="{ 'has-content': email.length > 0 }"
1111
v-bind:readonly="showSpinner"

resources/assets/scripts/components/auth/LoginForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
>
66
<div class="flex flex-wrap -mx-3 mb-6">
77
<div class="input-open">
8-
<input class="input" id="grid-username" type="text" name="user" aria-labelledby="grid-username-label" required
8+
<input class="input open-label" id="grid-username" type="text" name="user" aria-labelledby="grid-username-label" required
99
ref="email"
1010
:class="{ 'has-content' : user.email.length > 0 }"
1111
:readonly="showSpinner"
@@ -17,7 +17,7 @@
1717
</div>
1818
<div class="flex flex-wrap -mx-3 mb-6">
1919
<div class="input-open">
20-
<input class="input" id="grid-password" type="password" name="password" aria-labelledby="grid-password-label" required
20+
<input class="input open-label" id="grid-password" type="password" name="password" aria-labelledby="grid-password-label" required
2121
ref="password"
2222
:class="{ 'has-content' : user.password && user.password.length > 0 }"
2323
:readonly="showSpinner"

resources/assets/scripts/components/auth/ResetPassword.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
>
66
<div class="flex flex-wrap -mx-3 mb-6">
77
<div class="input-open">
8-
<input class="input" id="grid-email" type="email" aria-labelledby="grid-email" required
8+
<input class="input open-label" id="grid-email" type="email" aria-labelledby="grid-email" required
99
ref="email"
1010
:class="{ 'has-content': email.length > 0 }"
1111
:readonly="showSpinner"
@@ -16,7 +16,7 @@
1616
</div>
1717
<div class="flex flex-wrap -mx-3 mb-6">
1818
<div class="input-open">
19-
<input class="input" id="grid-password" type="password" aria-labelledby="grid-password" required
19+
<input class="input open-label" id="grid-password" type="password" aria-labelledby="grid-password" required
2020
ref="password"
2121
:class="{ 'has-content' : password.length > 0 }"
2222
:readonly="showSpinner"
@@ -28,7 +28,7 @@
2828
</div>
2929
<div class="flex flex-wrap -mx-3 mb-6">
3030
<div class="input-open">
31-
<input class="input" id="grid-password-confirmation" type="password" aria-labelledby="grid-password-confirmation" required
31+
<input class="input open-label" id="grid-password-confirmation" type="password" aria-labelledby="grid-password-confirmation" required
3232
:class="{ 'has-content' : passwordConfirmation.length > 0 }"
3333
:readonly="showSpinner"
3434
v-model="passwordConfirmation"

resources/assets/scripts/components/auth/TwoFactorForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
>
55
<div class="flex flex-wrap -mx-3 mb-6">
66
<div class="input-open">
7-
<input class="input" id="grid-code" type="number" name="token" aria-labelledby="grid-username" required
7+
<input class="input open-label" id="grid-code" type="number" name="token" aria-labelledby="grid-username" required
88
ref="code"
99
:class="{ 'has-content' : code.length > 0 }"
1010
v-model="code"
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import Vue from 'vue';
2+
import Vuex from 'vuex';
13
import auth from './modules/auth';
24

3-
export default {
5+
Vue.use(Vuex);
6+
7+
export default new Vuex.Store({
48
strict: process.env.NODE_ENV !== 'production',
59
modules: { auth },
6-
};
10+
});

resources/assets/styles/components/forms.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
transition: transform 200ms ease-out;
3232
}
3333

34-
.input {
34+
.input:not(.open-label) {
3535
@apply .appearance-none .p-3 .rounded .border .text-grey-darker .w-full;
3636
transition: all 100ms linear;
3737

0 commit comments

Comments
 (0)