diff --git a/public/css/fontello.css b/public/css/fontello.css
index 2453575..52362d8 100644
--- a/public/css/fontello.css
+++ b/public/css/fontello.css
@@ -1,53 +1,138 @@
@font-face {
- font-family: 'fontello';
- src: url('/fonts/fontello.eot?61663884');
- src: url('/fonts/fontello.eot?61663884#iefix') format('embedded-opentype'),
- url('/fonts/fontello.woff2?61663884') format('woff2'),
- url('/fonts/fontello.woff?61663884') format('woff'),
- url('/fonts/fontello.ttf?61663884') format('truetype'),
- url('/fonts/fontello.svg?61663884#fontello') format('svg');
+ font-family: "fontello";
+ src: url("/fonts/fontello.eot?77185648");
+ src:
+ url("/fonts/fontello.eot?77185648#iefix") format("embedded-opentype"),
+ url("/fonts/fontello.woff2?77185648") format("woff2"),
+ url("/fonts/fontello.woff?77185648") format("woff"),
+ url("/fonts/fontello.ttf?77185648") format("truetype"),
+ url("/fonts/fontello.svg?77185648#fontello") format("svg");
font-weight: normal;
font-style: normal;
}
-[class^="icon-"]:before, [class*=" icon-"]:before {
+
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
speak: never;
-
+
display: inline-block;
text-decoration: inherit;
width: 1em;
+ margin-right: 0.2em;
text-align: center;
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
-
+
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
-
+
/* Font smoothing. That was taken from TWBS */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
-.icon-views:before { content: '\e800'; } /* '' */
-.icon-heart:before { content: '\e801'; } /* '' */
-.icon-quote:before { content: '\e802'; } /* '' */
-.icon-comment:before { content: '\e803'; } /* '' */
-.icon-ok:before { content: '\e804'; } /* '' */
-.icon-play:before { content: '\e805'; } /* '' */
-.icon-link:before { content: '\e806'; } /* '' */
-.icon-calendar:before { content: '\e807'; } /* '' */
-.icon-location:before { content: '\e808'; } /* '' */
-.icon-picture:before { content: '\e809'; } /* '' */
-.icon-lock:before { content: '\e80a'; } /* '' */
-.icon-down:before { content: '\e80b'; } /* '' */
-.icon-retweet:before { content: '\e80c'; } /* '' */
-.icon-search:before { content: '\e80d'; } /* '' */
-.icon-pin:before { content: '\e80e'; } /* '' */
-.icon-cog:before { content: '\e80f'; } /* '' */
-.icon-rss:before { content: '\e810'; } /* '' */
-.icon-info:before { content: '\f128'; } /* '' */
-.icon-bird:before { content: '\f309'; } /* '' */
+.icon-views:before {
+ content: "\e800";
+}
+
+/* '' */
+.icon-heart:before {
+ content: "\e801";
+}
+
+/* '' */
+.icon-quote:before {
+ content: "\e802";
+}
+
+/* '' */
+.icon-comment:before {
+ content: "\e803";
+}
+
+/* '' */
+.icon-play:before {
+ content: "\e805";
+}
+
+/* '' */
+.icon-link:before {
+ content: "\e806";
+}
+
+/* '' */
+.icon-calendar:before {
+ content: "\e807";
+}
+
+/* '' */
+.icon-location:before {
+ content: "\e808";
+}
+
+/* '' */
+.icon-picture:before {
+ content: "\e809";
+}
+
+/* '' */
+.icon-lock:before {
+ content: "\e80a";
+}
+
+/* '' */
+.icon-down:before {
+ content: "\e80b";
+}
+
+/* '' */
+.icon-retweet:before {
+ content: "\e80c";
+}
+
+/* '' */
+.icon-search:before {
+ content: "\e80d";
+}
+
+/* '' */
+.icon-pin:before {
+ content: "\e80e";
+}
+
+/* '' */
+.icon-cog:before {
+ content: "\e80f";
+}
+
+/* '' */
+.icon-rss:before {
+ content: "\e810";
+}
+
+/* '' */
+.icon-ok:before {
+ content: "\e811";
+}
+
+/* '' */
+.icon-circle:before {
+ content: "\f111";
+}
+
+/* '' */
+.icon-info:before {
+ content: "\f128";
+}
+
+/* '' */
+.icon-bird:before {
+ content: "\f309";
+}
+
+/* '' */
diff --git a/public/fonts/fontello.eot b/public/fonts/fontello.eot
index 2b2982a..8671134 100644
Binary files a/public/fonts/fontello.eot and b/public/fonts/fontello.eot differ
diff --git a/public/fonts/fontello.svg b/public/fonts/fontello.svg
index 2a64343..31bd38c 100644
--- a/public/fonts/fontello.svg
+++ b/public/fonts/fontello.svg
@@ -14,8 +14,6 @@
-
-
@@ -40,6 +38,10 @@
+
+
+
+
diff --git a/public/fonts/fontello.ttf b/public/fonts/fontello.ttf
index ef775f8..0c04c6c 100644
Binary files a/public/fonts/fontello.ttf and b/public/fonts/fontello.ttf differ
diff --git a/public/fonts/fontello.woff b/public/fonts/fontello.woff
index 63c3c23..e4582ad 100644
Binary files a/public/fonts/fontello.woff and b/public/fonts/fontello.woff differ
diff --git a/public/fonts/fontello.woff2 b/public/fonts/fontello.woff2
index b7541f0..d2c246d 100644
Binary files a/public/fonts/fontello.woff2 and b/public/fonts/fontello.woff2 differ
diff --git a/src/sass/general.scss b/src/sass/general.scss
index ce97564..e6247d6 100644
--- a/src/sass/general.scss
+++ b/src/sass/general.scss
@@ -23,6 +23,7 @@
font-weight: bold;
width: 30px;
height: 30px;
+ padding: 0px 5px 1px 8px;
}
input {
diff --git a/src/sass/index.scss b/src/sass/index.scss
index a19165a..3f4b123 100644
--- a/src/sass/index.scss
+++ b/src/sass/index.scss
@@ -50,7 +50,7 @@ body {
background-color: var(--bg_color);
color: var(--fg_color);
- font-family: $font_0, $font_1, $font_2, $font_3;
+ font-family: $font_0, $font_1;
font-size: 15px;
line-height: 1.3;
margin: 0;
@@ -143,30 +143,50 @@ ul {
}
.verified-icon {
- color: var(--icon_text);
- border-radius: 50%;
- flex-shrink: 0;
- margin: 2px 0 3px 3px;
- padding-top: 3px;
- height: 11px;
- width: 14px;
- font-size: 8px;
display: inline-block;
- text-align: center;
- vertical-align: middle;
+ width: 14px;
+ height: 14px;
+ margin-left: 2px;
+
+ .verified-icon-circle {
+ position: absolute;
+ font-size: 15px;
+ }
+
+ .verified-icon-check {
+ position: absolute;
+ font-size: 9px;
+ margin: 5px 3px;
+ }
&.blue {
- background-color: var(--verified_blue);
+ .verified-icon-circle {
+ color: var(--verified_blue);
+ }
+
+ .verified-icon-check {
+ color: var(--icon_text);
+ }
}
&.business {
- color: var(--bg_panel);
- background-color: var(--verified_business);
+ .verified-icon-circle {
+ color: var(--verified_business);
+ }
+
+ .verified-icon-check {
+ color: var(--bg_panel);
+ }
}
&.government {
- color: var(--bg_panel);
- background-color: var(--verified_government);
+ .verified-icon-circle {
+ color: var(--verified_government);
+ }
+
+ .verified-icon-check {
+ color: var(--bg_panel);
+ }
}
}
diff --git a/src/sass/navbar.scss b/src/sass/navbar.scss
index 4e150e0..86bfbe7 100644
--- a/src/sass/navbar.scss
+++ b/src/sass/navbar.scss
@@ -59,13 +59,9 @@ nav {
justify-content: flex-end;
}
- &.right a {
- padding-left: 4px;
-
- &:hover {
- color: var(--accent_light);
- text-decoration: unset;
- }
+ &.right a:hover {
+ color: var(--accent_light);
+ text-decoration: unset;
}
}
@@ -81,10 +77,11 @@ nav {
}
}
-.icon-info:before {
+.icon-info {
margin: 0 -3px;
}
.icon-cog {
font-size: 15px;
+ padding-left: 0 !important;
}
diff --git a/src/sass/search.scss b/src/sass/search.scss
index 444f9bb..c2adaf7 100644
--- a/src/sass/search.scss
+++ b/src/sass/search.scss
@@ -13,6 +13,7 @@
button {
margin: 0 2px 0 0;
+ padding: 0px 1px 1px 4px;
height: 23px;
display: flex;
align-items: center;
@@ -35,7 +36,7 @@
background-color: var(--bg_elements);
color: var(--fg_color);
border: 1px solid var(--accent_border);
- padding: 1px 6px 2px 6px;
+ padding: 1px 1px 2px 4px;
font-size: 14px;
cursor: pointer;
margin-bottom: 2px;
@@ -56,20 +57,17 @@
font-weight: initial;
text-align: left;
- > div {
- line-height: 1.7em;
- }
-
.checkbox-container {
display: inline;
padding-right: unset;
- margin-bottom: unset;
+ margin-bottom: 5px;
margin-left: 23px;
}
.checkbox {
right: unset;
left: -22px;
+ line-height: 1.6em;
}
.checkbox-container .checkbox:after {
diff --git a/src/sass/tweet/video.scss b/src/sass/tweet/video.scss
index 790b3da..ba77b14 100644
--- a/src/sass/tweet/video.scss
+++ b/src/sass/tweet/video.scss
@@ -2,7 +2,7 @@
@import "_mixins";
video {
- max-height: 100%;
+ height: 100%;
width: 100%;
}
@@ -13,6 +13,7 @@ video {
.gallery-video.card-container {
flex-direction: column;
+ width: 100%;
}
.video-container {
@@ -20,9 +21,6 @@ video {
min-width: 200px;
max-height: 530px;
margin: 0;
- display: flex;
- align-items: center;
- justify-content: center;
img {
max-height: 100%;
diff --git a/src/views/general.nim b/src/views/general.nim
index 23681b5..2525841 100644
--- a/src/views/general.nim
+++ b/src/views/general.nim
@@ -52,8 +52,8 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
let opensearchUrl = getUrlPrefix(cfg) & "/opensearch"
buildHtml(head):
- link(rel="stylesheet", type="text/css", href="/css/style.css?v=21")
- link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=3")
+ link(rel="stylesheet", type="text/css", href="/css/style.css?v=22")
+ link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=4")
if theme.len > 0:
link(rel="stylesheet", type="text/css", href=(&"/css/themes/{theme}.css"))
diff --git a/src/views/renderutils.nim b/src/views/renderutils.nim
index fcdf06f..377a443 100644
--- a/src/views/renderutils.nim
+++ b/src/views/renderutils.nim
@@ -26,7 +26,9 @@ proc icon*(icon: string; text=""; title=""; class=""; href=""): VNode =
template verifiedIcon*(user: User): untyped {.dirty.} =
if user.verifiedType != VerifiedType.none:
let lower = ($user.verifiedType).toLowerAscii()
- icon "ok", class=(&"verified-icon {lower}"), title=(&"Verified {lower} account")
+ buildHtml(tdiv(class=(&"verified-icon {lower}"))):
+ icon "circle", class="verified-icon-circle", title=(&"Verified {lower} account")
+ icon "ok", class="verified-icon-check", title=(&"Verified {lower} account")
else:
text ""