consolidates avatar css

pull/1725/head
Jens Ulferts 10 years ago
parent 8b0b0c7912
commit 874b08c194
  1. 12
      app/assets/stylesheets/_work_packages.scss
  2. 4
      app/assets/stylesheets/content/_journal.css.sass
  3. 5
      app/assets/stylesheets/content/_user_avatars.sass
  4. 14
      app/assets/stylesheets/content/_watchers.sass
  5. 1
      app/assets/stylesheets/default.css.sass
  6. 62
      app/assets/stylesheets/default/main.css.erb

@ -59,15 +59,3 @@ select.to-validate.ng-dirty.ng-invalid ~ span.ko, input.to-validate.ng-dirty.ng-
.controller-work_packages.action-show .avatar-mini {
float: left;
}
.controller-work_packages.action-show .avatar-mini + a {
padding-left: 3px;
line-height: 20px;
vertical-align: sub;
}
.controller-work_packages.action-show #watchers .delete {
padding-left: 3px;
line-height: 20px;
vertical-align: sub;
}

@ -44,10 +44,6 @@
bottom: 20px
left: 3px
clear: left
img.gravatar
float: none
margin: 0
padding: 0
.journal
width: 700px

@ -5,3 +5,8 @@
.avatar-mini
border-radius: $user_avatar_mini_border_radius
width: $user_avatar_mini_width
h1, h2, h3, h4, tr
.avatar, .avatar-mini
vertical-align: middle
margin-right: 7px

@ -0,0 +1,14 @@
#watchers
img
vertical-align: middle
margin-right: 7px
.delete
vertical-align: sub
li
list-style-type: none
margin: 0px 10px 0px 0px
padding: 0px 0px 0px 0px
float: left
line-height: $user_avatar_mini_width

@ -53,6 +53,7 @@
@import content/buttons
@import content/boxes
@import content/tabular
@import content/watchers
@import content/work_packages
@import content/work_packages_filters
@import content/work_packages_relations

@ -122,9 +122,8 @@ tr.version td.name { padding-left: 20px; }
tr.version.shared td.name { background: url(<%= asset_path 'link.png' %>) no-repeat 0% 70%; }
tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: left; white-space: nowrap; }
tr.user td { width: 13%; }
tr.user td { width: 13%; white-space: nowrap; }
tr.user td.email { width: 18%; }
tr.user td { white-space: nowrap; }
tr.user.locked, tr.user.registered { color: #aaa; }
tr.user.locked a, tr.user.registered a { color: #aaa; }
@ -159,11 +158,9 @@ table.attributes td { vertical-align: top; }
td.center, th.center {text-align: center;}
#watchers ul {margin: 0; padding: 0;}
#watchers li {list-style-type: none;margin: 0px 10px 0px 0px; padding: 0px 0px 0px 0px;float: left;}
#watchers select {width: 200px; display: block;float: left;margin-right: 10px;}
#watchers a.delete {opacity: 0.4;}
#watchers a.delete:hover {opacity: 1;}
#watchers img.gravatar {vertical-align: middle;margin: 0 10px 0px 0;}
.highlight { background-color: #FCFD8D;}
.highlight.token-1 { background-color: #faa;}
@ -691,50 +688,6 @@ ins.diffmod, ins.diffins { background: #cfc; }
}
/***** My page layout *****/
img.gravatar {
background: #fff;
}
div.issue img.gravatar {
float: right;
margin: 0 0 0 1em;
padding: 5px;
}
div.issue table img.gravatar {
height: 14px;
width: 14px;
padding: 2px;
float: left;
margin: 0 0.5em 0 0;
}
h2 img.gravatar {
margin: -2px 4px -4px 0;
vertical-align: top;
}
h4 img.gravatar {
margin: -6px 0 -4px 0;
vertical-align: top;
}
td.username img.gravatar {
margin: 0 0.5em 0 0;
vertical-align: top;
}
#activity dt img.gravatar {
float: left;
margin: 0 1em 1em 0;
}
/* Used on 12px Gravatar img tags without the icon background */
.icon-gravatar {
float: left;
margin-right: 4px;
}
#activity dt {
clear: left;
}
@ -1106,11 +1059,6 @@ ul.projects li div.root {
.profile-box ul li:last-child {
border-bottom: 0;
}
.profile-box .gravatar {
border: 0;
float: left;
margin-right: 6px;
}
/* file table hovers */
a.has-thumb img {
@ -1303,14 +1251,10 @@ div.issue hr {
#content h2 + h3 {
margin-top: 12px;
}
div.issue img.gravatar {
float: none;
margin: 0;
padding: 0;
}
p.author {
margin-bottom: 15px;
font-style: italic;
/* to accomodate the .profile-wrap class */
height: 42px;
}
/* add filter select box on non-issue pages */
fieldset#filters div.add-filter {

Loading…
Cancel
Save