Skip to content
New issue

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

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

Already on GitHub? # to your account

General #312

Merged
merged 3 commits into from
Feb 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/Http/Requests/Question/PostRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function authorize(): bool

/**
* Get the validation rules that apply to the request.
*
*
* @return array<string, mixed>
*/
public function rules(): array
Expand All @@ -32,4 +32,4 @@ public function rules(): array
'display' => 'bool'
];
}
}
}
4 changes: 2 additions & 2 deletions app/Http/Requests/Question/PutRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function authorize(): bool

/**
* Get the validation rules that apply to the request.
*
*
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
Expand All @@ -33,4 +33,4 @@ public function rules(): array
'display' => 'bool'
];
}
}
}
14 changes: 14 additions & 0 deletions atomic/atoms/InputText/styles/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,17 @@
}
}
}

body:has(#login),
body:has(#register) {
.p-inputtext {
@each $type in main, activity, article, contact, money, question, user {
&[ad-type='#{$type}'] {
@include entity-inputtext-styles(
var(--#{$type}-item-color) !important,
var(--#{$type}-item-focus-color) !important
);
}
}
}
}
24 changes: 1 addition & 23 deletions atomic/bosons/styles/variables/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,14 @@ $primary-text-color: #4B5563;
$secondary-text-color: #5E5E5E;
$white-text-color: #F5F4F4;

/* Core colors */
$white-body-bg: white;
$body-bg: #EBEBEB;
$primary-bg: #0A0A0A;
$secondary-bg: #333941;
$content-bg: #FFF;
$primary-color: #10B981;
$primary-hover-color: #1BBD79;
$primary-hover-bg-color: #F6F6F8;

$secondary-color: #6B7280;
$secondary-gray-color: #989898;
$secondary-gray-bg: #F8F8F8;
$secondary-whitesmoke-color: #E8E8E8;
$secondary-gray-bg-color: #F5F4F4;
$secondary-green-bg-color: #E9FFF8;
$secondary-hover-bg-color: #E3FFF4;

$primary-border-color: #F5F5F5;

/* Transitions */
$transition-colors-300ms:
color 300ms,
background-color 300ms,
box-shadow 300ms;

/* New colors */
$primary-white-text-color: #e6e6e6;
$primary-white-green-text-color: #cce4dd;

$bg-dark-color: #27272a;
$bg-black-color: #000a;
$bg-dark-green-color: #000500;
$bg-green-color-05: #10B98105;
Expand Down
1 change: 1 addition & 0 deletions atomic/molecules/FloatLabel/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'styles';
5 changes: 5 additions & 0 deletions atomic/molecules/FloatLabel/styles/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.p-floatlabel {
label {
color: $white-text-color !important;
}
}
2 changes: 1 addition & 1 deletion atomic/molecules/_index.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import 'Tile';
@import 'FloatLabel', 'Tile';
17 changes: 15 additions & 2 deletions atomic/organisms/DataTable/styles/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
color: $primary-white-text-color;
}

td {
border-color: #27272a !important;
}

.p-row-odd {
background: $content-background !important;
}
Expand Down Expand Up @@ -69,14 +73,23 @@
margin: 0;
padding: 0;

.p-paginator-current {
&-current {
margin: 0 4px;
}

.p-paginator-content {
&-content {
display: flex;
gap: 8px;
}

&-page,
&-first,
&-prev,
&-current,
&-next,
&-last {
color: #a1a1aa !important;
}
}
}

Expand Down
16 changes: 16 additions & 0 deletions atomic/organisms/Password/styles/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@
}
}

body:has(#login),
body:has(#register) {
.p-password {
@each $type in main, activity, article, contact, money, question, user {
&[ad-type='#{$type}'] {
.p-inputtext {
@include entity-password-styles(
var(--#{$type}-item-color) !important,
var(--#{$type}-item-focus-color) !important
);
}
}
}
}
}

/* stylelint-disable */
#password_panel,
#password_confirmation_panel {
Expand Down
1 change: 1 addition & 0 deletions atomic/organisms/Terminal/styles/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
box-shadow: none;
border: none !important;
font-size: 1em;
background: $content-background !important;

.p-terminal-command {
width: 80%;
Expand Down
Loading
Loading