Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Match baseSize changes on lenra_components #43

Merged
merged 2 commits into from
Sep 12, 2022
Merged

feat: Match baseSize changes on lenra_components #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e92b84
feat: Match baseSize changes on lenra_components
jonas-martinez Sep 12, 2022
30ecdb5
fix
jonas-martinez Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/lenra_application/error_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ErrorPage extends StatelessWidget {
message: message,
child: LenraFlex(
direction: Axis.vertical,
spacing: 4,
spacing: 32,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
errorToWidget(),
Expand Down
8 changes: 4 additions & 4 deletions lib/views/cgu/cgu_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class _CguPageState extends State<CguPage> {
children: [
LenraFlex(
fillParent: true,
padding: EdgeInsets.only(bottom: 2),
spacing: 2,
padding: EdgeInsets.only(bottom: 16),
spacing: 16,
mainAxisAlignment: MainAxisAlignment.end,
children: [
LenraButton(
Expand Down Expand Up @@ -84,8 +84,8 @@ class _CguPageState extends State<CguPage> {
),
LenraFlex(
fillParent: true,
padding: EdgeInsets.only(top: 4),
spacing: 2,
padding: EdgeInsets.only(top: 32),
spacing: 16,
mainAxisAlignment: MainAxisAlignment.end,
children: [
LenraButton(
Expand Down
8 changes: 4 additions & 4 deletions lib/views/cgu/cgu_page_fr.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class _CguPageFrState extends State<CguPageFr> {
children: [
LenraFlex(
fillParent: true,
padding: EdgeInsets.only(bottom: 2),
spacing: 2,
padding: EdgeInsets.only(bottom: 16),
spacing: 16,
mainAxisAlignment: MainAxisAlignment.start,
children: [
LenraButton(
Expand Down Expand Up @@ -89,8 +89,8 @@ class _CguPageFrState extends State<CguPageFr> {
),
LenraFlex(
fillParent: true,
padding: EdgeInsets.only(top: 4),
spacing: 2,
padding: EdgeInsets.only(top: 32),
spacing: 16,
mainAxisAlignment: MainAxisAlignment.end,
children: [
LenraButton(
Expand Down
2 changes: 1 addition & 1 deletion lib/views/login/change_lost_password_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class _ChangeLostPasswordState extends State<ChangeLostPasswordForm> {
child: LenraFlex(
direction: Axis.vertical,
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 3,
spacing: 24,
children: <Widget>[
...widget.email == null
? [
Expand Down
4 changes: 2 additions & 2 deletions lib/views/login/login_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class _LoginFormState extends State<LoginForm> {
key: _formKey,
child: LenraFlex(
direction: Axis.vertical,
spacing: 2,
spacing: 16,
children: <Widget>[
login(context),
Image.asset(
Expand Down Expand Up @@ -77,7 +77,7 @@ class _LoginFormState extends State<LoginForm> {
bool isLogging = context.select<AuthModel, bool>((m) => m.loginStatus.isFetching());
return LenraFlex(
direction: Axis.vertical,
spacing: 2,
spacing: 16,
children: [
//------Email------
LenraTextFormField(
Expand Down
2 changes: 1 addition & 1 deletion lib/views/login/recovery_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class _RecoveryFormState extends State<RecoveryForm> {
key: _formKey,
child: LenraFlex(
direction: Axis.vertical,
spacing: 3,
spacing: 24,
children: <Widget>[
Text(
"Confirm your email and we'll take care of it.",
Expand Down
4 changes: 2 additions & 2 deletions lib/views/register/register_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class _RegisterFormState extends State<RegisterForm> {
key: _formKey,
child: LenraFlex(
direction: Axis.vertical,
spacing: 5,
spacing: 40,
children: [
fields(context),
//------Button------
Expand Down Expand Up @@ -65,7 +65,7 @@ class _RegisterFormState extends State<RegisterForm> {
Widget fields(BuildContext context) {
return LenraFlex(
direction: Axis.vertical,
spacing: 2,
spacing: 16,
children: [
//------Email------
LenraTextFormField(
Expand Down
2 changes: 1 addition & 1 deletion lib/views/simple_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class SimplePage extends StatelessWidget {
onTap: backInkAction,
hoverColor: Colors.transparent,
child: LenraFlex(
spacing: 1.5,
spacing: theme.baseSize * 1.5,
children: [
Icon(
Icons.arrow_back_ios_rounded,
Expand Down
6 changes: 3 additions & 3 deletions lib/views/verify_code/verify_code_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ class _VerifyCodeFormState extends State<VerifyCodeForm> {

return LenraFlex(
direction: Axis.vertical,
spacing: 4,
spacing: 32,
children: [
LenraFlex(
direction: Axis.vertical,
spacing: 2,
spacing: 16,
children: [
LenraFlex(
spacing: 2,
spacing: 16,
fillParent: true,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "v1.0.0-beta.46"
resolved-ref: "684446c5b7f504ce1a65b4cd950e24415ab2857a"
ref: "v1.0.0-beta.48"
resolved-ref: b2379d7e04d98243ee46237dec19692d49f6f3ff
url: "git@github.com:lenra-io/lenra_components.git"
source: git
version: "0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
lenra_components:
git:
url: git@github.com:lenra-io/lenra_components.git
ref: v1.0.0-beta.46
ref: v1.0.0-beta.48
phoenix_wings: ^1.0.2
logging: ^1.0.2
flutter_markdown: ^0.6.10+2
Expand Down