From 5878692c81aa824c71ee882ee2a6587551661051 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 13 May 2015 15:04:40 -0700 Subject: [PATCH 1/3] Moved manage/delete buttons to the right --- sass/_project-sass/_project-Main.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 26575bdf..b63edc2d 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -492,6 +492,14 @@ } .file > .overlay { border-radius: 3px; + padding-top: 3px; + text-align: right; + + a { + color: #e93250; + display: inline; + margin-right: 5px; + } } .html-thumbnail > .overlay { background-color: transparent; From b0667a73a7332ef589a4c3a4fc0d315f0dc9613f Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 13 May 2015 15:16:10 -0700 Subject: [PATCH 2/3] Initial work on size/updated columns; switched title truncation from ruby to css text-overflow --- sass/_project-sass/_project-Main.scss | 9 +++++++++ views/dashboard.erb | 13 ++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index b63edc2d..832f1ca1 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -360,6 +360,7 @@ white-space: nowrap; overflow: hidden; display: block; + text-overflow: ellipsis; } .html-thumbnail { font-size: 11px; @@ -465,6 +466,9 @@ margin-top: 2px; float: left; font-size: 13px; + text-align: left; + width: 30%; + text-overflow: ellipsis; } } .html-thumbnail, .misc-icon { @@ -494,6 +498,7 @@ border-radius: 3px; padding-top: 3px; text-align: right; + background-color: rgba(0, 0, 0, 0.06); a { color: #e93250; @@ -504,6 +509,10 @@ .html-thumbnail > .overlay { background-color: transparent; } + .column { + float: left; + width: 15%; + } } .site-actions { float: left; diff --git a/views/dashboard.erb b/views/dashboard.erb index 89b49d0f..3046a157 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -137,12 +137,15 @@ <% end %> - <% if file[:name].length > 19 %> - <%= file[:name].slice(0..18) %>… - <% else %> - <%= file[:name] %> - <% end %> + <%= file[:name] %> +
+ 5KB +
+
+ 5/13/15 +
+
<% if file[:is_editable] %> Edit From 674798a01b877e2bc8295f8266d96a4e6f20f8af Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 13 May 2015 15:28:53 -0700 Subject: [PATCH 3/3] Change list view manage/delete to always shown --- sass/_project-sass/_project-Main.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss index 832f1ca1..9aed6a47 100644 --- a/sass/_project-sass/_project-Main.scss +++ b/sass/_project-sass/_project-Main.scss @@ -498,7 +498,8 @@ border-radius: 3px; padding-top: 3px; text-align: right; - background-color: rgba(0, 0, 0, 0.06); + background-color: transparent; + display: block; a { color: #e93250;