8000 Adding Icons and Enhancing Color and Layout for Dashboard and Invitation Pages by Girish9960 · Pull Request #43 · credebl/studio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Adding Icons and Enhancing Color and Layout for Dashboard and Invitation Pages #43

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

Merged
merged 2 commits into from
Jul 28, 2023
Merged

Adding Icons and Enhancing Color and Layout for Dashboard and Invitation Pages #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
587de0d
fix: Change ICONs, Color codes, Button Names
Girish9960 Jul 27, 2023
b398ff0
fix: Change ICONs, Color codes, Button Names
Girish9960 Jul 27, 2023
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 src/app/SideBar.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<a
href="/organizations/invitations"
class="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
>Send Invitations</a
>Sent Invitations</a
>
</li>
<li>
Expand Down
20 changes: 8 additions & 12 deletions src/components/organization/OrgDropDown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const OrgDropDown = () => {
id="dropdownUsersButton"
data-dropdown-toggle="dropdownUsers"
data-dropdown-placement="bottom"
className="text-white text-lg h-10 bg-blue-700 cursor-pointer focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium
className="text-primary-700 text-lg h-10 bg-primary-50 cursor-pointer focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium
rounded-lg text-sm px-5 py-2.5 text-center inline-flex items-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
>

Expand Down Expand Up @@ -117,19 +117,15 @@ const OrgDropDown = () => {

<a
href="#"
className="flex items-center p-3 text-sm font-medium text-blue-600 border-t border-gray-200 rounded-b-lg bg-gray-50 dark:border-gray-600 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:text-blue-500 hover:underline"
className="flex items-center p-3 text-sm font-medium text-primary-700 border-t border-gray-200 rounded-b-lg bg-gray-50 dark:border-gray-600 hover:bg-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:text-blue-500 hover:underline"
>
>
<svg
className="w-4 h-4 mr-2"
aria-hidden="true"
xmlns="http://www.w3.org/2000/svg"
fill="currentColor"
viewBox="0 0 20 18"
>
<path d="M6.5 9a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9ZM8 10H5a5.006 5.006 0 0 0-5 5v2a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-2a5.006 5.006 0 0 0-5-5Zm11-3h-2V5a1 1 0 0 0-2 0v2h-2a1 1 0 1 0 0 2h2v2a1 1 0 0 0 2 0V9h2a1 1 0 1 0 0-2Z" />
</svg>
Create New Organization
<svg xmlns="http://www.w3.org/2000/svg" className='pr-2' width="20" height="20" fill="none" viewBox="0 0 24 24">
<path fill="#1F4EAD" d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z"/>
</svg>


Create Organization
</a>
</div>
</>
Expand Down
10 changes: 8 additions & 2 deletions src/components/organization/OrganizationsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,15 @@ const OrganizationsList = () => {
/>
<Button
>
className='text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
className='text-base font- text-center text-white bg-primary-700 rounded-lg hover:bg-accent-00 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
>
Create Organization
<div className='pr-3'>
<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none" viewBox="0 0 24 24">
<path fill="#fff" d="M21.89 9.89h-7.78V2.11a2.11 2.11 0 1 0-4.22 0v7.78H2.11a2.11 2.11 0 1 0 0 4.22h7.78v7.78a2.11 2.11 0 1 0 4.22 0v-7.78h7.78a2.11 2.11 0 1 0 0-4.22Z"/>
</svg>
</div>

Create
</Button>
</div>

Expand Down
6 changes: 5 additions & 1 deletion src/components/organization/invitations/Invitations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ const Invitations = () => {
>
className='text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
>
Send Invitations
<svg className='pr-2' xmlns="http://www.w3.org/2000/svg" width="36" height="18" fill="none" viewBox="0 0 42 24">
<path fill="#fff" d="M37.846 0H9.231a3.703 3.703 0 0 0-3.693 3.692v1.385c0 .508.416.923.924.923a.926.926 0 0 0 .923-.923V3.692c0-.184.046-.369.092-.554L17.815 12 7.477 20.861a2.317 2.317 0 0 1-.092-.553v-1.385A.926.926 0 0 0 6.462 18a.926.926 0 0 0-.924.923v1.385A3.703 3.703 0 0 0 9.231 24h28.615a3.703 3.703 0 0 0 3.693-3.692V3.692A3.703 3.703 0 0 0 37.846 0ZM8.862 1.892c.092-.046.23-.046.369-.046h28.615c.139 0 .277 0 .37.046L24.137 13.938a.97.97 0 0 1-1.2 0L8.863 1.893Zm28.984 20.262H9.231c-.139 0-.277 0-.37-.046L19.247 13.2l2.492 2.17a2.67 2.67 0 0 0 1.8.691 2.67 2.67 0 0 0 1.8-.692l2.493-2.169 10.384 8.908c-.092.046-.23.046-.369.046Zm1.846-1.846c0 .184-.046.369-.092.553L29.262 12 39.6 3.138c.046.185.092.37.092.554v16.616ZM2.77 9.692c0-.507.416-.923.923-.923h5.539c.507 0 .923.416.923.923a.926.926 0 0 1-.923.923h-5.54a.926.926 0 0 1-.923-.923Zm6.462 5.539H.923A.926.926 0 0 1 0 14.308c0-.508.415-.923.923-.923h8.308c.507 0 .923.415.923.923a.926.926 0 0 1-.923.923Z"/>
</svg>

Invite
</Button>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/components/organization/invitations/SendInvitationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const SendInvitationModal = (props: { openModal: boolean; setMessage: (message:
props.setOpenModal(false)
}
}>
<Modal.Header>Send Invitations</Modal.Header>
<Modal.Header>Sent Invitations</Modal.Header>
<Modal.Body>
<AlertComponent
message={erroMsg}
Expand Down
41 changes: 28 additions & 13 deletions tailwind.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,36 @@ module.exports = {
theme: {
extend: {
colors: {
accentColor: '#20acdf',
accentColor: '#20ACDF',

primary: {
DEFAULT: '#3558A8',
50: '#EDF1F9',
100: '#DDE4F4',
200: '#BECCEB',
300: '#9FB3E1',
400: '#809BD7',
500: '#6182CD',
600: '#426AC3',
700: '#3558A8',
800: '#28427D',
900: '#1A2B53',
950: '#13203D'
DEFAULT: '#1F4EAD',
50: '#DCE6F9',
100: '#CBD9F6',
200: '#A9C0F0',
300: '#86A7E9',
400: '#638EE3',
500: '#4174DD',
600: '#255ED0',
700: '#1F4EAD',
800: '#16397D',
900: '#0E234E',
950: '#0A1836'
},

secondary: {
DEFAULT: '#D6F5F5',
50: '#FFFFFF',
100: '#FFFFFF',
200: '#FFFFFF',
300: '#FFFFFF',
400: '#FFFFFF',
500: '#FFFFFF',
600: '#F7FDFD',
700: '#D6F5F5',
800: '#A9EAEA',
900: '#7CDFDF',
950: '#65DADA'
},
},
fontFamily: {
Expand Down
0