2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00

Fix + remove unnecessary indentation, dead code, cleanup user.css

This commit is contained in:
minusfive 2017-08-24 17:40:57 -04:00 committed by Robin Ward
parent c8ce3c6dee
commit 8a06d3d312
4 changed files with 155 additions and 172 deletions

View file

@ -92,6 +92,11 @@
}
.user-table {
position: relative;
margin-top: 20px;
}
.avatar-selector {
label {
display: inline-block;

View file

@ -98,7 +98,6 @@
}
.user-table {
margin-top: 30px;
width: 100%;
display: table;
table-layout: fixed;
@ -143,27 +142,6 @@
}
}
.user-main {
margin-bottom: 50px;
// name hacky so lastpass does not freak out
// -search- means it is bypassed
#add-user-to-group {
button, .ac-wrap {
float: left;
}
button {
margin-top: 5px;
}
#user-search-selector {
width: 400px;
}
}
.user-right {
display: table-cell;
}
.user-content {
padding: 10px 8px;
background-color: $secondary;
@ -177,6 +155,14 @@
h2 {
margin-bottom: 10px;
}
}
.pref-avatar {
.avatar {
max-width: 45px;
max-height: 45px;
}
}
.user-invite-list {
width: 100%;
@ -196,13 +182,6 @@
}
}
.pref-avatar {
.avatar {
max-width: 45px;
max-height: 45px;
}
}
.user-invite-controls {
background-color: $primary-low;
padding: 5px 10px 0px 0;
@ -218,7 +197,9 @@
clear: both;
padding: 15px;
}
}
.user-main {
margin-bottom: 50px;
.about {
background-position: center center;
@ -239,7 +220,10 @@
border-top: 1px solid $primary-low;
border-bottom: 1px solid $primary-low;
font-size: 0.929em;
.btn { padding: 3px 12px; }
.btn {
padding: 3px 12px;
}
dl dd {
display: inline;
@ -363,8 +347,11 @@
}
}
}
&.has-background {
.details { padding: 15px 15px 4px 15px;}
.details {
padding: 15px 15px 4px 15px;
}
}
.controls {
@ -372,7 +359,9 @@
float: right;
text-align: right;
width: 180px;
ul {list-style-type: none;}
ul {
list-style-type: none;
}
a {
padding: 5px 10px;
width: 140px;
@ -384,9 +373,8 @@
margin-left: 5px;
}
}
}
.about.collapsed-info {
&.collapsed-info {
.controls {
margin-top: 0;
width: auto;
@ -404,7 +392,9 @@
display: none;
}
.secondary { display: none; }
.secondary {
display: none;
}
.profile-image {
height: 0;
@ -415,7 +405,9 @@
margin-top: 0;
background: rgba($secondary, .85);
border-bottom: 1px solid $primary-low;
.bio { display: none; }
.bio {
display: none;
}
.primary {
text-align: left;
@ -447,7 +439,7 @@
&.has-background {
.details { padding: 12px 15px 2px 15px;}
}
}
}
.user-stream {
@ -643,7 +635,11 @@
}
}
.user-right .group-notification-menu {
.user-right {
display: table-cell;
.group-notification-menu {
float: right;
margin-bottom: 5px;
}
}

View file

@ -100,10 +100,6 @@ h2#site-text-logo
font-weight: normal;
}
.user-table {
position: relative;
}
.mobile-view .mobile-nav {
&.messages-nav, &.notifications-nav, &.activity-nav, &.preferences-nav {
position: absolute;

View file

@ -134,18 +134,6 @@
margin-top: 18px;
}
.user-navigation {
width: 100%;
margin-top: 20px;
min-height: 20px;
h3 {
color: $primary;
margin: 10px;
}
}
.user-main {
table.group-members {
@ -392,6 +380,8 @@
.user-stream {
padding-top: 20px;
.excerpt {
margin: 5px 0;
font-size: 0.929em;
@ -586,10 +576,6 @@
}
}
.user-archive {
display: inline-block;
}
// mobile fixups for badges
.badge-card.medium {