github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 18:23:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

removing some dupe styles, adding button class

Browse Source
This commit is contained in:
Kris 2019-01-11 15:41:51 -05:00
parent 95f263995d
commit e4c593f1e7
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -120,7 +120,7 @@
{{else}}
<td colspan=2>
{{#if authProvider.method.can_connect}}
{{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" icon="plug" disabled=disableConnectButtons}}
{{d-button action=(action "connectAccount") actionParam=authProvider.method label="user.associated_accounts.connect" class="btn-default" icon="plug" disabled=disableConnectButtons}}
{{else}}
{{i18n 'user.associated_accounts.not_connected'}}
{{/if}}

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

@ -270,14 +270,6 @@
min-height: 0;
}
.d-editor-button-bar .btn {
padding: 4px 8px;
display: inline-block;
@media all and (max-width: 800px) {
padding: 5px;
}
}
.submit-panel {
display: flex;
flex-shrink: 0;

8
app/assets/stylesheets/common/d-editor.scss
View File

@ -79,9 +79,15 @@
padding-left: 3px;
border-bottom: 1px solid $primary-low;
button {
.btn,
.btn-default {
background-color: transparent;
color: $primary-high;
padding: 4px 8px;
display: inline-block;
@media all and (max-width: 800px) {
padding: 5px;
}
}
.btn:not(.no-text) {