Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better Stylesheet organization + Fix for scroll in chatlist/messages/userlist #161

Merged
merged 2 commits into from
Jun 7, 2015
Merged

Better Stylesheet organization + Fix for scroll in chatlist/messages/userlist #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a489c5
Better Stylesheet organization + Fix for scroll in chatlist/messages
AdrianoCahete Jun 6, 2015
e50193a
Fix overflow-y mistake in wrapper
Jun 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions client/stylesheets/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,15 @@
//
// ----------------

@import "global/_variables.less";
@import "utils/_lesshat.import.less";
@import "utils/_reset.import.less";
@import "utils/_keyframes.import.less";
@import "utils/_preloader.import.less";
@import url(//fonts.googleapis.com/css?family=Roboto:300,400,500,700,900);
@import url(//fonts.googleapis.com/css?family=Muli:400,300,500);
@footer-min-height: 70px;
@header-min-height: 60px;
@rooms-box-width: 260px;
@flex-tab-width: 400px;
//@primary-background-color: #045080;
//@primary-background-color: #38393d;
@primary-background-color: #04436a;
@secondary-background-color: #F4F4F4;
@tertiary-background-color: #EAEAEA;
@link-font-color: #008CE3;
@primary-font-color: #444444;
@secondary-font-color: #7f7f7f;
@tertiary-font-color: rgba(255, 255, 255, 0.6);
@quaternary-font-color: rgba(255, 255, 255, 0.85);
@status-online: #35AC19;
@status-offline: #CCCCCC;
@status-busy: #D30230;
@status-away: #fcb316;
@import "utils/_emojione.import.less";

.cf_ {
display: inline-block;
&:after {
Expand Down Expand Up @@ -1057,7 +1044,7 @@ a.github-fork {
.calc(height, ~"100% - " @header-min-height + @footer-min-height);
width: 100%;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
display: block;
-webkit-overflow-scrolling: touch;
box-shadow: 0 0 5px rgba(0, 0, 0, 0.4) inset;
Expand Down Expand Up @@ -1580,7 +1567,7 @@ a.github-fork {
height: 100%;
top: 0;
left: 0;
overflow-y: scroll;
overflow-y: auto;
overflow-x: hidden;
word-wrap: break-word;
-webkit-overflow-scrolling: touch;
Expand Down Expand Up @@ -1955,8 +1942,8 @@ a.github-fork {
&:extend(.fill-all);
.custom-scroll(transparent, #DADADA);
margin-top: 60px;
overflow-y: scroll;
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.calc(height, ~"100% - " @footer-min-height + @header-min-height);
> div {
Expand Down
27 changes: 27 additions & 0 deletions client/stylesheets/global/_variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@header-min-height: 60px;
@footer-min-height: 70px;

@rooms-box-width: 260px;
@flex-tab-width: 400px;

// Colors
// --------------

//@primary-background-color: #045080;
//@primary-background-color: #38393d;

@primary-background-color: #04436a;
@secondary-background-color: #F4F4F4;
@tertiary-background-color: #EAEAEA;

@link-font-color: #008CE3;

@primary-font-color: #444444;
@secondary-font-color: #7f7f7f;
@tertiary-font-color: rgba(255, 255, 255, 0.6);
@quaternary-font-color: rgba(255, 255, 255, 0.85);

@status-online: #35AC19;
@status-offline: #CCCCCC;
@status-busy: #D30230;
@status-away: #fcb316;