diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index f00c8d2a1..f2747502a 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -95,7 +95,7 @@ class DatePicker extends React.Component { renderArrow(period, prevDate, nextDate) { return (
- + diff --git a/assets/js/dashboard/stats/conversions.js b/assets/js/dashboard/stats/conversions.js index 866df3c38..9568606e2 100644 --- a/assets/js/dashboard/stats/conversions.js +++ b/assets/js/dashboard/stats/conversions.js @@ -35,7 +35,7 @@ export default class Conversions extends React.Component { return (
- + { goal.name }
{numberFormatter(goal.count)} diff --git a/assets/js/dashboard/stats/devices.js b/assets/js/dashboard/stats/devices.js index 04aa46fdc..2c04893df 100644 --- a/assets/js/dashboard/stats/devices.js +++ b/assets/js/dashboard/stats/devices.js @@ -64,7 +64,7 @@ class ScreenSizes extends React.Component { return (
- + {iconFor(size.name)} {size.name}
{size.percentage}% @@ -126,7 +126,7 @@ class Browsers extends React.Component { return (
- + {browser.name}
{browser.percentage}% @@ -188,7 +188,7 @@ class OperatingSystems extends React.Component { return (
- + {os.name}
{os.percentage}% @@ -248,12 +248,12 @@ export default class Devices extends React.Component { renderPill(name, mode) { const isActive = this.state.mode === mode - const extraClass = name === 'OS' ? '' : ' border-r border-gray-400' + const extraClass = name === 'OS' ? '' : ' border-r border-gray-300' if (isActive) { return {name} } else { - return {name} + return {name} } } @@ -263,7 +263,7 @@ export default class Devices extends React.Component {

Devices

-
+
{ this.renderPill('Size', 'size') } { this.renderPill('Browser', 'browser') } { this.renderPill('OS', 'os') } diff --git a/assets/js/dashboard/stats/pages.js b/assets/js/dashboard/stats/pages.js index ac62cbedd..302f7be46 100644 --- a/assets/js/dashboard/stats/pages.js +++ b/assets/js/dashboard/stats/pages.js @@ -35,7 +35,7 @@ export default class Pages extends React.Component { return (
- + {page.name}
{numberFormatter(page.count)} diff --git a/assets/js/dashboard/stats/referrers.js b/assets/js/dashboard/stats/referrers.js index 45e8f3f2c..f61602dc5 100644 --- a/assets/js/dashboard/stats/referrers.js +++ b/assets/js/dashboard/stats/referrers.js @@ -38,7 +38,7 @@ export default class Referrers extends React.Component { return (
- + { referrer.name } diff --git a/assets/package-lock.json b/assets/package-lock.json index bf9b41bfd..df7cb006c 100644 --- a/assets/package-lock.json +++ b/assets/package-lock.json @@ -1069,6 +1069,26 @@ "purgecss": "^2.1.0" } }, + "@tailwindcss/custom-forms": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@tailwindcss/custom-forms/-/custom-forms-0.2.1.tgz", + "integrity": "sha512-XdP5XY6kxo3x5o50mWUyoYWxOPV16baagLoZ5uM41gh6IhXzhz/vJYzqrTb/lN58maGIKlpkxgVsQUNSsbAS3Q==", + "requires": { + "lodash": "^4.17.11", + "mini-svg-data-uri": "^1.0.3", + "traverse": "^0.6.6" + } + }, + "@tailwindcss/ui": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@tailwindcss/ui/-/ui-0.1.3.tgz", + "integrity": "sha512-ggEEFj0N6YY6fFjHtoGArv9j7wr5nj+TswpGzEezN2l15jHJK1NZ+Lnt0XKsbJy2zWFSNy/KKpPCbh3d6/66tw==", + "requires": { + "@tailwindcss/custom-forms": "^0.2.1", + "hex-to-rgba": "^2.0.1", + "postcss-selector-parser": "^6.0.2" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", @@ -1452,7 +1472,7 @@ }, "util": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "dev": true, "requires": { @@ -2786,8 +2806,7 @@ "cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { "version": "4.1.10", @@ -4644,6 +4663,11 @@ "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", "dev": true }, + "hex-to-rgba": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hex-to-rgba/-/hex-to-rgba-2.0.1.tgz", + "integrity": "sha512-5XqPJBpsEUMsseJUi2w2Hl7cHFFi3+OO10M2pzAvKB1zL6fc+koGMhmBqoDOCB4GemiRM/zvDMRIhVw6EkB8dQ==" + }, "history": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", @@ -4838,8 +4862,7 @@ "indexes-of": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" }, "infer-owner": { "version": "1.0.4", @@ -5262,7 +5285,7 @@ "dependencies": { "json5": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true } @@ -5281,8 +5304,7 @@ "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.memoize": { "version": "4.1.2", @@ -5472,6 +5494,11 @@ "webpack-sources": "^1.1.0" } }, + "mini-svg-data-uri": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.1.3.tgz", + "integrity": "sha512-EeKOmdzekjdPe53/GdxmUpNgDQFkNeSte6XkJmOBt4BfWL6FQ9G9RtLNh+JMjFS3LhdpSICMIkZdznjiecASHQ==" + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -8050,7 +8077,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", - "dev": true, "requires": { "cssesc": "^3.0.0", "indexes-of": "^1.0.1", @@ -8538,7 +8564,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } @@ -9582,6 +9608,11 @@ "shapefile": "0.3" } }, + "traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" + }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -9730,8 +9761,7 @@ "uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" }, "uniqs": { "version": "2.0.0", diff --git a/assets/package.json b/assets/package.json index b0c7d3fae..1afd8734c 100644 --- a/assets/package.json +++ b/assets/package.json @@ -6,6 +6,7 @@ "watch": "webpack --mode development --watch" }, "dependencies": { + "@tailwindcss/ui": "^0.1.3", "autoprefixer": "^9.7.4", "chart.js": "^2.9.3", "datamaps": "^0.5.9", diff --git a/assets/postcss.config.js b/assets/postcss.config.js index 2f347c00c..8a10f0c35 100644 --- a/assets/postcss.config.js +++ b/assets/postcss.config.js @@ -4,7 +4,7 @@ const purgecss = require('@fullhuman/postcss-purgecss')({ '../lib/plausible_web/templates/**/*.html.eex', ], - defaultExtractor: content => content.match(/[\w-/:]+(? content.match(/[\w-/.:]+(?Ghost Logo diff --git a/assets/static/images/icon/google_sc.png b/assets/static/images/icon/google_sc.png new file mode 100644 index 000000000..77d924215 Binary files /dev/null and b/assets/static/images/icon/google_sc.png differ diff --git a/assets/static/images/icon/squarespace.png b/assets/static/images/icon/squarespace.png new file mode 100644 index 000000000..0dbd4e0df Binary files /dev/null and b/assets/static/images/icon/squarespace.png differ diff --git a/assets/static/images/screenshot-countries.png b/assets/static/images/screenshot-countries.png new file mode 100644 index 000000000..e53ca1eec Binary files /dev/null and b/assets/static/images/screenshot-countries.png differ diff --git a/assets/static/images/screenshot.png b/assets/static/images/screenshot.png new file mode 100644 index 000000000..198ae9d91 Binary files /dev/null and b/assets/static/images/screenshot.png differ diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js index 46bca05f8..d9f49d7bc 100644 --- a/assets/tailwind.config.js +++ b/assets/tailwind.config.js @@ -4,49 +4,20 @@ module.exports = { center: true, padding: '1rem', }, - margin: (theme, { negative }) => ({ - auto: 'auto', - '44': '11rem', - ...theme('spacing'), - ...negative(theme('spacing')), - }), - width: theme => ({ - auto: 'auto', - ...theme('spacing'), - '1/2': '50%', - '1/3': '33.333333%', - '31percent': '31%', - '2/3': '66.666667%', - '1/4': '25%', - '2/4': '50%', - '3/4': '75%', - '1/5': '20%', - '2/5': '40%', - '3/5': '60%', - '4/5': '80%', - '1/6': '16.666667%', - '2/6': '33.333333%', - '3/6': '50%', - '4/6': '66.666667%', - '5/6': '83.333333%', - '1/12': '8.333333%', - '2/12': '16.666667%', - '3/12': '25%', - '4/12': '33.333333%', - '5/12': '41.666667%', - '6/12': '50%', - '7/12': '58.333333%', - '8/12': '66.666667%', - '9/12': '75%', - '10/12': '83.333333%', - '11/12': '91.666667%', - full: '100%', - screen: '100vw', - }), + extend: { + spacing: { + '44': '11rem' + }, + width: { + '31percent': '31%', + } + }, }, variants: { textColor: ['responsive', 'hover', 'focus', 'group-hover'] }, corePlugins: {}, - plugins: [], + plugins: [ + require('@tailwindcss/ui') + ], } diff --git a/lib/plausible_web/templates/auth/login_form.html.eex b/lib/plausible_web/templates/auth/login_form.html.eex index 4878b6899..24977759f 100644 --- a/lib/plausible_web/templates/auth/login_form.html.eex +++ b/lib/plausible_web/templates/auth/login_form.html.eex @@ -1,18 +1,18 @@ <%= form_for @conn, "/login", [class: "w-full max-w-md mx-auto bg-white shadow-md rounded px-8 py-6 mt-8"], fn f -> %>

<%= get_flash(@conn, :login_title) || "Enter your email and password" %>

<%= if get_flash(@conn, :login_instructions) do %> -

<%= get_flash(@conn, :login_instructions) %>

+

<%= get_flash(@conn, :login_instructions) %>

<% end %> <%= if @conn.assigns[:error] do %>
<%= @conn.assigns[:error] %>
<% end %>
<%= label f, :email, class: "block text-gray-700 text-sm font-bold mb-2" %> - <%= email_input f, :email, class: "bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "user@example.com" %> + <%= email_input f, :email, class: "bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "user@example.com" %>
<%= label f, :password, class: "block text-gray-700 text-sm font-bold mb-2" %> - <%= password_input f, :password, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %> + <%= password_input f, :password, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %>

Forgot password? Click here to reset it.

<%= submit "Login →", class: "button mt-4 w-full" %> diff --git a/lib/plausible_web/templates/auth/password_form.html.eex b/lib/plausible_web/templates/auth/password_form.html.eex index d819e091c..f4c4f651e 100644 --- a/lib/plausible_web/templates/auth/password_form.html.eex +++ b/lib/plausible_web/templates/auth/password_form.html.eex @@ -2,7 +2,7 @@

Set your password

Min 6 characters

- <%= password_input f, :password, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %> + <%= password_input f, :password, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %> <%= if @conn.assigns[:changeset] do %> <%= error_tag @changeset, :password %> <% end %> diff --git a/lib/plausible_web/templates/auth/password_reset_form.html.eex b/lib/plausible_web/templates/auth/password_reset_form.html.eex index c25aa1cfd..84c172acf 100644 --- a/lib/plausible_web/templates/auth/password_reset_form.html.eex +++ b/lib/plausible_web/templates/auth/password_reset_form.html.eex @@ -2,7 +2,7 @@

Reset your password

Min 6 characters

- <%= password_input f, :password, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %> + <%= password_input f, :password, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300" %> <%= if @conn.assigns[:changeset] do %> <%= error_tag @changeset, :password %> <% end %> diff --git a/lib/plausible_web/templates/auth/password_reset_request_form.html.eex b/lib/plausible_web/templates/auth/password_reset_request_form.html.eex index 0329d9f96..bad3a28cf 100644 --- a/lib/plausible_web/templates/auth/password_reset_request_form.html.eex +++ b/lib/plausible_web/templates/auth/password_reset_request_form.html.eex @@ -2,7 +2,7 @@

Reset your password

Enter your email so we can send a password reset link
- <%= email_input f, :email, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "user@example.com" %> + <%= email_input f, :email, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "user@example.com" %>
<%= if @conn.assigns[:error] do %>
<%= @conn.assigns[:error] %>
diff --git a/lib/plausible_web/templates/auth/password_reset_request_success.html.eex b/lib/plausible_web/templates/auth/password_reset_request_success.html.eex index 4669cf670..7e4d9f333 100644 --- a/lib/plausible_web/templates/auth/password_reset_request_success.html.eex +++ b/lib/plausible_web/templates/auth/password_reset_request_success.html.eex @@ -4,7 +4,7 @@ We have sent an email with password reset instructions to <%= @email %> if it exists in our database.
- Didn't recieve an email? + Didn't receive an email?
Please check your spam folder and contact uku@plausible.io if the problem persists diff --git a/lib/plausible_web/templates/auth/register_form.html.eex b/lib/plausible_web/templates/auth/register_form.html.eex index 003335230..1c334cd85 100644 --- a/lib/plausible_web/templates/auth/register_form.html.eex +++ b/lib/plausible_web/templates/auth/register_form.html.eex @@ -8,13 +8,13 @@

Enter your details

<%= label f, :name, "Full name", class: "block text-gray-700 text-sm font-bold mb-2" %> - <%= text_input f, :name, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "Jane Doe" %> + <%= text_input f, :name, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "Jane Doe" %> <%= error_tag f, :name %>
<%= label f, :email, class: "block text-gray-700 text-sm font-bold mb-2" %>

No spam, guaranteed.

- <%= email_input f, :email, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "example@email.com" %> + <%= email_input f, :email, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:bg-white focus:border-gray-300", placeholder: "example@email.com" %> <%= error_tag f, :email %>
diff --git a/lib/plausible_web/templates/auth/user_settings.html.eex b/lib/plausible_web/templates/auth/user_settings.html.eex index cd333bbee..f627749f4 100644 --- a/lib/plausible_web/templates/auth/user_settings.html.eex +++ b/lib/plausible_web/templates/auth/user_settings.html.eex @@ -4,7 +4,7 @@
-
+

Current plan

<%= if @subscription do %>
<%= subscription_name(@subscription) %>
@@ -14,7 +14,7 @@ <%= link("Upgrade", to: "/billing/upgrade", class: "text-sm text-indigo-500 font-medium") %> <% end %>
-
+

Next bill amount

<%= if @subscription do %>
$<%= @subscription.next_bill_amount %>
@@ -25,7 +25,7 @@
$0
<% end %>
-
+

Next bill date

<%= if @subscription && @subscription.next_bill_date do %> @@ -58,12 +58,12 @@ <%= form_for @changeset, "/settings", [class: "max-w-sm"], fn f -> %>
<%= label f, :name, class: "block text-gray-700 text-sm font-bold mb-2" %> - <%= text_input f, :name, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:border-gray-300" %> + <%= text_input f, :name, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:border-gray-300" %> <%= error_tag f, :name %>
<%= label f, :email, class: "block text-gray-700 text-sm font-bold mb-2" %> - <%= email_input f, :email, class: "transition bg-gray-200 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:border-gray-300" %> + <%= email_input f, :email, class: "transition bg-gray-100 appearance-none border border-transparent rounded w-full p-2 text-gray-700 leading-normal appearance-none focus:outline-none focus:border-gray-300" %> <%= error_tag f, :email %>
<%= submit "Save changes", class: "button mt-4" %> @@ -80,7 +80,7 @@

Deleting your account removes all sites and stats you've collected

<%= if @subscription && @subscription.status == "active" do %> - Delete my account + Delete my account

Your account cannot be deleted because you have an active subscription. If you want to delete your account, please cancel your subscription first.

<% else %> <%= link "Delete my account ", to: "/me", method: :delete, class: "button bg-red-600 mt-6", data: [confirm: "Deleting your account cannot be reversed. Are you sure?"] %> diff --git a/lib/plausible_web/templates/layout/app.html.eex b/lib/plausible_web/templates/layout/app.html.eex index edc836ea9..34a0e6690 100644 --- a/lib/plausible_web/templates/layout/app.html.eex +++ b/lib/plausible_web/templates/layout/app.html.eex @@ -11,7 +11,7 @@ <%= render("_tracking.html", assigns) %> - + <%= render("_svg_icons.html") %>