diff --git a/securedrop/journalist_templates/_source_row.html b/securedrop/journalist_templates/_source_row.html index 559980f2a4..0d5514ffe1 100644 --- a/securedrop/journalist_templates/_source_row.html +++ b/securedrop/journalist_templates/_source_row.html @@ -4,15 +4,18 @@
- - - - + + + + - + diff --git a/securedrop/sass/journalist.sass b/securedrop/sass/journalist.sass index 0a2cbc097e..3005d29118 100644 --- a/securedrop/sass/journalist.sass +++ b/securedrop/sass/journalist.sass @@ -74,8 +74,7 @@ button.small-danger, a.btn.small-danger, .btn.small-danger .submission .icon display: inline-block - width: 3.5% - color: #3d3d3d + margin-right: 3px #cols li.source .button-star diff --git a/securedrop/sass/modules/_button.sass b/securedrop/sass/modules/_button.sass index e0cf1fe10a..cc8dc15fa5 100644 --- a/securedrop/sass/modules/_button.sass +++ b/securedrop/sass/modules/_button.sass @@ -52,10 +52,7 @@ border: 1px solid $color_grimace_blue &.delete-user - color: $color_urgent_coral - - &:hover - color: #ce0083 + padding: 0 .btn @@ -124,26 +121,20 @@ a:hover > img.on-hover, button:hover > img.on-hover display: inline - a > img.icon, button > img.icon, button > i.fa, button > i.fas, a > i.fa, a >i.fas + a > img.icon, button > img.icon vertical-align: middle margin-right: 3px margin-bottom: 2px opacity: .9 + // The source star icon must not inherit the vertical alignment of other button icons + button > img.icon-star-source + margin-right: 3px + .button-star padding: 0 - color: orange border: none .btn--space margin-bottom: 5px margin-left: 5px - - // Icons used as buttons in the Journalist UI - .disabled-delete-button - color: #c0c0c0 - font-size: 0.8em - letter-spacing: 0.2em - - .edit-user-button - font-size: 0.8em diff --git a/securedrop/sass/modules/_cols.sass b/securedrop/sass/modules/_cols.sass index b92f5da3c6..e3ce8051ef 100644 --- a/securedrop/sass/modules/_cols.sass +++ b/securedrop/sass/modules/_cols.sass @@ -59,7 +59,7 @@ span padding: 3px margin-right: 5px - font-size: 12px + font-size: 0.9em color: #3d3d3d &.unread diff --git a/securedrop/sass/modules/_users-table.sass b/securedrop/sass/modules/_users-table.sass index 966ed00387..8ce0396276 100644 --- a/securedrop/sass/modules/_users-table.sass +++ b/securedrop/sass/modules/_users-table.sass @@ -2,5 +2,8 @@ table#users width: 100% + th, td + padding-bottom: .85em + td text-align: center diff --git a/securedrop/static/icons/bell.png b/securedrop/static/icons/bell.png new file mode 100644 index 0000000000..32f8933b40 Binary files /dev/null and b/securedrop/static/icons/bell.png differ diff --git a/securedrop/static/icons/check.png b/securedrop/static/icons/check.png new file mode 100644 index 0000000000..0fedb999e9 Binary files /dev/null and b/securedrop/static/icons/check.png differ diff --git a/securedrop/static/icons/chevron-right.png b/securedrop/static/icons/chevron-right.png new file mode 100644 index 0000000000..29a9bc24a7 Binary files /dev/null and b/securedrop/static/icons/chevron-right.png differ diff --git a/securedrop/static/icons/download.png b/securedrop/static/icons/download.png new file mode 100644 index 0000000000..959483aa18 Binary files /dev/null and b/securedrop/static/icons/download.png differ diff --git a/securedrop/static/icons/edit-user.png b/securedrop/static/icons/edit-user.png new file mode 100644 index 0000000000..cf6cce299d Binary files /dev/null and b/securedrop/static/icons/edit-user.png differ diff --git a/securedrop/static/icons/envelope-closed.png b/securedrop/static/icons/envelope-closed.png new file mode 100644 index 0000000000..301494bb26 Binary files /dev/null and b/securedrop/static/icons/envelope-closed.png differ diff --git a/securedrop/static/icons/envelope-open.png b/securedrop/static/icons/envelope-open.png new file mode 100644 index 0000000000..4c0c0417b6 Binary files /dev/null and b/securedrop/static/icons/envelope-open.png differ diff --git a/securedrop/static/icons/files.png b/securedrop/static/icons/files.png new file mode 100644 index 0000000000..bcfbf27627 Binary files /dev/null and b/securedrop/static/icons/files.png differ diff --git a/securedrop/static/icons/messages.png b/securedrop/static/icons/messages.png new file mode 100644 index 0000000000..00ef2af256 Binary files /dev/null and b/securedrop/static/icons/messages.png differ diff --git a/securedrop/static/icons/pencil-alt.png b/securedrop/static/icons/pencil-alt.png new file mode 100644 index 0000000000..25f5d6f146 Binary files /dev/null and b/securedrop/static/icons/pencil-alt.png differ diff --git a/securedrop/static/icons/plus.png b/securedrop/static/icons/plus.png new file mode 100644 index 0000000000..d69ac7d9b5 Binary files /dev/null and b/securedrop/static/icons/plus.png differ diff --git a/securedrop/static/icons/reply.png b/securedrop/static/icons/reply.png new file mode 100644 index 0000000000..fd9df974fd Binary files /dev/null and b/securedrop/static/icons/reply.png differ diff --git a/securedrop/static/icons/star.png b/securedrop/static/icons/star.png new file mode 100644 index 0000000000..cac92fa0e8 Binary files /dev/null and b/securedrop/static/icons/star.png differ diff --git a/securedrop/static/icons/starred.png b/securedrop/static/icons/starred.png new file mode 100644 index 0000000000..a8fdc2b483 Binary files /dev/null and b/securedrop/static/icons/starred.png differ diff --git a/securedrop/static/icons/sync.png b/securedrop/static/icons/sync.png new file mode 100644 index 0000000000..44bc1770f9 Binary files /dev/null and b/securedrop/static/icons/sync.png differ diff --git a/securedrop/static/icons/trash-disabled.png b/securedrop/static/icons/trash-disabled.png new file mode 100644 index 0000000000..894448ace0 Binary files /dev/null and b/securedrop/static/icons/trash-disabled.png differ diff --git a/securedrop/static/icons/trash-hover-red.png b/securedrop/static/icons/trash-hover-red.png new file mode 100644 index 0000000000..821731fa0e Binary files /dev/null and b/securedrop/static/icons/trash-hover-red.png differ diff --git a/securedrop/static/icons/trash-hover-white.png b/securedrop/static/icons/trash-hover-white.png new file mode 100644 index 0000000000..0f7405b6da Binary files /dev/null and b/securedrop/static/icons/trash-hover-white.png differ diff --git a/securedrop/static/icons/trash.png b/securedrop/static/icons/trash.png new file mode 100644 index 0000000000..59712e127f Binary files /dev/null and b/securedrop/static/icons/trash.png differ diff --git a/securedrop/static/icons/unstar.png b/securedrop/static/icons/unstar.png new file mode 100644 index 0000000000..83c3ca784c Binary files /dev/null and b/securedrop/static/icons/unstar.png differ diff --git a/securedrop/static/icons/unstarred.png b/securedrop/static/icons/unstarred.png new file mode 100644 index 0000000000..1b4dc69023 Binary files /dev/null and b/securedrop/static/icons/unstarred.png differ