Merge pull request #801 from friendica/revert-799-cssrefactor

Revert "Move mod_profiles.css content back into style.css, since it cont...
This commit is contained in:
pafcu 2014-12-31 12:01:16 +02:00
commit 8fa27efa7e
2 changed files with 39 additions and 41 deletions

View File

@ -0,0 +1,39 @@
#profile-edit-wrapper .field label {
margin-top: 20px;
width: 175px;
}
#profile-edit-wrapper .field input[type="text"] {
margin-top: 20px;
width: 220px;
}
#profile-edit-links {
max-width: $converse_width;
padding-top: 15px;
padding-bottom: 15px;
}
#profile-edit-links .btn {
margin: 0 10px 15px 0;
}
.profile-import {
vertical-align: top;
text-align: left;
}
.profile-import b {
color: $link_colour;
}
.profile-import input {
color: $font_colour;
border: none;
}
#profile-edit-drop-link {
color: #FFF;
font-weight: normal;
}

View File

@ -2216,44 +2216,3 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus { .jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
border: 1px solid #cccccc; border: 1px solid #cccccc;
} }
/* Should really go in mod_profiles.css, but since it includes variables it's here instead. A solution would be to handle variables in mod_profiles.css and other CSS files as well.
#profile-edit-wrapper .field label {
margin-top: 20px;
width: 175px;
}
#profile-edit-wrapper .field input[type="text"] {
margin-top: 20px;
width: 220px;
}
#profile-edit-links {
max-width: $converse_width;
padding-top: 15px;
padding-bottom: 15px;
}
#profile-edit-links .btn {
margin: 0 10px 15px 0;
}
.profile-import {
vertical-align: top;
text-align: left;
}
.profile-import b {
color: $link_colour;
}
.profile-import input {
color: $font_colour;
border: none;
}
#profile-edit-drop-link {
color: #FFF;
font-weight: normal;
}