eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

This commit is contained in:
Brion Vibber 2011-01-26 14:59:35 -08:00
parent c65480fb33 f6cb4ea58d
commit 625405910f
5 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/notice_source.sql
View File

@ -24,6 +24,7 @@ VALUES
('HelloTxt','HelloTxt','http://hellotxt.com/', now()), ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()), ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
('identichat','identichat','http://identichat.prosody.im/', now()), ('identichat','identichat','http://identichat.prosody.im/', now()),
('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()), ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),

4
plugins/Bookmark/bookmark.css
View File

@ -3,4 +3,6 @@
.bookmark-avatar { float: left; } .bookmark-avatar { float: left; }
.bookmark-notice-count { float: right; } .bookmark-notice-count { float: right; }
.bookmark-info { float: left; } .bookmark-info { float: left; }
.bookmark-title { margin-left: 0px } .bookmark-title { margin-left: 0px; }
#content .bookmark .entry-title { margin-left: 0px; }
#content .bookmark .entry-content { margin-left: 0px; }

20
theme/base/css/display.css
View File

@ -346,14 +346,12 @@ list-style-type:none;
float:left; float:left;
text-decoration:none; text-decoration:none;
padding:4px 11px; padding:4px 11px;
border-radius-topleft:4px; border-top-left-radius:4px;
border-radius-topright:4px; border-top-right-radius:4px;
-moz-border-radius-topleft:4px; -moz-border-radius-topleft:4px;
-moz-border-radius-topright:4px; -moz-border-radius-topright:4px;
-webkit-border-top-left-radius:4px; -webkit-border-top-left-radius:4px;
-webkit-border-top-right-radius:4px; -webkit-border-top-right-radius:4px;
border-radius-topleft:0;
border-radius-topright:0;
border-width:1px; border-width:1px;
border-style:solid; border-style:solid;
border-bottom:0; border-bottom:0;
@ -381,13 +379,13 @@ display:block;
width:80%; width:80%;
padding-right:10%; padding-right:10%;
padding-left:10%; padding-left:10%;
border-radius-toprleft:0; border-top-left-radius:0;
-moz-border-radius-topleft:0; -moz-border-radius-topleft:0;
-webkit-border-top-left-radius:0; -webkit-border-top-left-radius:0;
border-radius-topright:4px; border-top-right-radius:4px;
-moz-border-radius-topright:4px; -moz-border-radius-topright:4px;
-webkit-border-top-right-radius:4px; -webkit-border-top-right-radius:4px;
border-radius-bottomright:4px; border-bottom-right-radius:4px;
-moz-border-radius-bottomright:4px; -moz-border-radius-bottomright:4px;
-webkit-border-bottom-right-radius:4px; -webkit-border-bottom-right-radius:4px;
} }
@ -398,13 +396,10 @@ box-shadow:none;
} }
body[id$=adminpanel] #content { body[id$=adminpanel] #content {
border-radius-topleft:7px; border-top-left-radius:7px;
border-radius-topright:7px;
-moz-border-radius-topleft:7px; -moz-border-radius-topleft:7px;
-moz-border-radius-topright:7px;
-webkit-border-top-left-radius:7px; -webkit-border-top-left-radius:7px;
-webkit-border-top-right-radius:7px; border-top-right-radius:0;
border-radius-topright:0;
-moz-border-radius-topright:0; -moz-border-radius-topright:0;
-webkit-border-top-right-radius:0; -webkit-border-top-right-radius:0;
} }
@ -488,6 +483,7 @@ min-height:259px;
padding:1.795%; padding:1.795%;
float:left; float:left;
border-radius:7px; border-radius:7px;
border-top-left-radius:0;
-moz-border-radius:7px; -moz-border-radius:7px;
-moz-border-radius-topleft:0; -moz-border-radius-topleft:0;
-webkit-border-radius:7px; -webkit-border-radius:7px;

4
theme/rebase/css/display.css
View File

@ -1399,7 +1399,7 @@ display:block;
padding: 4px 4px 4px 26px; padding: 4px 4px 4px 26px;
} }
.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input { .entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input {
background-color: #ccc !important; background-color: #ccc !important;
border: none; border: none;
} }
@ -1408,7 +1408,7 @@ display:block;
padding: 2px 4px 4px 28px; padding: 2px 4px 4px 28px;
} }
.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover { .entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover {
background-color: #f2f2f2 !important; background-color: #f2f2f2 !important;
} }

9
theme/shiny/css/display.css
View File

@ -296,7 +296,7 @@ h6 {font-size: 1em;}
position: relative; position: relative;
z-index: 9; z-index: 9;
float: right; float: right;
margin: 0px 0px 20px 0px; margin: 0px;
width: 290px; width: 290px;
} }
@ -331,7 +331,7 @@ h6 {font-size: 1em;}
} }
#site_nav_local_views li:first-child a { #site_nav_local_views li:first-child a {
border-radius-topright:4px; border-top-right-radius:4px;
-moz-border-radius-topright:4px; -moz-border-radius-topright:4px;
-webkit-border-top-right-radius:4px; -webkit-border-top-right-radius:4px;
} }
@ -368,7 +368,7 @@ h6 {font-size: 1em;}
border-radius: 4px; border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
border-radius-topright: 0px; border-top-right-radius: 0px;
-moz-border-radius-topright: 0px; -moz-border-radius-topright: 0px;
-webkit-border-top-right-radius: 0px; -webkit-border-top-right-radius: 0px;
padding: 14px 10px 20px 10px; padding: 14px 10px 20px 10px;
@ -382,9 +382,8 @@ h6 {font-size: 1em;}
padding: 0px; padding: 0px;
padding-top: 16px; padding-top: 16px;
padding-left: 10px; padding-left: 10px;
margin-top: -20px;
background-color: #262626; background-color: #262626;
border-radius-bottomright: 6px; border-bottom-right-radius: 6px;
-moz-border-radius-bottomright: 6px; -moz-border-radius-bottomright: 6px;
-webkit-border-bottom-right-radius: 6px; -webkit-border-bottom-right-radius: 6px;
} }