Skip to content
This repository has been archived by the owner on Jun 17, 2022. It is now read-only.

Commit

Permalink
Merge pull request #179 from hyperspacedev/develop-1.1.0-beta4
Browse files Browse the repository at this point in the history
HD-47 #done
  • Loading branch information
alicerunsonfedora authored Feb 28, 2020
2 parents 8c6df6f + 4e64a1d commit 2f7c7d0
Show file tree
Hide file tree
Showing 16 changed files with 972 additions and 484 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "hyperspace",
"productName": "Hyperspace Desktop",
"version": "1.1.0-beta3",
"version": "1.1.0-beta4",
"description": "A beautiful, fluffy client for the fediverse",
"author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",
"repository": "https://github.com/hyperspacedev/hyperspace.git",
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppLayout/AppLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
*/
searchForQuery(what: string) {
what = what.replace(/^#/g, "tag:");
console.log(what);
// console.log(what);
window.location.href = isDesktopApp()
? "hyperspace://hyperspace/app/index.html#/search?query=" + what
: "/#/search?query=" + what;
Expand Down
27 changes: 23 additions & 4 deletions src/components/Post/Post.styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@ export const styles = (theme: Theme) =>
marginTop: theme.spacing.unit,
marginBottom: theme.spacing.unit
},
postHeaderContent: {
overflow: "hidden",
whiteSpace: "nowrap"
},
postHeaderTitle: {
display: "flex",
flexWrap: "wrap",
color: theme.palette.text.secondary
},
postAuthorNameAndAccount: {
overflow: "hidden",
textOverflow: "ellipsis"
},
postAuthorName: {
whiteSpace: "nowrap",
color: theme.palette.text.primary
},
postAuthorAccount: {
overflow: "hidden",
textOverflow: "ellipsis",
marginLeft: theme.spacing.unit * 0.5
},
postReblogChip: {
color: theme.palette.common.white,
"&:hover": {
Expand Down Expand Up @@ -81,14 +103,11 @@ export const styles = (theme: Theme) =>
paddingTop: theme.spacing.unit,
paddingBottom: theme.spacing.unit
},
postAuthorAccount: {
color: theme.palette.grey[500],
marginLeft: theme.spacing.unit * 0.5,
},
postReblogIcon: {
marginBottom: theme.spacing.unit * -0.5,
marginLeft: theme.spacing.unit * 0.5,
marginRight: theme.spacing.unit * 0.5,
color: theme.palette.text.primary
},
postAuthorEmoji: {
height: theme.typography.fontSize,
Expand Down
Loading

0 comments on commit 2f7c7d0

Please sign in to comment.