Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FEATURE: rebuild user preferences page to use tabs

Browse source
This commit is contained in:
Neil Lalonde 2017-04-26 16:18:16 -04:00
parent f5f4c36795
commit 2503241ce5
35 changed files with 1039 additions and 689 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/assets/stylesheets/mobile/user.scss
View file

@ -2,12 +2,8 @@
.user-preferences {
.control-group {
// border-bottom: 1px solid #e5e5e5;
padding: 8px 36px 8px 8px;
}
.control-label {
font-weight: bold;
}
textarea {
width: 530px;
height: 100px;
@ -39,8 +35,9 @@
width: 520px;
}
.other .controls-dropdown {
.controls-dropdown {
margin-top: 10px;
margin-bottom: 15px;
padding-left: 5px;
select {
width: 280px;
@ -68,6 +65,16 @@
}
textarea {width: 100%;}
.desktop-notifications button {
float: none;
}
.apps .controls button {
float: right;
}
.category-notifications .category-controls, .tag-notifications .tag-controls {
margin-top: 24px;
}
}
.profile-image {
@ -123,10 +130,6 @@
}
.form-horizontal .control-group.other {
margin-bottom: 0;
}
.form-horizontal .control-group.category {
margin-top: 18px;
}
@ -211,9 +214,10 @@
overflow: hidden;
color: $secondary;
.secondary {
background: dark-light-diff($primary, $secondary, 90%, -65%);
font-size: 0.929em;
.secondary {
background: dark-light-diff($primary, $secondary, 90%, -65%);
font-size: 0.929em;
.btn { padding: 3px 12px; }
dl dd {
@ -549,14 +553,10 @@
.user-field {
label {
width: 140px;
float: left;
text-align: right;
width: auto;
text-align: left;
font-weight: bold;
}
input[type=text] {
width: 530px;
}
.controls {
label {
width: auto;
@ -564,7 +564,7 @@
font-weight: normal;
float: auto;
}
p {
.instructions {
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
margin-top: 5px;
margin-bottom: 10px;
@ -581,9 +581,9 @@
margin-top: 20px;
.user-content {
width: 100%;
margin-top: 0;
}
width: 100%;
margin-top: 0;
}
}
.user-archive {