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

simplfying the header, some more alignment adjustments on the topic page

Browse source
This commit is contained in:
Kris Aubuchon 2013-10-23 00:22:24 -04:00
parent 0ef064fd93
commit ca82d07f6d
4 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/common/foundation/base.scss
View file

@ -42,7 +42,7 @@ hr {
height: 1px;
margin: 1em 0;
border: 0;
border-top: 1px solid $hr-border-color;
border-top: 1px solid #eee;
padding: 0;
}

8
app/assets/stylesheets/desktop/header.scss
View file

@ -11,9 +11,8 @@
top: 0;
left: 0;
z-index: 1000;
border-bottom: 1px solid #9baab2;
box-shadow: 0 1px 5px rgba(70, 70, 70, .4);
background-color: $white;
@include box-shadow((0 1px 3px rgba($black, 0.12), inset 0 -4px 4px -4px rgba($black, 0.3)));
.docked & {
position: fixed;
}
@ -60,14 +59,11 @@
> li {
float: left;
&:first-child .icon {
@include border-radius-all(4px 0 0 4px);
}
&:first-child.active .icon {
@include border-radius-all(4px 0 0 0);
}
&:last-child .icon {
border-right: 1px solid #ccc;
@include border-radius-all(0 4px 4px 0);
}
}
.icon {
@ -79,7 +75,6 @@
color: $nav-button-color;
text-decoration: none;
cursor: pointer;
@include box-shadow(inset 0 -4px 4px -4px rgba($black, 0.14));
&:hover {
color: $nav-button-color-hover;
background-color: $nav-button-background-color-hover;
@ -159,7 +154,6 @@
margin-top: -1px;
border: 1px solid #ccc;
background-color: $white;
@include border-radius-all(4px);
@include box-shadow(0 3px 3px rgba($black, 0.2));
// Common

32
app/assets/stylesheets/desktop/topic-post.scss
View file

@ -7,6 +7,9 @@
margin-right: auto;
margin-left: auto;
}
h1 .topic-statuses .topic-status i {margin-right: 5px;}
.full-width {
@ -17,10 +20,17 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;}
.topic-post {
padding: 0;
&:first-of-type {
border-top: none;
}
&:last-of-type {
border-bottom: 1px solid #ddd;
}
.reply-to-tab {
display: block;
position: absolute;
@ -215,7 +225,6 @@ a.star {
.topic-summary {
button {border-radius: 0;}
.topic-links li {
word-wrap: break-word;
}
@ -360,13 +369,21 @@ a.star {
#suggested-topics {
clear: left;
.topics table tbody tr {background: #fff;}
table {
box-shadow: none;
border-radius: 0;
border-color: #ddd;
margin-top: 10px;
}
padding: 20px 10px 15px 10px;
.title {
font-size: 14px; line-height: 8px;
@ -392,7 +409,7 @@ span.post-count {
#topic-title {
z-index: 1000;
padding: 20px 10px 15px 10px;
padding: 25px 10px 15px 10px;
.chzn-container {vertical-align: middle;}
}
@ -454,7 +471,7 @@ iframe {
margin-bottom: 10px;
width: 92px;
border-top: 1px solid #ddd;
padding-top: 25px;
padding-top: 30px;
img { text-align: center; }
.contents {
@ -489,6 +506,8 @@ h3 {display: block;}
.contents .cooked {
padding-right: 30px;
h1, h2, h3 {margin: 10px 0;}
}
@ -610,7 +629,7 @@ blockquote {
}
.quote .title {margin-right: 0;}
.quote {margin-top: 20px;}
.quote-controls {
float: right;
color: #aaa;
@ -661,7 +680,7 @@ blockquote {
i {font-size: 12px;}
.post-links {
margin-top: 5px;
margin-top: 3px;
list-style-type: none;
padding-left: 19px;
position: relative;
@ -687,8 +706,7 @@ blockquote {
float: left;
position: relative;
width: 720px;
padding: 10px 10px 15px 20px;
padding: 10px 0 15px 20px;
}

7
app/assets/stylesheets/desktop/topic.scss
View file

@ -5,7 +5,6 @@
float: right;
margin-top: -22px;
float: right;
margin-top: -19px;
font-size: 12px;
}
@ -21,7 +20,7 @@ margin-left: 10px;
}
}
.post-menu-area {margin-bottom: 10px;}
.post-menu-area {margin-bottom: 10px; margin-top: 20px;}
.post-info {
display: inline-block;
@ -35,8 +34,8 @@ margin: -20px 0 0 0;
.topic-statuses {margin-left: 5px;}
h1 {
font-size: 2em;
line-height: 1.0;
font-size: 2.2em;
line-height: 1em;
margin: 0;