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

User prefrence: align all control groups on top. And some padding for follow category.

This commit is contained in:
Erick Guan 2014-05-18 16:33:56 +08:00
parent 55e5515657
commit c6ef85d517
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
View File

@ -13,7 +13,7 @@
<div class="controls"> <div class="controls">
<span class='static'>{{username}}</span> <span class='static'>{{username}}</span>
{{#if can_edit_username}} {{#if can_edit_username}}
{{#link-to "preferences.username" class="btn pad-left"}}<i class="fa fa-pencil"></i>{{/link-to}} {{#link-to "preferences.username" class="btn btn-small pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}}
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> <div class='instructions'>
@ -42,7 +42,7 @@
<label class="control-label">{{i18n user.title.title}}</label> <label class="control-label">{{i18n user.title.title}}</label>
<div class="controls"> <div class="controls">
<span class="static">{{title}}</span> <span class="static">{{title}}</span>
{{#link-to "preferences.badgeTitle" class="btn pad-left"}}<i class="fa fa-pencil"></i>{{/link-to}} {{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}}
</div> </div>
</div> </div>
{{/if}} {{/if}}
@ -52,7 +52,7 @@
<div class="controls"> <div class="controls">
<span class='static'>{{email}}</span> <span class='static'>{{email}}</span>
{{#if can_edit_email}} {{#if can_edit_email}}
{{#link-to "preferences.email" class="btn pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}} {{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}<i class="fa fa-pencil"></i>{{/link-to}}
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> <div class='instructions'>

21
app/assets/stylesheets/common/base/compose.scss
View File

@ -44,24 +44,22 @@ div.ac-wrap.disabled {
div.ac-wrap { div.ac-wrap {
background-color: $secondary; background-color: $secondary;
border: 1px solid scale-color($primary, $lightness: 90%); border: 1px solid scale-color($primary, $lightness: 90%);
padding: 5px 10px; padding: 5px 4px 1px 4px;
div.item { div.item {
float: left; float: left;
margin-bottom: 4px;
margin-right: 10px; margin-right: 10px;
margin-bottom: 5px;
span { span {
padding-left: 5px; height: 24px;
height: 22px;
display: inline-block; display: inline-block;
line-height: 22px; line-height: 20px;
vertical-align: bottom;
} }
a.remove { a.remove {
margin-left: 4px; margin-left: 4px;
font-size: 10px; font-size: 11px;
line-height: 10px; line-height: 10px;
padding: 2px 1px 1px 3px; padding: 1.5px 1.5px 1.5px 2.5px;
border-radius: 10px; border-radius: 12px;
width: 10px; width: 10px;
display: inline-block; display: inline-block;
border: 1px solid scale-color($primary, $lightness: 90%); border: 1px solid scale-color($primary, $lightness: 90%);
@ -75,10 +73,11 @@ div.ac-wrap {
} }
input[type="text"] { input[type="text"] {
float: left; float: left;
margin-top: 5px; margin-bottom: 4px;
height: 24px;
display: block;
border: 0; border: 0;
padding: 0; padding: 0;
margin: 4px 0 0;
box-shadow: none; box-shadow: none;
} }
} }

5
app/assets/stylesheets/desktop/discourse.scss
View File

@ -328,6 +328,7 @@ body {
} }
} }
.control-group { .control-group {
margin-bottom: 9px;
&.warning { &.warning {
> label { > label {
color: $danger; color: $danger;
@ -463,9 +464,6 @@ body {
display: none; display: none;
} }
.control-group {
margin-bottom: 9px;
}
.form-horizontal { .form-horizontal {
.control-group { .control-group {
margin-bottom: 18px; margin-bottom: 18px;
@ -486,7 +484,6 @@ body {
.control-label { .control-label {
float: left; float: left;
width: 140px; width: 140px;
padding-top: 5px;
text-align: right; text-align: right;
font-weight: bold; font-weight: bold;
} }

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

@ -58,8 +58,6 @@
.static { .static {
color: $primary; color: $primary;
margin-top: 5px;
margin-left: 5px;
display: inline-block; display: inline-block;
} }
.instructions { .instructions {
@ -84,7 +82,6 @@
} }
.other .controls { .other .controls {
margin-top: 10px;
select { select {
width: 280px; width: 280px;
} }