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

Merge branch 'theme-select-mobile' of https://github.com/jjaffeux/discourse

This commit is contained in:
Sam 2018-09-21 12:04:07 +10:00
parent 4bb980b9f7 87a97cbf4b
commit ae674dcb4e
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,15 @@
border-bottom: 1px solid $primary-low; border-bottom: 1px solid $primary-low;
padding-bottom: 8px; padding-bottom: 8px;
display: flex; display: flex;
align-items: center;
.title {
color: $primary-medium;
flex-grow: 1;
h3 {
margin-bottom: 0;
}
}
.create-actions { .create-actions {
margin-left: auto; margin-left: auto;
} }
@ -129,10 +137,7 @@
} }
} }
.show-current-style { .show-current-style {
padding-left: 10px;
padding-top: 10px;
display: inline-block; display: inline-block;
width: 70%;
vertical-align: top; vertical-align: top;
.url { .url {
@ -200,7 +205,6 @@
border-right: 1px solid $primary-low; border-right: 1px solid $primary-low;
border-bottom: 1px solid $primary-low; border-bottom: 1px solid $primary-low;
display: inline-block; display: inline-block;
width: 28%;
overflow: hidden; overflow: hidden;
} }

1
app/assets/stylesheets/desktop.scss
View File

@ -21,6 +21,7 @@
@import "desktop/queued-posts"; @import "desktop/queued-posts";
@import "desktop/group"; @import "desktop/group";
@import "desktop/groups"; @import "desktop/groups";
@import "desktop/admin_customize";
// Import all component-specific files // Import all component-specific files
@import "desktop/components/*"; @import "desktop/components/*";

16
app/assets/stylesheets/desktop/admin_customize.scss Normal file
View File

@ -0,0 +1,16 @@
.admin-customize {
.show-current-style {
padding-left: 10px;
padding-top: 10px;
width: 70%;
}
.themes-list {
width: 28%;
}
.customize-themes-header {
flex-direction: row;
align-items: center;
}
}

1
app/assets/stylesheets/mobile.scss
View File

@ -24,6 +24,7 @@
@import "mobile/group"; @import "mobile/group";
@import "mobile/groups"; @import "mobile/groups";
@import "mobile/dashboard_next"; @import "mobile/dashboard_next";
@import "mobile/admin_customize";
@import "mobile/admin_reports"; @import "mobile/admin_reports";
@import "mobile/admin_report"; @import "mobile/admin_report";
@import "mobile/admin_report_table"; @import "mobile/admin_report_table";

15
app/assets/stylesheets/mobile/admin_customize.scss Normal file
View File

@ -0,0 +1,15 @@
.admin-customize {
.show-current-style {
padding: 0;
width: 100%;
}
.themes-list {
width: 100%;
}
.customize-themes-header {
flex-direction: column;
align-items: flex-start;
}
}