Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/common/base/user.scss
View File

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

282
app/assets/stylesheets/desktop/user.scss
View File

@ -98,7 +98,6 @@
} }
.user-table { .user-table {
margin-top: 30px;
width: 100%; width: 100%;
display: table; display: table;
table-layout: fixed; table-layout: fixed;
@ -143,83 +142,65 @@
} }
} }
.user-content {
padding: 10px 8px;
background-color: $secondary;
margin-bottom: 10px;
box-sizing: border-box;
.btn.right {
float: right
}
h2 {
margin-bottom: 10px;
}
}
.pref-avatar {
.avatar {
max-width: 45px;
max-height: 45px;
}
}
.user-invite-list {
width: 100%;
margin-top: 15px;
th {
text-align: left;
border-bottom: 3px solid $primary-low;
padding: 0 0 10px 0;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
font-weight: normal;
}
td {
padding: 10px 0 10px 0;
border-bottom: 1px solid $primary-low;
}
}
.user-invite-controls {
background-color: $primary-low;
padding: 5px 10px 0px 0;
height: 35px;
}
.user-invite-search {
clear: both;
margin: 15px 0px -15px 0px;
}
.user-invite-none {
clear: both;
padding: 15px;
}
.user-main { .user-main {
margin-bottom: 50px; 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;
margin-bottom: 10px;
box-sizing: border-box;
.btn.right {
float: right
}
h2 {
margin-bottom: 10px;
}
.user-invite-list {
width: 100%;
margin-top: 15px;
th {
text-align: left;
border-bottom: 3px solid $primary-low;
padding: 0 0 10px 0;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
font-weight: normal;
}
td {
padding: 10px 0 10px 0;
border-bottom: 1px solid $primary-low;
}
}
.pref-avatar {
.avatar {
max-width: 45px;
max-height: 45px;
}
}
.user-invite-controls {
background-color: $primary-low;
padding: 5px 10px 0px 0;
height: 35px;
}
.user-invite-search {
clear: both;
margin: 15px 0px -15px 0px;
}
.user-invite-none {
clear: both;
padding: 15px;
}
}
.about { .about {
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
@ -234,12 +215,15 @@
} }
} }
.secondary { .secondary {
background: scale-color($secondary, $lightness: -5%); background: scale-color($secondary, $lightness: -5%);
border-top: 1px solid $primary-low; border-top: 1px solid $primary-low;
border-bottom: 1px solid $primary-low; border-bottom: 1px solid $primary-low;
font-size: 0.929em; font-size: 0.929em;
.btn { padding: 3px 12px; }
.btn {
padding: 3px 12px;
}
dl dd { dl dd {
display: inline; display: inline;
@ -318,7 +302,7 @@
.groups { .groups {
margin-left: 10px; margin-left: 10px;
display: inline; display: inline;
} }
img.avatar { img.avatar {
margin: 0 20px 10px 0; margin: 0 20px 10px 0;
@ -363,16 +347,21 @@
} }
} }
} }
&.has-background {
.details { padding: 15px 15px 4px 15px;} &.has-background {
} .details {
padding: 15px 15px 4px 15px;
}
}
.controls { .controls {
padding: 0 0 12px 0; padding: 0 0 12px 0;
float: right; float: right;
text-align: right; text-align: right;
width: 180px; width: 180px;
ul {list-style-type: none;} ul {
list-style-type: none;
}
a { a {
padding: 5px 10px; padding: 5px 10px;
width: 140px; width: 140px;
@ -384,70 +373,73 @@
margin-left: 5px; margin-left: 5px;
} }
} }
}
.about.collapsed-info { &.collapsed-info {
.controls { .controls {
margin-top: 0;
width: auto;
ul {
li {display: inline;}
a {
padding: 5px 10px;
margin-bottom: 10px;
width: auto;
}
}
}
.staff-counters {
display: none;
}
.secondary { display: none; }
.profile-image {
height: 0;
}
.details {
padding: 0 0 2px 0;
margin-top: 0;
background: rgba($secondary, .85);
border-bottom: 1px solid $primary-low;
.bio { display: none; }
.primary {
text-align: left;
margin-top: 0; margin-top: 0;
width: 100%; width: auto;
ul {
.avatar { li {display: inline;}
float: left; a {
margin-right: 10px; padding: 5px 10px;
width: 45px; margin-bottom: 10px;
height: 45px; width: auto;
}
} }
}
h1 { .staff-counters {
font-size: 1.429em; display: none;
} }
h2 { .secondary {
font-size: 1.071em; display: none;
margin-top: 4px; }
}
h3 { .profile-image {
height: 0;
}
.details {
padding: 0 0 2px 0;
margin-top: 0;
background: rgba($secondary, .85);
border-bottom: 1px solid $primary-low;
.bio {
display: none; display: none;
} }
.primary {
text-align: left;
margin-top: 0;
width: 100%;
.avatar {
float: left;
margin-right: 10px;
width: 45px;
height: 45px;
}
h1 {
font-size: 1.429em;
}
h2 {
font-size: 1.071em;
margin-top: 4px;
}
h3 {
display: none;
}
}
}
&.has-background {
.details { padding: 12px 15px 2px 15px;}
} }
} }
&.has-background {
.details { padding: 12px 15px 2px 15px;}
}
} }
.user-stream { .user-stream {
@ -643,7 +635,11 @@
} }
} }
.user-right .group-notification-menu { .user-right {
float: right; display: table-cell;
margin-bottom: 5px;
.group-notification-menu {
float: right;
margin-bottom: 5px;
}
} }

4
app/assets/stylesheets/mobile/discourse.scss
View File

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

18
app/assets/stylesheets/mobile/user.scss
View File

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