about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-08-07 21:59:49 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-08-07 21:59:49 +0200
commitb8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (patch)
tree6cc01e518ca75b9689da3aafb4ace1f16e8fd3fe
parentb9a2ceca359099207334a9e2155b98ae7165da15 (diff)
always put @handles on a new line. undo some needless changes from prev cmmt
-rw-r--r--app/javascript/styles/accounts.scss6
-rw-r--r--app/javascript/styles/components.scss11
-rw-r--r--app/javascript/styles/stream_entries.scss6
3 files changed, 16 insertions, 7 deletions
diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
index 80b6ec421..3d5c1a692 100644
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -409,9 +409,9 @@
     .display-name {
       display: block;
       max-width: 100%;
-      //overflow: hidden;
-      //white-space: nowrap;
-      //text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
       cursor: default;
 
       strong {
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 8cb7b8618..41735c7a4 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -779,7 +779,7 @@
 .status__info .status__display-name {
   display: block;
   max-width: 100%;
-  padding-right: 25px;
+  //padding-right: 25px;
 }
 
 .status__info {
@@ -1386,6 +1386,15 @@
 
 .display-name__account {
   font-size: 14px;
+  display: block;
+  line-height: 1.1; // reduce the distance from the display name
+  padding-bottom: 3px;
+
+  // block ellipsis
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .status__relative-time,
diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/stream_entries.scss
index 938ec7023..90a43388b 100644
--- a/app/javascript/styles/stream_entries.scss
+++ b/app/javascript/styles/stream_entries.scss
@@ -156,9 +156,9 @@
       .display-name {
         display: block;
         max-width: 100%;
-        //overflow: hidden;
-        //white-space: nowrap;
-        //text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
 
         strong {
           font-weight: 500;