plastichub/material-design-stock-theme
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from discourse/master

Browse Source 
Sync with upstream
This commit is contained in:
Jithin Emmanuel 2017-11-26 14:19:23 -08:00 committed by GitHub
commit d306f89d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 82 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
desktop/desktop.scss
View File

@ -24,6 +24,19 @@
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 0 0 0 rgba(0, 0, 0, 0.12);
}
//add shadow behind the list of topics on right in Category and Latest View
//add shadow behind list of categories on left in Category and Latest View
//add shadow behind topics in Latest view
.category-list,
.topic-list:not(.categories),
.latest-topic-list {
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
background-color: lighten($secondary, 10%);
border-collapse: collapse;
}
//underline navigation links
.nav-pills>li.active>a,
.nav-pills>li>a.active {
@ -48,16 +61,6 @@
}
}
//add shadow behind the list of topics, but not categories
.category-list,
.topic-list:not(.categories) {
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
background-color: lighten($secondary, 10%);
border-collapse: collapse;
}
//create conversation cards
.topic-body {
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
@ -118,7 +121,7 @@
//properly space buttons on login modal
button#login-link,
button#new-account-link {
padding-left: inherit;
padding-left: 20px;
}
//darken color, remove shadow and border when pressed
@ -264,8 +267,8 @@ button#new-account-link {
}
button#login-link,
button#new-account-link {
padding-left: initial;
padding-right: inherit;
padding-left: 20px;
padding-right: 20px;
}
#create-topic.btn-default {
right: initial;
@ -303,4 +306,4 @@ button#new-account-link {
right: -40% !important;
}
}
}
}

65
mobile/mobile.scss Normal file
View File

@ -0,0 +1,65 @@
//create conversation cards
.topic-body {
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
background-color: lighten($secondary, 10%);
margin-top: 10px;
padding-left: 20px;
border-radius: 2px;
padding-right: 20px;
}
//more space for avatars
.topic-avatar {
border-top: 0;
padding-right: 10px;
.avatar-flair {
right: 4px;
}
}
//remove stray border from bottom of last post
.topic-status-info {
border-top: 0;
}
//improve format of embedded posts
.embedded-posts .topic-avatar {
padding-left: 0px;
}
.embedded-posts.top.topic-body {
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0), 0 2px 10px 0 rgba(0, 0, 0, 0);
-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0), 0 2px 10px 0 rgba(0, 0, 0, 0);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0), 0 2px 10px 0 rgba(0, 0, 0, 0);
background-color: $secondary;
}
.small-action {
border: none;
}
#topic-closing-info {
border: none;
}
//remove lines between cards
.topic-post article {
border: none;
}
//put shadow on quotes as well
aside.quote {
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
}
//raise and round buttons
.btn:not(.bulk-select) {
border-radius: 2px;
-webkit-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
-moz-box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
}