diff --git a/package.json b/package.json index 8674c0a..cec81f1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.5.0", "description": "A web version of mat2! ", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "build:css": "postcss static/src/main.css -o static/dist/main.css" }, "repository": { "type": "git", diff --git a/static/font/rubik-v12-latin-300.woff b/static/font/rubik-v12-latin-300.woff new file mode 100644 index 0000000..ef32f2e Binary files /dev/null and b/static/font/rubik-v12-latin-300.woff differ diff --git a/static/font/rubik-v12-latin-300.woff2 b/static/font/rubik-v12-latin-300.woff2 new file mode 100644 index 0000000..f68504d Binary files /dev/null and b/static/font/rubik-v12-latin-300.woff2 differ diff --git a/static/font/rubik-v12-latin-300italic.woff b/static/font/rubik-v12-latin-300italic.woff new file mode 100644 index 0000000..3be20fd Binary files /dev/null and b/static/font/rubik-v12-latin-300italic.woff differ diff --git a/static/font/rubik-v12-latin-300italic.woff2 b/static/font/rubik-v12-latin-300italic.woff2 new file mode 100644 index 0000000..092955b Binary files /dev/null and b/static/font/rubik-v12-latin-300italic.woff2 differ diff --git a/static/font/rubik-v12-latin-500.woff b/static/font/rubik-v12-latin-500.woff new file mode 100644 index 0000000..86d1b9e Binary files /dev/null and b/static/font/rubik-v12-latin-500.woff differ diff --git a/static/font/rubik-v12-latin-500.woff2 b/static/font/rubik-v12-latin-500.woff2 new file mode 100644 index 0000000..f727e10 Binary files /dev/null and b/static/font/rubik-v12-latin-500.woff2 differ diff --git a/static/font/rubik-v12-latin-500italic.woff b/static/font/rubik-v12-latin-500italic.woff new file mode 100644 index 0000000..e1a7a90 Binary files /dev/null and b/static/font/rubik-v12-latin-500italic.woff differ diff --git a/static/font/rubik-v12-latin-500italic.woff2 b/static/font/rubik-v12-latin-500italic.woff2 new file mode 100644 index 0000000..7c774a8 Binary files /dev/null and b/static/font/rubik-v12-latin-500italic.woff2 differ diff --git a/static/font/rubik-v12-latin-600.woff b/static/font/rubik-v12-latin-600.woff new file mode 100644 index 0000000..1cf7ecb Binary files /dev/null and b/static/font/rubik-v12-latin-600.woff differ diff --git a/static/font/rubik-v12-latin-600.woff2 b/static/font/rubik-v12-latin-600.woff2 new file mode 100644 index 0000000..913dce8 Binary files /dev/null and b/static/font/rubik-v12-latin-600.woff2 differ diff --git a/static/font/rubik-v12-latin-700.woff b/static/font/rubik-v12-latin-700.woff new file mode 100644 index 0000000..4e3a22f Binary files /dev/null and b/static/font/rubik-v12-latin-700.woff differ diff --git a/static/font/rubik-v12-latin-700.woff2 b/static/font/rubik-v12-latin-700.woff2 new file mode 100644 index 0000000..830fe3d Binary files /dev/null and b/static/font/rubik-v12-latin-700.woff2 differ diff --git a/static/font/rubik-v12-latin-italic.woff b/static/font/rubik-v12-latin-italic.woff new file mode 100644 index 0000000..c06c350 Binary files /dev/null and b/static/font/rubik-v12-latin-italic.woff differ diff --git a/static/font/rubik-v12-latin-italic.woff2 b/static/font/rubik-v12-latin-italic.woff2 new file mode 100644 index 0000000..bb2a4b8 Binary files /dev/null and b/static/font/rubik-v12-latin-italic.woff2 differ diff --git a/static/font/rubik-v12-latin-regular.woff b/static/font/rubik-v12-latin-regular.woff new file mode 100644 index 0000000..7f013db Binary files /dev/null and b/static/font/rubik-v12-latin-regular.woff differ diff --git a/static/font/rubik-v12-latin-regular.woff2 b/static/font/rubik-v12-latin-regular.woff2 new file mode 100644 index 0000000..a9261b1 Binary files /dev/null and b/static/font/rubik-v12-latin-regular.woff2 differ diff --git a/static/raleway.woff2 b/static/raleway.woff2 deleted file mode 100644 index 7cb7031..0000000 Binary files a/static/raleway.woff2 and /dev/null differ diff --git a/static/src/main.css b/static/src/main.css index 72e6911..1171fe3 100644 --- a/static/src/main.css +++ b/static/src/main.css @@ -2,18 +2,75 @@ @tailwind components; @tailwind utilities; +/* rubik-300 - latin */ @font-face { - font-family: 'Raleway'; + font-family: 'Rubik'; + font-style: normal; + font-weight: 300; + src: local(''), + url('/static/font/rubik-v12-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* rubik-regular - latin */ +@font-face { + font-family: 'Rubik'; font-style: normal; font-weight: 400; - src: local('Raleway'), local('Raleway-Regular'), url(raleway-ext.woff2) format('woff2'); - unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; + src: local(''), + url('/static/font/rubik-v12-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } - +/* rubik-500 - latin */ @font-face { - font-family: 'Raleway'; + font-family: 'Rubik'; font-style: normal; - font-weight: 400; - src: local('Raleway'), local('Raleway-Regular'), url(raleway.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; + font-weight: 500; + src: local(''), + url('/static/font/rubik-v12-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } +/* rubik-600 - latin */ +@font-face { + font-family: 'Rubik'; + font-style: normal; + font-weight: 600; + src: local(''), + url('/static/font/rubik-v12-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* rubik-700 - latin */ +@font-face { + font-family: 'Rubik'; + font-style: normal; + font-weight: 700; + src: local(''), + url('/static/font/rubik-v12-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* rubik-300italic - latin */ +@font-face { + font-family: 'Rubik'; + font-style: italic; + font-weight: 300; + src: local(''), + url('/static/font/rubik-v12-latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* rubik-italic - latin */ +@font-face { + font-family: 'Rubik'; + font-style: italic; + font-weight: 400; + src: local(''), + url('/static/font/rubik-v12-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} +/* rubik-500italic - latin */ +@font-face { + font-family: 'Rubik'; + font-style: italic; + font-weight: 500; + src: local(''), + url('/static/font/rubik-v12-latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/static/font/rubik-v12-latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ +} \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 74b3d31..d56edce 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,6 +7,8 @@ module.exports = { theme: { extend: { colors: { + transparent: 'transparent', + current: 'currentColor', blue: { light: '#f4f7fb', DEFAULT: '#99c1f1', @@ -14,12 +16,10 @@ module.exports = { } }, fontFamily: { - sans: ['Inter var', ...defaultTheme.fontFamily.sans], + sans: ['Rubik'], }, }, }, variants: {}, - plugins: [ - require('@tailwindcss/forms'), - ], + plugins: [], } diff --git a/templates/base.html b/templates/base.html index 576f264..8d6712c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -13,25 +13,17 @@ -
+
mat2 logo
- - -
+
{% with messages = get_flashed_messages() %} {% if messages %} {% for message in messages %} -
- - - - - +
{{ message }} diff --git a/templates/download.html b/templates/download.html index 2313d04..77f081a 100644 --- a/templates/download.html +++ b/templates/download.html @@ -2,14 +2,29 @@ {% block content %}
-
-
- {% if not meta_after %} +
+ {% if not meta_after %}
-

Metadata removed

+
Cleaned Metadata
+

+ Successfully removed the metadata. +

+ {% endif %} + {% if meta_after %} +
+
Metadata Partially Removed
+
+

+ Could not remove all the metadata. Consult the table below for the remaining metadata. +

+ {% endif %} +
+ +
+
+ {% if not meta_after %}

- Successfully removed the metadata -

Metadata partially removed

-

- Could not remove all the metadata Download Cleaned File @@ -52,7 +63,7 @@

-

Remaining Metadata

+

Remaining Metadata

diff --git a/templates/index.html b/templates/index.html index f0268f3..addf868 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,24 +1,36 @@ {% extends "base.html" %} {% block content %} -
+ +
+
Remove Metadata
+

+ The file you see is just the tip of the iceberg. Remove the hidden metadata. +

+
+ +
-
-
Remove Metadata
-

- The file you see is just the tip of the iceberg. Remove the hidden metadata. -

-
- - + +