Skip to content

Commit

Permalink
NodeBB v1.1.1 compatibility and other CSS updates
Browse files Browse the repository at this point in the history
  • Loading branch information
pichalite committed Aug 9, 2016
1 parent cda5b15 commit 612815e
Show file tree
Hide file tree
Showing 30 changed files with 317 additions and 314 deletions.
20 changes: 10 additions & 10 deletions less/account.less
Expand Up @@ -105,7 +105,7 @@

hr {
border: @account-hr-border;
margin: 0px;
margin: 0;
}

@media (max-width: @screen-xs-max) {
Expand All @@ -119,7 +119,7 @@
.status {
left: 140px;
position: absolute;
top: 0px;
top: 0;
border: 1px solid #fff;
height: 18px;
width: 18px;
Expand Down Expand Up @@ -156,8 +156,8 @@
@media (max-width: @screen-xs-max) {
font-size: 11px;
text-align: left;
margin-top: 0px;
margin-bottom: 0px;
margin-top: 0;
margin-bottom: 0;
}
}

Expand All @@ -166,7 +166,7 @@
top: 25px;
left: ~"calc(50% - 30px)";
min-width: 120px;
margin-left: 0px;
margin-left: 0;
}
}

Expand All @@ -179,7 +179,7 @@
min-width: 100px;

@media (max-width: @screen-xs-max) {
padding: 10px 0px;
padding: 10px 0;
}
}

Expand All @@ -200,11 +200,11 @@

[component="account/chat"], [component="account/follow"], [component="account/unfollow"] {
float: left;
margin: 15px 5px 0px;
margin: 15px 5px 0;

@media (max-width: @screen-xs-max) {
float: inherit;
margin: 0px 5px 15px 5px;
margin: 0 5px 15px 5px;
}
}
}
Expand Down Expand Up @@ -335,7 +335,7 @@
.account {
&.account-info {
.ban-history {
padding-left: 0px;
padding-left: 0;

.timestamp {
font-weight: bold;
Expand All @@ -347,7 +347,7 @@
}

.recent-flags {
padding-left: 0px;
padding-left: 0;

.title {
font-weight: bold;
Expand Down
4 changes: 1 addition & 3 deletions less/actions.less
Expand Up @@ -163,8 +163,6 @@
}

.user-picture {
width: 32px;
height: 32px;
border-radius: 50%;
.user-icon(32px, 1.9rem);
}
}
6 changes: 3 additions & 3 deletions less/alert.less
Expand Up @@ -4,12 +4,12 @@
z-index: 10002;

right: 20px;
bottom: 0px;
bottom: 0;

.alert {
color: #fff;
border: 0;
box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.25), 0px 2px 10px 0px rgba(0, 0, 0, 0.25);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.25), 0 2px 10px 0 rgba(0, 0, 0, 0.25);

.close {
color: #fff;
Expand All @@ -24,7 +24,7 @@
}

p {
padding: 10px 0px 0px;
padding: 10px 0 0;
}

&.alert-info {
Expand Down
2 changes: 1 addition & 1 deletion less/buttons.less
Expand Up @@ -923,7 +923,7 @@ tbody.collapse.in {
}

&.to-top {
padding: 0 0 42px 0px;
padding: 0 0 42px 0;
bottom: 0;
top: auto;
right: -5px;
Expand Down
59 changes: 41 additions & 18 deletions less/categories.less
Expand Up @@ -18,7 +18,7 @@

.category-card {
margin-bottom: 15px;
box-shadow: 0 2px 5px 0 rgba(0,0,0,.26);
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .26);
height: 245px;
position: relative;

Expand All @@ -43,7 +43,7 @@
font-size: 12px;

li>span {
margin: 0px 5px;
margin: 0 5px;
}
}

Expand All @@ -53,20 +53,14 @@
}

.category-card-footer {
background-color: rgba(17,17,17,.7);
background-color: rgba(17, 17, 17, .7);
border: 0;
position: absolute;
bottom: 0;
left: 0;
right: 0;
padding: 10px;

img {
width: 32px;
height: 32px;
border-radius: 50%;
}

a {
color: #fff;
}
Expand Down Expand Up @@ -97,6 +91,38 @@
display: none;
}
}

.listview {
.user-avatar {
.user-avatar(40px);
}

.user-icon {
.user-icon(40px, 2rem);
}
}

.category-card {
.user-avatar {
.user-avatar(35px);
}

.user-icon {
.user-icon(35px, 1.9rem);
}
}
}

.recent {
.listview {
.user-avatar {
.user-avatar(40px);
}

.user-icon {
.user-icon(40px, 2rem);
}
}
}

[component="category/topic"] {
Expand Down Expand Up @@ -174,7 +200,7 @@

.categories {
.media>.pull-left {
padding: 0px;
padding: 0;
margin-right: 15px;
}

Expand All @@ -183,7 +209,7 @@
padding: 15px 20px 10px 20px;

@media (max-width: @screen-sm-max) {
padding: 10px 0px;
padding: 10px 0;
}

&.media {
Expand Down Expand Up @@ -217,7 +243,7 @@
font-weight: 300;

p {
margin-bottom: 0px;
margin-bottom: 0;
}
}
}
Expand All @@ -234,10 +260,7 @@
margin-right: 10px;
margin-top: 5px;
img, .user-icon {
width: 24px;
height: 24px;
line-height: 24px;
border-radius: 50%;
.user-icon(32px, 1.5rem);
}
}

Expand All @@ -253,7 +276,7 @@
&.lv-item {
&.media {
top: 20px;
padding: 15px 0px 10px;
padding: 15px 0 10px;

.icon {
min-width: 32px;
Expand All @@ -271,7 +294,7 @@
font-weight: 300;

p {
margin-bottom: 0px;
margin-bottom: 0;
}
}
}
Expand Down

0 comments on commit 612815e

Please sign in to comment.