nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error

Browse source
This commit is contained in:
Faldrian 2014-11-16 18:19:32 +01:00
parent 7f51d8710e
commit 328a515dbe
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/application.css.scss
View file

@ -66,6 +66,10 @@ body {
}; };
} }
header {
line-height: 20px;
}
a { a {
color: $blue; color: $blue;
text: { text: {

11
app/assets/stylesheets/bootstrap-fix.css.scss vendored Normal file
View file

@ -0,0 +1,11 @@
// A temporary fix for broken classes in bootstrap 2.
// Can probably be removed when migration of bootstrap 3 is done.
input::-moz-placeholder,
textarea::-moz-placeholder {
color: #999999;
}
input::-ms-input-placeholder,
textarea::-ms-input-placeholder {
color: #999999;
}

3
app/assets/stylesheets/header.css.scss
View file

@ -233,6 +233,7 @@ body > header {
border: 1px solid #222; border: 1px solid #222;
font-size: 13px; font-size: 13px;
padding: 4px; padding: 4px;
margin-top: 1px;
&:hover { background-color: #555; } &:hover { background-color: #555; }
@ -345,7 +346,7 @@ body > header {
float: left; float: left;
height: 100%; height: 100%;
margin-right: 5px; margin-right: 5px;
margin-top: 3px; margin-top: 2px;
a { a {
padding: 0 10px; padding: 0 10px;

2
app/assets/stylesheets/new-templates.css.scss
View file

@ -1,3 +1,5 @@
@import 'bootstrap-fix';
@import 'perfect-scrollbar'; @import 'perfect-scrollbar';
@import "colors"; @import "colors";