mythic-insight/legendary-doc-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'npm-upgrades' into 'master'

Browse source 
BREAKING CHANGE: Upgrade to Tailwind 2

See merge request mythic-insight/legendary!95
This commit is contained in:
Robert Prehn 2021-07-21 21:14:20 +00:00
commit ed6d4a73b9
5 changed files with 12289 additions and 13955 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26078
apps/app/assets/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

14
apps/app/assets/package.json
View file

@ -5,7 +5,8 @@
"scripts": {
"deploy": "webpack --mode production",
"watch": "webpack --mode development --watch",
"profile": "webpack --mode development --plugin webpack/lib/debug/ProfilingPlugin"
"profile": "webpack --mode development --plugin webpack/lib/debug/ProfilingPlugin",
"preinstall": "npx npm-force-resolutions"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.14.0",
@ -13,12 +14,14 @@
"autoprefixer": "^9.8.6",
"csswring": "^7.0.0",
"glob": "^7.1.6",
"npm-force-resolutions": "^0.0.10",
"phoenix": "file:/../../../deps/phoenix",
"phoenix_html": "file:/../../../deps/phoenix_html",
"phoenix_live_view": "file:../../../deps/phoenix_live_view",
"postcss-color-function": "^4.1.0",
"simplemde": "^1.11.2",
"tailwindcss": "^1.7.3",
"squeak": "^1.3.0",
"tailwindcss": "^2.2.6",
"topbar": "^1.0.1"
},
"devDependencies": {
@ -40,8 +43,8 @@
"sass": "^1.35.1",
"sass-loader": "^8.0.2",
"style-loader": "^1.2.1",
"stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0",
"stylelint": "^13.8.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-order": "^4.1.0",
"terser-webpack-plugin": "^2.3.2",
"webpack": "^5.1.0",
@ -49,6 +52,7 @@
"yargs-parser": "^20.2.9"
},
"resolutions": {
"graceful-fs": "4.2.3"
"graceful-fs": "4.2.3",
"meow": "9.0.0"
}
}

144
apps/app/assets/tailwind.config.js
View file

@ -4,10 +4,6 @@ const cliArgs = yargsParser(process.argv);
const mode = process.env.NODE_ENV || cliArgs.mode || "development";
module.exports = {
future: {
removeDeprecatedGapUtilities: true,
purgeLayersByDefault: true,
},
purge: {
enabled: mode == "production",
layers: ["base", "components", "utilities"],
@ -20,10 +16,148 @@ module.exports = {
],
},
theme: {
extend: {},
colors: {
transparent: "transparent",
current: "currentColor",
black: "#000",
white: "#fff",
gray: {
100: "#f7fafc",
200: "#edf2f7",
300: "#e2e8f0",
400: "#cbd5e0",
500: "#a0aec0",
600: "#718096",
700: "#4a5568",
800: "#2d3748",
900: "#1a202c",
},
red: {
100: "#fff5f5",
200: "#fed7d7",
300: "#feb2b2",
400: "#fc8181",
500: "#f56565",
600: "#e53e3e",
700: "#c53030",
800: "#9b2c2c",
900: "#742a2a",
},
orange: {
100: "#fffaf0",
200: "#feebc8",
300: "#fbd38d",
400: "#f6ad55",
500: "#ed8936",
600: "#dd6b20",
700: "#c05621",
800: "#9c4221",
900: "#7b341e",
},
yellow: {
100: "#fffff0",
200: "#fefcbf",
300: "#faf089",
400: "#f6e05e",
500: "#ecc94b",
600: "#d69e2e",
700: "#b7791f",
800: "#975a16",
900: "#744210",
},
green: {
100: "#f0fff4",
200: "#c6f6d5",
300: "#9ae6b4",
400: "#68d391",
500: "#48bb78",
600: "#38a169",
700: "#2f855a",
800: "#276749",
900: "#22543d",
},
teal: {
100: "#e6fffa",
200: "#b2f5ea",
300: "#81e6d9",
400: "#4fd1c5",
500: "#38b2ac",
600: "#319795",
700: "#2c7a7b",
800: "#285e61",
900: "#234e52",
},
blue: {
100: "#ebf8ff",
200: "#bee3f8",
300: "#90cdf4",
400: "#63b3ed",
500: "#4299e1",
600: "#3182ce",
700: "#2b6cb0",
800: "#2c5282",
900: "#2a4365",
},
indigo: {
100: "#ebf4ff",
200: "#c3dafe",
300: "#a3bffa",
400: "#7f9cf5",
500: "#667eea",
600: "#5a67d8",
700: "#4c51bf",
800: "#434190",
900: "#3c366b",
},
purple: {
100: "#faf5ff",
200: "#e9d8fd",
300: "#d6bcfa",
400: "#b794f4",
500: "#9f7aea",
600: "#805ad5",
700: "#6b46c1",
800: "#553c9a",
900: "#44337a",
},
pink: {
100: "#fff5f7",
200: "#fed7e2",
300: "#fbb6ce",
400: "#f687b3",
500: "#ed64a6",
600: "#d53f8c",
700: "#b83280",
800: "#97266d",
900: "#702459",
},
},
fontSize: {
xs: "0.75rem",
sm: "0.875rem",
base: "1rem",
lg: "1.125rem",
xl: "1.25rem",
"2xl": "1.5rem",
"3xl": "1.875rem",
"4xl": "2.25rem",
"5xl": "3rem",
"6xl": "4rem",
},
extend: {
boxShadow: {
xs: "0 0 0 1px rgba(0, 0, 0, 0.05)",
outline: "0 0 0 3px rgba(66, 153, 225, 0.5)",
},
},
},
variants: {
backgroundColor: ["responsive", "hover", "focus", "checked"],
extend: {
fontWeight: ["hover", "focus"],
},
},
plugins: [],
};

4
apps/core/lib/core_web/views/helpers.ex
View file

@ -119,8 +119,8 @@ defmodule Legendary.CoreWeb.Helpers do
defp default_classes_for_type(type) when type in [:date_select, :time_select, :datetime_select] do
"bg-white shadow rounded p-3"
end
defp default_classes_for_type(:checkbox), do: "appearance-none h-10 w-10 bg-white checked:bg-gray-500 rounded shadow focus:outline-none focus:shadow-outline text-white text-xl font-bold mb-2"
defp default_classes_for_type(_), do: "px-4 py-3 placeholder-gray-400 text-gray-700 bg-white rounded text-sm shadow focus:outline-none focus:shadow-outline w-full"
defp default_classes_for_type(:checkbox), do: "appearance-none h-10 w-10 bg-white checked:bg-gray-500 rounded shadow focus:outline-none focus:ring text-white text-xl font-bold mb-2"
defp default_classes_for_type(_), do: "px-4 py-3 placeholder-gray-400 text-gray-700 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full"
def styled_button(text) do
~E"""

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "@mythic-insight/legendary",
"version": "2.9.1",
"version": "2.12.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@mythic-insight/legendary",
"version": "2.9.1",
"version": "2.12.0",
"license": "MIT",
"devDependencies": {
"@google/semantic-release-replace-plugin": "^1.0.2",