diff --git a/assets/fonts/open-sans/OpenSans-Bold-webfont.woff b/assets/fonts/open-sans/OpenSans-Bold-webfont.woff new file mode 100644 index 0000000..138089c Binary files /dev/null and b/assets/fonts/open-sans/OpenSans-Bold-webfont.woff differ diff --git a/assets/fonts/open-sans/OpenSans-ExtraBold-webfont.woff b/assets/fonts/open-sans/OpenSans-ExtraBold-webfont.woff new file mode 100644 index 0000000..93c97e5 Binary files /dev/null and b/assets/fonts/open-sans/OpenSans-ExtraBold-webfont.woff differ diff --git a/assets/fonts/open-sans/OpenSans-Italic-webfont.woff b/assets/fonts/open-sans/OpenSans-Italic-webfont.woff new file mode 100644 index 0000000..cbce186 Binary files /dev/null and b/assets/fonts/open-sans/OpenSans-Italic-webfont.woff differ diff --git a/assets/fonts/open-sans/OpenSans-Light-webfont.woff b/assets/fonts/open-sans/OpenSans-Light-webfont.woff new file mode 100644 index 0000000..085eb47 Binary files /dev/null and b/assets/fonts/open-sans/OpenSans-Light-webfont.woff differ diff --git a/assets/fonts/open-sans/OpenSans-Regular-webfont.woff b/assets/fonts/open-sans/OpenSans-Regular-webfont.woff new file mode 100644 index 0000000..a3f58d4 Binary files /dev/null and b/assets/fonts/open-sans/OpenSans-Regular-webfont.woff differ diff --git a/assets/fonts/open-sans/OpenSans-Semibold-webfont.woff b/assets/fonts/open-sans/OpenSans-Semibold-webfont.woff new file mode 100644 index 0000000..66428f6 Binary files /dev/null and b/assets/fonts/open-sans/OpenSans-Semibold-webfont.woff differ diff --git a/components/toolbar/toolbar.scss b/components/toolbar/toolbar.scss index 6568852..09dd1a9 100644 --- a/components/toolbar/toolbar.scss +++ b/components/toolbar/toolbar.scss @@ -1,11 +1,11 @@ @import '../../styles/colors.scss'; .toolbar { - padding: 0 .5rem; + padding: 0 0.75rem; .header { display: grid; - grid-template-columns: 6.67rem 1fr 1.25rem; + grid-template-columns: 2.75rem 1fr 1.25rem; align-items: center; max-height: 3.5rem; min-height: 3.5rem; @@ -15,10 +15,6 @@ background: #ffffff; z-index: 1; - &--without-logo { - grid-template-columns: 1fr 1.25rem; - } - .webpage-metadata { word-break: break-all; display: flex; @@ -30,10 +26,6 @@ padding-left: 1rem; color: #000; - &--without-logo { - padding-left: 0; - } - &--hyperlink { font-weight: 400; color: $ultra-black-color; @@ -50,42 +42,19 @@ } } - nav { - padding: 0.25rem 0; - border-bottom: 1px solid $light-grey; - - button { - border: none; - cursor: pointer; - color: $ultra-black-color; - padding: 0.25rem 0rem; + .summary { + display: flex; + .counters{ display: flex; - flex-wrap: nowrap; - line-height: 1.25rem; - background: #fff; - width: 100%; - - &:hover { - color: #000; - text-decoration: underline; - svg path { - fill: #000; - } + .counter{ + font-size: 1rem; + font-weight: 900; } + } + .big-counter { + font-size: 6rem; + font-size: 900; - &:disabled { - cursor: not-allowed; - color: $disabled-grey; - svg path { - fill: $disabled-grey; - } - } - - span { - padding-left: 0.5rem; - font-size: 0.875rem; - font-weight: 500; - } } } diff --git a/components/toolbar/toolbar.tsx b/components/toolbar/toolbar.tsx index 88ec819..ee744b4 100644 --- a/components/toolbar/toolbar.tsx +++ b/components/toolbar/toolbar.tsx @@ -72,12 +72,8 @@ const Toolbar = () => { return (
-
- +
+
{ )}
- {stolenDataView ? ( - - ) : null} +
+

+ Strona wp.pl wysłała informacje o części Twojej historii przeglądania do + facebook.com, adnsx.com (i 43 innych). +

+

+ Dokonała też zapisu i odczytu plików Cookie dla domen doubleclick.google.net, + 3dsio.com (i 59 innych). +

+
-
- {stolenDataView ? ( - <> - {warningDataDialogAck ? ( -
- - Uwaga! Niekoniecznie każda przechwycona poniżej - informacja jest daną osobową. Niektóre z podanych domen mogą - należeć do właściciela strony i nie reprezentować podmiotów - trzecich. - - -
- ) : null} -
stolen data
- - ) : null} +
+ + Takie przetwarzanie danych może być niezgodne z prawem. Kliknij + w przycisk Generuj raport, aby pomóc ustalić, czy ta strona nie narusza + RODO. + +
+ +
+ Pokaż szczegóły +
); diff --git a/styles/fonts.scss b/styles/fonts.scss index 39c6ba2..5ab07a4 100644 --- a/styles/fonts.scss +++ b/styles/fonts.scss @@ -1,7 +1,7 @@ @font-face { font-family: 'Fira Code'; src: url('../assets/fonts/fira-code/woff2/FiraCode-Light.woff2') format('woff2'), - url('../assets/fonts/fira-code/woff/FiraCode-Light.woff') format('woff'); + url('../assets/fonts/fira-code/woff/FiraCode-Light.woff') format('woff'); font-weight: 300; font-style: normal; } @@ -46,3 +46,45 @@ font-weight: 300 700; font-style: normal; } + +@font-face { + font-family: 'OpenSans'; + src: url('../assets/fonts/open-sans/OpenSans-Light-webfont.woff') format('woff'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'OpenSans'; + src: url('../assets/fonts/open-sans/OpenSans-Regular-webfont.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'OpenSans'; + src: url('../assets/fonts/open-sans/OpenSans-Italic-webfont.woff') format('woff'); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: 'OpenSans'; + src: url('../assets/fonts/open-sans/OpenSans-Semibold-webfont.woff') format('woff'); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: 'OpenSans'; + src: url('../assets/fonts/open-sans/OpenSans-Bold-webfont.woff') format('woff'); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'OpenSans'; + src: url('../assets/fonts/open-sans/OpenSans-ExtraBold-webfont.woff') format('woff'); + font-weight: 800; + font-style: normal; +} diff --git a/styles/global.scss b/styles/global.scss index 4e48036..7b94ed0 100644 --- a/styles/global.scss +++ b/styles/global.scss @@ -18,8 +18,7 @@ body { html { font-size: 1rem; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, - Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: 'OpenSans'; } button {