github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-11 15:03:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2149 from awesomerobot/master

Browse Source 
removing border from topic list, making category sizes consistent
This commit is contained in:
Jeff Atwood 2014-03-19 06:45:06 -07:00
commit e67ad58a8d
5 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/common/components/badges.css.scss
View File

@ -19,21 +19,17 @@
// -------------------------------------------------- // --------------------------------------------------
.badge-category { .badge-category {
padding: 2px 6px; padding: 6px;
color: $tertiary_text_color; color: $tertiary_text_color;
font-size: 12px; font-size: 12px;
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
display: inline-block; display: inline-block;
line-height: 1;
&[href] { &[href] {
color: $tertiary_text_color; color: $tertiary_text_color;
} }
&.restricted {
div {
display: inline-block;
margin: 0;
}
}
} }
.d-dropdown .badge-category { .d-dropdown .badge-category {

13
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -11,7 +11,7 @@
.list-controls { .list-controls {
.nav { .nav {
float: left; float: left;
margin-bottom: 22px; margin-bottom: 18px;
} }
.btn { .btn {
@ -62,7 +62,6 @@
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
margin: 0 0 10px; margin: 0 0 10px;
border: 1px solid $primary_border_color;
a.title {color: $primary_text_color;} a.title {color: $primary_text_color;}
a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);}
@ -432,6 +431,8 @@
// -------------------------------------------------- // --------------------------------------------------
.list-controls { .list-controls {
border-bottom: 1px solid $primary_border_color;
.home { .home {
background-color: lighten($secondary_background_color, 76%); background-color: lighten($secondary_background_color, 76%);
color: $primary_text_color; color: $primary_text_color;
@ -530,17 +531,15 @@ ol.category-breadcrumb {
text-transform: none; text-transform: none;
width: 100%; width: 100%;
min-width: 102px; min-width: 102px;
text-align: center; text-align: center;
margin-right: 20px; margin-right: 20px;
margin-bottom: 7px;
} }
div {
margin-bottom: 10px;
}
} }
.top-lists {margin-top: 20px;}
#bulk-select { #bulk-select {
position: fixed; position: fixed;
right: 20px; right: 20px;

3
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -471,13 +471,14 @@ iframe {
a.star { a.star {
margin-right: 8px; margin-right: 8px;
font-size: 20px; font-size: 20px;
margin-top: 8px; margin-top: 6px;
} }
.topic-statuses {margin-top: -2px;} .topic-statuses {margin-top: -2px;}
.badge-category { .badge-category {
vertical-align: top; vertical-align: top;
margin-top: 4px;
} }
} }

4
app/assets/stylesheets/desktop/topic.scss
View File

@ -41,7 +41,7 @@
.star { .star {
font-size: 20px; font-size: 20px;
margin-top: 8px; margin-top: 8px;
margin-right: 8px; margin-right: 6px;
} }
#edit-title { width: 500px; } #edit-title { width: 500px; }
.category-combobox { .category-combobox {
@ -59,7 +59,7 @@
margin: 0; margin: 0;
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a.badge-category { vertical-align: top; } a.badge-category { vertical-align: top; margin-top: 4px; }
a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
} }
.topic-statuses { .topic-statuses {

5
app/assets/stylesheets/mobile/header.scss
View File

@ -34,8 +34,8 @@
} }
} }
#site-logo { #site-logo {
max-width: 122px; max-width: 122px;
max-height: 40px; max-height: 40px;
} }
.fa-home { .fa-home {
font-size: 20px; font-size: 20px;
@ -235,7 +235,6 @@
.category { .category {
float: left; float: left;
background-color: transparent; background-color: transparent;
line-height: 20px;
} }
&#user-dropdown { &#user-dropdown {