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

minor UI fixes for site customisations

This commit is contained in:
Sam 2013-06-19 15:18:22 +10:00
parent e7d6b25998
commit 31bcabd5e1
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/admin/models/site_customization.js
View File

@ -70,7 +70,10 @@ Discourse.SiteCustomization = Discourse.Model.extend({
data: { site_customization: data }, data: { site_customization: data },
type: this.id ? 'PUT' : 'POST' type: this.id ? 'PUT' : 'POST'
}).then(function (result) { }).then(function (result) {
if (!siteCustomization.id) { siteCustomization.set('id', result.id); } if (!siteCustomization.id) {
siteCustomization.set('id', result.id);
siteCustomization.set('key', result.key);
}
siteCustomization.set('savingStatus', Em.String.i18n('saved')); siteCustomization.set('savingStatus', Em.String.i18n('saved'));
siteCustomization.set('saving',false); siteCustomization.set('saving',false);
siteCustomization.startTrackingChanges(); siteCustomization.startTrackingChanges();

2
app/assets/javascripts/admin/templates/customize.js.handlebars
View File

@ -29,7 +29,7 @@
{{aceEditor content=header mode="html"}} {{aceEditor content=header mode="html"}}
{{/if}} {{/if}}
{{#if view.stylesheetActive}} {{#if view.stylesheetActive}}
{{aceEditor content=stylesheet mode="css"}} {{aceEditor content=stylesheet mode="scss"}}
{{/if}} {{/if}}
{{/with}} {{/with}}
<br> <br>

11
app/assets/stylesheets/admin/admin_base.scss
View File

@ -218,10 +218,7 @@ table {
float: left; float: left;
} }
.content-list ul { .content-list ul {
min-height: 700px; margin-bottom: 10px;
}
a {
cursor: pointer;
} }
.current-style { .current-style {
.delete-link { .delete-link {
@ -240,7 +237,7 @@ table {
} }
.ace-wrapper { .ace-wrapper {
position: relative; position: relative;
height: 600px; height: 400px;
width: 100%; width: 100%;
} }
.ace_editor { .ace_editor {
@ -252,6 +249,7 @@ table {
} }
.status-actions { .status-actions {
float: right; float: right;
margin-top: 7px;
span { span {
margin-right: 20px; margin-right: 20px;
} }
@ -259,9 +257,6 @@ table {
.buttons { .buttons {
float: left; float: left;
width: 200px; width: 200px;
button, a , span{
float: left;
}
.saving { .saving {
padding: 5px 0 0 0; padding: 5px 0 0 0;
margin-left: 10px; margin-left: 10px;