-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into clipboard
- Loading branch information
Showing
9 changed files
with
1,017 additions
and
1,129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| includes: | ||
| - phpstan-baseline.neon | ||
| - vendor/larastan/larastan/extension.neon | ||
| - phpstan-baseline.neon | ||
| - vendor/larastan/larastan/extension.neon | ||
|
|
||
| parameters: | ||
| level: 6 | ||
| paths: | ||
| - app | ||
| tmpDir: .tmp/PHPStan | ||
| checkMissingIterableValueType: false | ||
| checkGenericClassInNonGenericObjectType: false | ||
| level: 6 | ||
| paths: | ||
| - app | ||
| tmpDir: .tmp/PHPStan | ||
| checkMissingIterableValueType: false | ||
| checkGenericClassInNonGenericObjectType: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,77 @@ | ||
| @import 'base.css'; | ||
|
|
||
| main { | ||
| @apply sm:mt-10; | ||
| @apply sm:mt-10; | ||
| } | ||
|
|
||
| .frontend, .backend, .auth { | ||
| @apply bg-uh-bg-2 font-sans text-gray-900 antialiased; | ||
| @apply bg-uh-bg-2 font-sans text-gray-900 antialiased; | ||
| } | ||
|
|
||
|
|
||
| .navbar { | ||
| @apply bg-uh-bg-1 text-uh-blue; | ||
| @apply border-b border-uh-border-color; | ||
| @apply bg-uh-bg-1 text-uh-blue; | ||
| @apply border-b border-uh-border-color; | ||
|
|
||
| &-brand { | ||
| @apply font-serif text-4xl font-bold; | ||
| @apply flex items-center; | ||
| } | ||
|
|
||
| &-toggler { | ||
| @apply text-uh-blue-2; | ||
| } | ||
| &-brand { | ||
| @apply font-serif text-4xl font-bold; | ||
| @apply flex items-center; | ||
| } | ||
|
|
||
| .nav-item { | ||
| @apply text-sm text-gray-700 hover:bg-slate-50 focus:bg-slate-100 leading-5; | ||
| @apply block px-4 py-2 focus:outline-none transition; | ||
| } | ||
| &-toggler { | ||
| @apply text-uh-blue-2; | ||
| } | ||
|
|
||
| &-mobile { | ||
| .nav-item { | ||
| @apply text-gray-700; | ||
| @apply block pl-3 pr-4 py-2 font-medium transition; | ||
| @apply text-sm text-gray-700 hover:bg-slate-50 focus:bg-slate-100 leading-5; | ||
| @apply block px-4 py-2 focus:outline-none transition; | ||
| } | ||
|
|
||
| &-username { | ||
| @apply font-semibold; | ||
| } | ||
| &-mobile { | ||
| .nav-item { | ||
| @apply text-gray-700; | ||
| @apply block pl-3 pr-4 py-2 font-medium transition; | ||
|
|
||
| &-email { | ||
| @apply text-gray-500 font-medium text-sm; | ||
| } | ||
| &-username { | ||
| @apply font-semibold; | ||
| } | ||
|
|
||
| &-email { | ||
| @apply text-gray-500 font-medium text-sm; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| #power-grid-table-base { | ||
| table, th, td { | ||
| @apply border border-uh-border-color; | ||
| } | ||
| table, th, td { | ||
| @apply border border-uh-border-color; | ||
| } | ||
|
|
||
| table { | ||
| thead { | ||
| @apply bg-uh-bg-2; | ||
| table { | ||
| thead { | ||
| @apply bg-uh-bg-2; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .power-grid { | ||
| .pg-header { | ||
| input { | ||
| @apply bg-white focus:ring-uh-indigo-400 focus:border-uh-indigo-400; | ||
| .pg-header { | ||
| input { | ||
| @apply bg-white focus:ring-uh-indigo-400 focus:border-uh-indigo-400; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .pg-footer { | ||
| select { | ||
| @apply bg-white focus:border-gray-300; | ||
| } | ||
| .pg-footer { | ||
| select { | ||
| @apply bg-white focus:border-gray-300; | ||
| } | ||
|
|
||
| nav { | ||
| a { | ||
| @apply bg-uh-indigo-600 hover:bg-uh-indigo-700 active:bg-uh-indigo-600; | ||
| } | ||
| nav { | ||
| a { | ||
| @apply bg-uh-indigo-600 hover:bg-uh-indigo-700 active:bg-uh-indigo-600; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,48 @@ | ||
| module.exports = { | ||
| content: [ | ||
| "./resources/**/*.blade.php", | ||
| "./resources/**/*.js", | ||
| "./resources/**/*.vue", | ||
| "./app/Livewire/**/*Table.php", | ||
| "./vendor/power-components/livewire-powergrid/resources/views/**/*.php", | ||
| "./vendor/power-components/livewire-powergrid/src/Themes/Tailwind.php", | ||
| ], | ||
| presets: [ | ||
| require('./vendor/power-components/livewire-powergrid/tailwind.config.js'), | ||
| ], | ||
| theme: { | ||
| extend: { | ||
| colors: { | ||
| "uh-blue": "#3d5b99", | ||
| "uh-blue-2": "#005a9e", | ||
| "bg-primary": "#f8fafc", | ||
| "uh-bg-1": "#fff", | ||
| "uh-bg-2": "#f6f8fa", | ||
| "uh-border-color": "#d0d7de", | ||
| uh: { | ||
| 1: "#344767", | ||
| "2a": "rgb(63 152 222)", | ||
| "2b": "rgb(53 140 208)", | ||
| "2c": "rgb(43 128 194)", | ||
| indigo: { | ||
| 50: "rgb(247 246 253)", | ||
| 100: "rgb(238 238 251)", | ||
| 200: "rgb(213 212 245)", | ||
| 300: "rgb(188 185 239)", | ||
| 400: "rgb(138 133 228)", | ||
| 500: "rgb(88 81 216)", | ||
| 600: "rgb(79 73 194)", | ||
| 700: "rgb(53 49 130)", | ||
| 800: "rgb(40 36 97)", | ||
| 900: "rgb(26 24 65)", | ||
| }, | ||
| content: [ | ||
| "./resources/**/*.blade.php", | ||
| "./resources/**/*.js", | ||
| "./resources/**/*.vue", | ||
| "./app/Livewire/**/*Table.php", | ||
| "./vendor/power-components/livewire-powergrid/resources/views/**/*.php", | ||
| "./vendor/power-components/livewire-powergrid/src/Themes/Tailwind.php", | ||
| ], | ||
| presets: [ | ||
| require('./vendor/power-components/livewire-powergrid/tailwind.config.js'), | ||
| ], | ||
| theme: { | ||
| extend: { | ||
| colors: { | ||
| "uh-blue": "#3d5b99", | ||
| "uh-blue-2": "#005a9e", | ||
| "bg-primary": "#f8fafc", | ||
| "uh-bg-1": "#fff", | ||
| "uh-bg-2": "#f6f8fa", | ||
| "uh-border-color": "#d0d7de", | ||
| uh: { | ||
| 1: "#344767", | ||
| "2a": "rgb(63 152 222)", | ||
| "2b": "rgb(53 140 208)", | ||
| "2c": "rgb(43 128 194)", | ||
| indigo: { | ||
| 50: "rgb(247 246 253)", | ||
| 100: "rgb(238 238 251)", | ||
| 200: "rgb(213 212 245)", | ||
| 300: "rgb(188 185 239)", | ||
| 400: "rgb(138 133 228)", | ||
| 500: "rgb(88 81 216)", | ||
| 600: "rgb(79 73 194)", | ||
| 700: "rgb(53 49 130)", | ||
| 800: "rgb(40 36 97)", | ||
| 900: "rgb(26 24 65)", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| plugins: [ | ||
| require("@tailwindcss/forms")({ | ||
| strategy: "class", | ||
| }), | ||
| ], | ||
| plugins: [ | ||
| require("@tailwindcss/forms")({ | ||
| strategy: "class", | ||
| }), | ||
| ], | ||
| }; |
Oops, something went wrong.