Skip to content

Remove unnecessary space in admin panels + Fix statistic table layout + Fix scrollbar showing just when it's necessary #697

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

Merged
engelgabriel merged 3 commits into from
Sep 5, 2015
Merged

Remove unnecessary space in admin panels + Fix statistic table layout + Fix scrollbar showing just when it's necessary #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a24b6
Remove unnecessary space in admin panels + Fix statistic table layout…
AdrianoCahete Sep 4, 2015
d82397d
Remove unnecessary space in admin panels + Fix statistic table layout…
AdrianoCahete Sep 4, 2015
c33b135
Fixing last commit
AdrianoCahete Sep 5, 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
27 changes: 19 additions & 8 deletions client/stylesheets/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ blockquote {
.rocket-form {
max-width: 620px;
width: 90%;
padding: 25px 0;

legend {
margin-bottom: 23px;
position: relative;
Expand Down Expand Up @@ -1326,7 +1326,7 @@ a.github-fork {
~"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 @@ -1720,10 +1720,9 @@ a.github-fork {
overflow-y: hidden;
.content {
&:extend(.fill-all);
padding: 0px 40px;
padding: 25px 40px 0px;
overflow-y: scroll;
margin-top: 60px;
padding-top: 15px;
-webkit-overflow-scrolling: touch;
.calc(height,
~'100% - 60px');
Expand Down Expand Up @@ -1934,6 +1933,11 @@ a.github-fork {
padding: 0 0 0 10px;
font-weight: 500;
}

&:first-of-type > h1 {
margin-top: 0px;
}

.section-content {
border: 1px solid #ddd;
padding: 20px;
Expand Down Expand Up @@ -1992,6 +1996,7 @@ a.github-fork {
text-transform: uppercase;
}
}

.list {
a {
.clearfix;
Expand Down Expand Up @@ -2034,8 +2039,7 @@ a.github-fork {
.info {
display: block;
float: left;
.calc(width,
~"100% - 150px");
.calc(width,~"100% - 150px");
i {
margin-right: 5px;
width: 20px;
Expand Down Expand Up @@ -3760,9 +3764,16 @@ a.github-fork {
}

.statistics-table {
border: 1px solid black;
border: 1px solid #F9F9F9;
width:100%;
tr {
background-color:#FFFFFF;

&:nth-of-type(even) {
background-color:#FBFBFB;
}
}
th, td {
border: 1px solid black;
text-align: left;
padding: 3px 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-file/.npm/package/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.