codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 01:56:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

some simple style cleanup

Browse source
This commit is contained in:
Kris Aubuchon 2014-05-19 23:55:46 -04:00
parent c1776fa1ae
commit 7accf5aafa
5 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/common/base/discourse.scss
View file

@ -1,3 +1,18 @@
.container {
@extend .clearfix;
margin-right: auto;
margin-left: auto;
}
.full-width {
margin-left: 12px;
}
blockquote {
background-color: scale-color-diff();
border-left: 5px solid darken(scale-color-diff(), 10%);
}
a.no-href { a.no-href {
cursor: pointer; cursor: pointer;
} }

6
app/assets/stylesheets/desktop/discourse.scss
View file

@ -9,15 +9,11 @@ body {
} }
.container { .container {
@extend .clearfix;
max-width: $large-width; max-width: $large-width;
margin-right: auto;
margin-left: auto;
} }
.full-width { .full-width {
width: $large-width; width: $large-width;
margin-left: 12px;
} }
@include medium-width { @include medium-width {
@ -127,8 +123,6 @@ body {
blockquote { blockquote {
/* 13px left is intentional here to properly align with post quotes */ /* 13px left is intentional here to properly align with post quotes */
padding: 10px 4px 4px 13px; padding: 10px 4px 4px 13px;
background-color: scale-color-diff();
border-left: 5px solid darken(scale-color-diff(), 10%);
} }
.topic-statuses { .topic-statuses {

12
app/assets/stylesheets/mobile/discourse.scss
View file

@ -6,16 +6,6 @@ body {
background-color: $secondary; background-color: $secondary;
} }
.container {
@extend .clearfix;
margin-right: auto;
margin-left: auto;
}
.full-width {
margin-left: 12px;
}
body { body {
.boxed { .boxed {
@ -94,8 +84,6 @@ body {
blockquote { blockquote {
/* 13px left is intentional here to properly align with post quotes */ /* 13px left is intentional here to properly align with post quotes */
padding: 10px 8px 10px 13px; padding: 10px 8px 10px 13px;
background-color: scale-color($primary, $lightness: 95%);
border-left: 5px solid scale-color($primary, $lightness: 75%);
p { p {
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }

12
app/assets/stylesheets/mobile/topic-list.scss
View file

@ -120,11 +120,9 @@
} }
.badge-notification { .badge-notification {
position: relative; position: relative;
padding: 4px 4px 4px 3px;
top: -1px; top: -1px;
color: $tertiary !important; i {color: $secondary;}
/* this important is a terrible hack but the badge colors are
being overridden in a way I can't figure out on mobile, appears
to be a CSS precedence problem */
} }
.topic-item-stats { .topic-item-stats {
@ -295,7 +293,7 @@
repeat: no-repeat; repeat: no-repeat;
position: 10px 50%; position: 10px 50%;
size: 25px; size: 25px;
}; }
@include border-radius-all(12px); @include border-radius-all(12px);
} }
@ -359,7 +357,7 @@ span.posted {
height: 15px; height: 15px;
background: { background: {
image: image-url("posted.png"); image: image-url("posted.png");
}; }
} }
@ -452,7 +450,7 @@ ol.category-breadcrumb {
overflow-x: hidden; overflow-x: hidden;
overflow-y: scroll; overflow-y: scroll;
position: absolute; position: absolute;
border: 1px solid scale-color-diff();; border: 1px solid scale-color-diff();
background-color: $secondary; background-color: $secondary;
height: 200px; height: 200px;
padding: 8px 5px 0 7px; padding: 8px 5px 0 7px;

20
app/assets/stylesheets/mobile/topic-post.scss
View file

@ -1,5 +1,5 @@
.gap { .gap {
background-color: scale-color($primary, $lightness: 95%); background-color: scale-color-diff();
padding: 5px 15px; padding: 5px 15px;
color: $primary; color: $primary;
text-align: center; text-align: center;
@ -7,14 +7,14 @@
} }
.topic-post { .topic-post {
border-top: 1px solid scale-color($primary, $lightness: 95%); border-top: 1px solid sscale-color-diff();
padding: 6px 0 3px 0; padding: 6px 0 3px 0;
} }
nav.post-controls { nav.post-controls {
background-color: $secondary; background-color: $secondary;
padding: 0; padding: 0;
border-right: 1px solid scale-color($primary, $lightness: 95%); border-right: 1px solid scale-color-diff();
clear: both; clear: both;
button {color: scale-color($primary, $lightness: 50%); button {color: scale-color($primary, $lightness: 50%);
} }
@ -164,7 +164,7 @@ a.star {
border-radius: 5px; border-radius: 5px;
margin: 30px 10px 20px 10px; margin: 30px 10px 20px 10px;
border: 1px solid scale-color($primary, $lightness: 95%); border: 1px solid scale-color-diff();
h3 { h3 {
margin-bottom: 4px; margin-bottom: 4px;
@ -244,7 +244,7 @@ a.star {
} }
.information { .information {
border-top: 1px solid scale-color($primary, $lightness: 95%); border-top: 1px solid scale-color-diff();
} }
.domain { .domain {
@ -260,15 +260,15 @@ a.star {
float: right; float: right;
.btn { .btn {
border: 0; border: 0;
border-bottom: 1px solid scale-color($primary, $lightness: 95%);; border-bottom: 1px solid scale-color-diff();
border-left: 1px solid scale-color($primary, $lightness: 95%);; border-left: 1px solid scale-color-diff();
padding: 0 23px; padding: 0 23px;
color: $primary; color: $primary;
background: scale-color-diff(); background: scale-color-diff();
&:hover { &:hover {
background: scale-color($primary, $lightness: 75%); background: scale-color($primary, $lightness: 75%);
color: $primary; color: $primary;
border-bottom: 1px solid scale-color($primary, $lightness: 95%); border-bottom: 1px solid scale-color-diff();
} }
.fa { .fa {
@ -281,7 +281,7 @@ a.star {
} }
#topic-footer-buttons { #topic-footer-buttons {
border-top: 1px solid scale-color($primary, $lightness: 95%);; border-top: 1px solid scale-color-diff();
padding: 20px 10px 0 10px; padding: 20px 10px 0 10px;
} }
@ -527,7 +527,7 @@ blockquote {
.quote .title { .quote .title {
border-left: 5px solid scale-color($primary, $lightness: 75%); border-left: 5px solid scale-color($primary, $lightness: 75%);
background-color: scale-color($primary, $lightness: 95%); background-color: scale-color-diff();
padding: 10px 10px 10px 12px; padding: 10px 10px 10px 12px;
clear: both; clear: both;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }