Merge branch 'pull'

This commit is contained in:
friendica 2012-03-09 00:48:16 -08:00
commit 2ce78253ae
7 changed files with 25 additions and 5 deletions

Binary file not shown.

Before

(image error) Size: 28 KiB

After

(image error) Size: 19 KiB

BIN
view/theme/dispy/next.png Executable file → Normal file

Binary file not shown.

Before

(image error) Size: 891 B

After

(image error) Size: 590 B

Binary file not shown.

Before

(image error) Size: 3 KiB

After

(image error) Size: 2.4 KiB

BIN
view/theme/dispy/premium.png Executable file → Normal file

Binary file not shown.

Before

(image error) Size: 2.3 KiB

After

(image error) Size: 2.3 KiB

BIN
view/theme/dispy/prev.png Executable file → Normal file

Binary file not shown.

Before

(image error) Size: 853 B

After

(image error) Size: 593 B

View file

@ -45,12 +45,18 @@ body {
font-size: 16px; font-size: 16px;
line-height: 1.1em; line-height: 1.1em;
} }
body, button, input, select, textarea { body, button, input, select, textarea {
font-family: sans-serif; font-family: sans-serif;
color: #222; color: #222;
background-color: rgb(254,254,254); background-color: rgb(254,254,254);
background-color: rgba(254,254,254,255); }
select {
border: 1px #555 dotted;
padding: 3px;
margin: 2px;
}
option {
padding: 3px;
} }
/* remember to define focus styles! */ /* remember to define focus styles! */
:focus { :focus {
@ -1992,7 +1998,9 @@ div[id$="wrapper"] br {
text-decoration: none; text-decoration: none;
text-align: center; text-align: center;
} }
#peoplefind-sidebar form {
margin-bottom: 10px;
}
#sidebar-new-group:hover { #sidebar-new-group:hover {
/*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
/*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/ /*background: -moz-linear-gradient( center top, #b20202 5%, #d60808 100% );*/
@ -2003,6 +2011,18 @@ div[id$="wrapper"] br {
position: relative; position: relative;
top: 1px; top: 1px;
} }
#side-peoplefind-url {
background-color: #e5e0cf;
color: #666;
border: 1px 666 solid;
margin-right: 3px;
width: 75%;
}
#side-peoplefind-url:hover, #side-peoplefind-url:focus {
background-color: #efefef;
color: #222;
border: 1px 333 solid;
}
.nets-ul { .nets-ul {
list-style-type: none; list-style-type: none;
padding-left: 0px; padding-left: 0px;
@ -2110,7 +2130,7 @@ div[id$="wrapper"] br {
overflow: auto; overflow: auto;
width: 100%; width: 100%;
} }
.field label { .field label, label {
float: left; float: left;
width: 275px; width: 275px;
display: block; display: block;
@ -2122,7 +2142,7 @@ div[id$="wrapper"] br {
background: #eee; background: #eee;
vertical-align: middle; vertical-align: middle;
} }
.field input { .field input, input[type="text"] {
width: 250px; width: 250px;
height: 25px; height: 25px;
border: 1px #999 solid; border: 1px #999 solid;

Binary file not shown.

Before

(image error) Size: 632 B

After

(image error) Size: 571 B