github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-20 07:12:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Clean up some styles (#14374)

Browse Source
This commit is contained in:
Penar Musaraj 2021-09-20 09:52:03 -04:00 committed by GitHub
parent 0dd28cdd95
commit a736ff5f69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 62 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/addon/templates/badges-award.hbs
View File

@ -4,7 +4,7 @@
{{#if model}} {{#if model}}
<form class="form-horizontal"> <form class="form-horizontal">
<div class="badge-preview"> <div class="badge-preview control-group">
{{#if model}} {{#if model}}
{{icon-or-image model}} {{icon-or-image model}}
<span class="badge-display-name">{{model.name}}</span> <span class="badge-display-name">{{model.name}}</span>
@ -12,11 +12,11 @@
<span class="badge-placeholder">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span> <span class="badge-placeholder">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span>
{{/if}} {{/if}}
</div> </div>
<div> <div class="control-group">
<h4>{{i18n "admin.badges.mass_award.upload_csv"}}</h4> <h4>{{i18n "admin.badges.mass_award.upload_csv"}}</h4>
<input type="file" id="massAwardCSVUpload" accept=".csv" onchange={{action "updateFileSelected"}}> <input type="file" id="massAwardCSVUpload" accept=".csv" onchange={{action "updateFileSelected"}}>
</div> </div>
<div> <div class="control-group">
<label> <label>
{{input type="checkbox" checked=replaceBadgeOwners}} {{input type="checkbox" checked=replaceBadgeOwners}}
{{i18n "admin.badges.mass_award.replace_owners"}} {{i18n "admin.badges.mass_award.replace_owners"}}

82
app/assets/javascripts/admin/addon/templates/badges-show.hbs
View File

@ -1,6 +1,6 @@
{{#d-section class="current-badge content-body"}} {{#d-section class="current-badge content-body"}}
<form class="form-horizontal"> <form class="form-horizontal">
<div> <div class="control-group">
<label for="name">{{i18n "admin.badges.name"}}</label> <label for="name">{{i18n "admin.badges.name"}}</label>
{{#if readOnly}} {{#if readOnly}}
{{input type="text" name="name" value=buffered.name disabled=true}} {{input type="text" name="name" value=buffered.name disabled=true}}
@ -14,9 +14,9 @@
{{/if}} {{/if}}
</div> </div>
<div> <div class="control-group">
<label for="graphic">{{i18n "admin.badges.graphic"}}</label> <label for="graphic">{{i18n "admin.badges.graphic"}}</label>
<div class="radios"> <div class="radios inline-form full-width">
<label class="radio-label" for="badge-icon"> <label class="radio-label" for="badge-icon">
{{radio-button {{radio-button
name="badge-icon" name="badge-icon"
@ -59,7 +59,7 @@
{{/if}} {{/if}}
</div> </div>
<div> <div class="control-group">
<label for="badge_type_id">{{i18n "admin.badges.badge_type"}}</label> <label for="badge_type_id">{{i18n "admin.badges.badge_type"}}</label>
{{combo-box {{combo-box
name="badge_type_id" name="badge_type_id"
@ -70,7 +70,7 @@
}} }}
</div> </div>
<div> <div class="control-group">
<label for="badge_grouping_id">{{i18n "admin.badges.badge_grouping"}}</label> <label for="badge_grouping_id">{{i18n "admin.badges.badge_grouping"}}</label>
<div class="badge-grouping-control"> <div class="badge-grouping-control">
@ -90,7 +90,7 @@
</div> </div>
</div> </div>
<div> <div class="control-group">
<label for="description">{{i18n "admin.badges.description"}}</label> <label for="description">{{i18n "admin.badges.description"}}</label>
{{#if buffered.system}} {{#if buffered.system}}
{{textarea name="description" value=buffered.description disabled=true}} {{textarea name="description" value=buffered.description disabled=true}}
@ -104,7 +104,7 @@
{{/if}} {{/if}}
</div> </div>
<div> <div class="control-group">
<label for="long_description">{{i18n "admin.badges.long_description"}}</label> <label for="long_description">{{i18n "admin.badges.long_description"}}</label>
{{#if buffered.system}} {{#if buffered.system}}
{{textarea name="long_description" value=buffered.long_description disabled=true}} {{textarea name="long_description" value=buffered.long_description disabled=true}}
@ -119,7 +119,7 @@
</div> </div>
{{#if siteSettings.enable_badge_sql}} {{#if siteSettings.enable_badge_sql}}
<div> <div class="control-group">
<label for="query">{{i18n "admin.badges.query"}}</label> <label for="query">{{i18n "admin.badges.query"}}</label>
{{ace-editor content=buffered.query mode="sql" disabled=readOnly}} {{ace-editor content=buffered.query mode="sql" disabled=readOnly}}
</div> </div>
@ -132,21 +132,21 @@
{{i18n "loading"}} {{i18n "loading"}}
{{/if}} {{/if}}
<div> <div class="control-group">
<label> <label>
{{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}} {{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}}
{{i18n "admin.badges.auto_revoke"}} {{i18n "admin.badges.auto_revoke"}}
</label> </label>
</div> </div>
<div> <div class="control-group">
<label> <label>
{{input type="checkbox" checked=buffered.target_posts disabled=readOnly}} {{input type="checkbox" checked=buffered.target_posts disabled=readOnly}}
{{i18n "admin.badges.target_posts"}} {{i18n "admin.badges.target_posts"}}
</label> </label>
</div> </div>
<div> <div class="control-group">
<label for="trigger">{{i18n "admin.badges.trigger"}}</label> <label for="trigger">{{i18n "admin.badges.trigger"}}</label>
{{combo-box {{combo-box
name="trigger" name="trigger"
@ -159,39 +159,41 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
<div> <div class="control-group">
<label> <div>
{{input type="checkbox" checked=buffered.allow_title}} <label>
{{i18n "admin.badges.allow_title"}} {{input type="checkbox" checked=buffered.allow_title}}
</label> {{i18n "admin.badges.allow_title"}}
</div> </label>
</div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}} {{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}}
{{i18n "admin.badges.multiple_grant"}} {{i18n "admin.badges.multiple_grant"}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.listable disabled=readOnly}} {{input type="checkbox" checked=buffered.listable disabled=readOnly}}
{{i18n "admin.badges.listable"}} {{i18n "admin.badges.listable"}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.show_posts disabled=readOnly}} {{input type="checkbox" checked=buffered.show_posts disabled=readOnly}}
{{i18n "admin.badges.show_posts"}} {{i18n "admin.badges.show_posts"}}
</label> </label>
</div> </div>
<div> <div>
<label> <label>
{{input type="checkbox" checked=buffered.enabled}} {{input type="checkbox" checked=buffered.enabled}}
{{i18n "admin.badges.enabled"}} {{i18n "admin.badges.enabled"}}
</label> </label>
</div>
</div> </div>
<div class="buttons"> <div class="buttons">

4
app/assets/javascripts/admin/addon/templates/user-badges.hbs
View File

@ -14,7 +14,7 @@
<p>{{i18n "admin.badges.no_badges"}}</p> <p>{{i18n "admin.badges.no_badges"}}</p>
{{else}} {{else}}
<form class="form-horizontal"> <form class="form-horizontal">
<div> <div class="control-group">
<label>{{i18n "admin.badges.badge"}}</label> <label>{{i18n "admin.badges.badge"}}</label>
{{combo-box {{combo-box
filterable=true filterable=true
@ -23,7 +23,7 @@
onChange=(action (mut selectedBadgeId)) onChange=(action (mut selectedBadgeId))
}} }}
</div> </div>
<div> <div class="control-group">
<label>{{i18n "admin.badges.reason"}}</label> <label>{{i18n "admin.badges.reason"}}</label>
{{input type="text" value=badgeReason}}<br><small>{{i18n "admin.badges.reason_help"}}</small> {{input type="text" value=badgeReason}}<br><small>{{i18n "admin.badges.reason_help"}}</small>
</div> </div>

10
app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
View File

@ -6,13 +6,13 @@
<div class="web-hook-container"> <div class="web-hook-container">
<p>{{i18n "admin.web_hooks.detailed_instruction"}}</p> <p>{{i18n "admin.web_hooks.detailed_instruction"}}</p>
<form class="web-hook form-horizontal"> <form class="web-hook form-horizontal">
<div> <div class="control-group">
<label for="payload-url">{{i18n "admin.web_hooks.payload_url"}}</label> <label for="payload-url">{{i18n "admin.web_hooks.payload_url"}}</label>
{{text-field name="payload-url" value=model.payload_url placeholderKey="admin.web_hooks.payload_url_placeholder"}} {{text-field name="payload-url" value=model.payload_url placeholderKey="admin.web_hooks.payload_url_placeholder"}}
{{input-tip validation=urlValidation}} {{input-tip validation=urlValidation}}
</div> </div>
<div> <div class="control-group">
<label for="content-type">{{i18n "admin.web_hooks.content_type"}}</label> <label for="content-type">{{i18n "admin.web_hooks.content_type"}}</label>
{{combo-box {{combo-box
content=contentTypes content=contentTypes
@ -22,13 +22,13 @@
}} }}
</div> </div>
<div> <div class="control-group">
<label for="secret">{{i18n "admin.web_hooks.secret"}}</label> <label for="secret">{{i18n "admin.web_hooks.secret"}}</label>
{{text-field name="secret" value=model.secret placeholderKey="admin.web_hooks.secret_placeholder"}} {{text-field name="secret" value=model.secret placeholderKey="admin.web_hooks.secret_placeholder"}}
{{input-tip validation=secretValidation}} {{input-tip validation=secretValidation}}
</div> </div>
<div class="cbox10"> <div class="control-group">
<label>{{i18n "admin.web_hooks.event_chooser"}}</label> <label>{{i18n "admin.web_hooks.event_chooser"}}</label>
<div> <div>
{{radio-button class="subscription-choice" name="subscription-choice" value="individual" selection=model.webHookType}} {{radio-button class="subscription-choice" name="subscription-choice" value="individual" selection=model.webHookType}}
@ -48,7 +48,7 @@
</div> </div>
</div> </div>
<div class="filters"> <div class="filters control-group">
<div class="filter"> <div class="filter">
<label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.categories_filter"}}</label> <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.categories_filter"}}</label>
{{category-selector {{category-selector

24
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -598,29 +598,11 @@ $mobile-breakpoint: 700px;
} }
} }
.groups,
.badges, .badges,
.web-hook-container { .web-hook-container {
.form-horizontal { input[type="text"],
& > div { textarea {
margin-bottom: 20px; min-width: 350px;
}
.d-editor-textarea-wrapper {
max-width: 60%;
.d-editor-button-bar {
overflow: hidden;
}
}
input,
textarea,
select,
.select-box {
width: 350px;
}
input[type="checkbox"],
input[type="radio"] {
width: 20px;
}
} }
} }

2
app/assets/stylesheets/common/admin/api.scss
View File

@ -252,8 +252,6 @@ table.api-keys {
border-bottom: var(--primary-low) 1px solid; border-bottom: var(--primary-low) 1px solid;
} }
.filters { .filters {
margin: 5px 0;
padding-bottom: 5px;
border-bottom: var(--primary-low) 1px solid; border-bottom: var(--primary-low) 1px solid;
.filter { .filter {
margin-bottom: 1em; margin-bottom: 1em;

10
app/assets/stylesheets/common/admin/badges.scss
View File

@ -80,15 +80,7 @@
width: 350px; width: 350px;
} }
} }
.form-horizontal { .current-badge {
.radios {
display: flex;
.radio-label {
margin-right: 1.5em;
}
}
.ace-wrapper { .ace-wrapper {
position: relative; position: relative;
height: 270px; height: 270px;

4
app/assets/stylesheets/common/admin/customize.scss
View File

@ -351,7 +351,9 @@
} }
} }
.setting-label { .setting-label {
width: 25%; @include breakpoint(tablet, min-width) {
width: 25%;
}
word-wrap: break-word; word-wrap: break-word;
h3 { h3 {
margin-top: 0; margin-top: 0;

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

@ -122,14 +122,9 @@ input {
} }
.form-horizontal { .form-horizontal {
.hide { input[type="text"],
display: none; input[type="password"],
} textarea {
input,
textarea,
select {
display: inline-block;
margin-bottom: 0; margin-bottom: 0;
} }

8
app/assets/stylesheets/desktop/group.scss
View File

@ -34,14 +34,6 @@
width: 85%; width: 85%;
} }
.group-manage {
.form-horizontal {
button {
float: none;
}
}
}
.groups-form.groups-notifications-form { .groups-form.groups-notifications-form {
width: 500px; width: 500px;
max-width: 100%; max-width: 100%;

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

@ -8,10 +8,6 @@
} }
} }
.form-horizontal .control-group.category {
margin-top: 18px;
}
.user-profile-hidden { .user-profile-hidden {
font-size: 1.5em; font-size: 1.5em;
text-align: center; text-align: center;

5
app/assets/stylesheets/mobile/admin_customize.scss
View File

@ -10,11 +10,6 @@ body .admin-customize {
margin-bottom: 1em; margin-bottom: 1em;
} }
.form-horizontal.theme.settings .setting-label,
.admin-container .select-kit {
width: 100%;
}
.admin-container { .admin-container {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

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

@ -308,10 +308,6 @@
} }
} }
.form-horizontal .control-group.category {
margin-top: 18px;
}
.paginated-topics-list { .paginated-topics-list {
margin-top: 20px; margin-top: 20px;
} }