Skip to content

Commit

Permalink
Merge branch 'development' of github.com:esteemapp/ecency-vision into…
Browse files Browse the repository at this point in the history 
… development
  • Loading branch information
@feruzm
feruzm committed Nov 6, 2023
2 parents 1131525 + ea7ac0c commit 29756b1
Show file tree
Hide file tree
Showing 23 changed files with 148 additions and 177 deletions.
4 changes: 2 additions & 2 deletions src/common/components/comment/__snapshots__/index.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ exports[`(1) Default render 1`] = `
</div>
<div
className="editor-tool"
id="editor-tool-emoji-picker-a178597d-28b0-4366-bd8e-eda04357667d"
id="editor-tool-emoji-picker-ef9a0d67-1460-433f-9070-d78c3bd3337e"
role="none"
title="Emoji"
>
Expand Down Expand Up @@ -551,7 +551,7 @@ exports[`(2) Cancellable, in progress 1`] = `
</div>
<div
className="editor-tool"
id="editor-tool-emoji-picker-2498bfb4-889b-4a3e-b57d-0d71706d6ae2"
id="editor-tool-emoji-picker-7dbda6fb-eec0-4458-a263-161efa77cbc1"
role="none"
title="Emoji"
>
Expand Down
40 changes: 20 additions & 20 deletions src/common/components/discussion/__snapshots__/test1.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ exports[`(1) Full render with active user 1`] = `
id="forykw-re-esteemapp-202067t12246786z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="forykw-re-esteemapp-202067t12246786z"
onClick={[Function]}
>
Expand Down Expand Up @@ -300,7 +300,7 @@ exports[`(1) Full render with active user 1`] = `
id="brittandjosie-re-esteemapp-qbi6t3"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="brittandjosie-re-esteemapp-qbi6t3"
onClick={[Function]}
>
Expand Down Expand Up @@ -488,7 +488,7 @@ exports[`(1) Full render with active user 1`] = `
id="ardpien-re-brittandjosie-qbjoep"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="ardpien-re-brittandjosie-qbjoep"
onClick={[Function]}
>
Expand Down Expand Up @@ -676,7 +676,7 @@ exports[`(1) Full render with active user 1`] = `
id="ardpien-qbi303"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="ardpien-qbi303"
onClick={[Function]}
>
Expand Down Expand Up @@ -863,7 +863,7 @@ exports[`(1) Full render with active user 1`] = `
id="iliyan90-re-esteemapp-202066t124616772z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="iliyan90-re-esteemapp-202066t124616772z"
onClick={[Function]}
>
Expand Down Expand Up @@ -1050,7 +1050,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="trincowski-re-esteemapp-202066t84137915z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="trincowski-re-esteemapp-202066t84137915z"
onClick={[Function]}
>
Expand Down Expand Up @@ -1237,7 +1237,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="foxkoit-re-esteemapp-202066t8590757z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="foxkoit-re-esteemapp-202066t8590757z"
onClick={[Function]}
>
Expand Down Expand Up @@ -1424,7 +1424,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="irisworld-re-esteemapp-202066t14588243z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="irisworld-re-esteemapp-202066t14588243z"
onClick={[Function]}
>
Expand Down Expand Up @@ -1611,7 +1611,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="behiver-re-esteemapp-202066t85739415z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="behiver-re-esteemapp-202066t85739415z"
onClick={[Function]}
>
Expand Down Expand Up @@ -1911,7 +1911,7 @@ exports[`(3) With selected item 1`] = `
id="forykw-re-esteemapp-202067t12246786z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="forykw-re-esteemapp-202067t12246786z"
onClick={[Function]}
>
Expand Down Expand Up @@ -2097,7 +2097,7 @@ exports[`(3) With selected item 1`] = `
id="brittandjosie-re-esteemapp-qbi6t3"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="brittandjosie-re-esteemapp-qbi6t3"
onClick={[Function]}
>
Expand Down Expand Up @@ -2285,7 +2285,7 @@ exports[`(3) With selected item 1`] = `
id="ardpien-re-brittandjosie-qbjoep"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="ardpien-re-brittandjosie-qbjoep"
onClick={[Function]}
>
Expand Down Expand Up @@ -2473,7 +2473,7 @@ exports[`(3) With selected item 1`] = `
id="ardpien-qbi303"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="ardpien-qbi303"
onClick={[Function]}
>
Expand Down Expand Up @@ -2660,7 +2660,7 @@ exports[`(3) With selected item 1`] = `
id="iliyan90-re-esteemapp-202066t124616772z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="iliyan90-re-esteemapp-202066t124616772z"
onClick={[Function]}
>
Expand Down Expand Up @@ -2847,7 +2847,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="trincowski-re-esteemapp-202066t84137915z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="trincowski-re-esteemapp-202066t84137915z"
onClick={[Function]}
>
Expand Down Expand Up @@ -3034,7 +3034,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="foxkoit-re-esteemapp-202066t8590757z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="foxkoit-re-esteemapp-202066t8590757z"
onClick={[Function]}
>
Expand Down Expand Up @@ -3221,7 +3221,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="irisworld-re-esteemapp-202066t14588243z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="irisworld-re-esteemapp-202066t14588243z"
onClick={[Function]}
>
Expand Down Expand Up @@ -3408,7 +3408,7 @@ Bug report <a href=\\"https://esteem.app/esteem/@iliyan90/bug-report-to-esteemap
id="behiver-re-esteemapp-202066t85739415z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="behiver-re-esteemapp-202066t85739415z"
onClick={[Function]}
>
Expand Down Expand Up @@ -3666,7 +3666,7 @@ exports[`(4) Show mute button, muted comment 1`] = `
id="forykw-re-esteemapp-202067t12246786z"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="forykw-re-esteemapp-202067t12246786z"
onClick={[Function]}
>
Expand Down Expand Up @@ -3873,7 +3873,7 @@ exports[`(4) Show mute button, muted comment 1`] = `
id="brittandjosie-re-esteemapp-qbi6t3"
>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="brittandjosie-re-esteemapp-qbi6t3"
onClick={[Function]}
>
Expand Down
10 changes: 8 additions & 2 deletions src/common/components/discussion/_index.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@

.author {
align-items: center;
display: inline-flex;
padding: 2px;

.author-name {
Expand Down Expand Up @@ -188,6 +187,7 @@
content: ")";
}
}

&:hover {
@include themify(day) {
@apply bg-blue-duck-egg;
Expand Down Expand Up @@ -220,6 +220,10 @@
@include themify(day) {
@apply text-tundora;
}

@include themify(night) {
@apply text-white;
}
}

.item-controls {
Expand Down Expand Up @@ -311,13 +315,15 @@
}
}
}

.profile-container-top {
@media (min-width: $md-break) {
width: 45%;
top: -50px;
left: -20px
}
}

.profile-container-bottom {
@media (min-width: $md-break) {
width: 45%;
Expand Down Expand Up @@ -346,7 +352,7 @@
flex: 1
}

.dropdown-container{
.dropdown-container {
.dropdown-btn {
color: #939a9f !important
}
Expand Down
12 changes: 6 additions & 6 deletions src/common/components/entry-list-item/__snapshots__/index.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`(1) Default render 1`] = `
</span>
</a>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="good-karma-awesome-hive"
onClick={[Function]}
>
Expand Down Expand Up @@ -322,7 +322,7 @@ exports[`(2) Grid view 1`] = `
</span>
</a>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="good-karma-awesome-hive"
onClick={[Function]}
>
Expand Down Expand Up @@ -606,7 +606,7 @@ exports[`(3) Nsfw 1`] = `
</span>
</a>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="good-karma-awesome-hive"
onClick={[Function]}
>
Expand Down Expand Up @@ -933,7 +933,7 @@ exports[`(4) Nsfw with active user 1`] = `
</span>
</a>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="good-karma-awesome-hive"
onClick={[Function]}
>
Expand Down Expand Up @@ -1260,7 +1260,7 @@ exports[`(5) Nsfw but allowed 1`] = `
</span>
</a>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="good-karma-awesome-hive"
onClick={[Function]}
>
Expand Down Expand Up @@ -1622,7 +1622,7 @@ exports[`(6) Cross post. Bottom menu 1`] = `
</span>
</a>
<div
className="author btn notranslate flex sm:hidden items-center"
className="author btn notranslate inline-flex sm:hidden items-center"
id="regenerette-we-need-each-one-of-you-sos-financial-advice-for-hive-newcomers"
onClick={[Function]}
>
Expand Down
5 changes: 5 additions & 0 deletions src/common/components/floating-faq/index.scss
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@import "src/style/vars_mixins";

.scroll-to-top.visible ~ .floating-faq-button button {
right: 4rem;
bottom: 1.25rem;
}

.floating-container {
position: fixed;
z-index: 3;
Expand Down
Loading

0 comments on commit 29756b1

Please sign in to comment.