Brion Vibber
59a0b2a82d
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments
...
Conflicts:
js/util.min.js
2011-02-28 16:18:38 -08:00
Brion Vibber
62712b794a
More interactive magic for inline replies: placeholder at the end of list
2011-02-28 16:13:16 -08:00
Zach Copley
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
Brion Vibber
fb9418b99d
some quick visual tweaks
2011-02-28 12:50:26 -08:00
Brion Vibber
2c03dd569c
visual tweaks for convo view
2011-02-28 12:20:47 -08:00
Samantha Doherty
0fc46d1629
Rounded corner fixes for base theme.
2011-01-25 18:29:07 -05:00
Evan Prodromou
592e2be5e1
Make new menu the default menu
...
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.
This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.
Let's put that episode behind us.
The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Evan Prodromou
bbaf9d7f42
some fixes for new no-dl layout
2011-01-14 15:53:02 -05:00
Brion Vibber
5a3d01423d
Cleanup on the CSS for inline attachments; removed some unneeded changes since the split of the inline and regular attachment lists. Removing commented-out code that seems to be for some old thumbnailing system where the thumbnails were hidden popups within the core text (wtf!)
2010-11-09 16:28:33 -08:00
Brion Vibber
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
Brion Vibber
551b196a35
doomy doom doom
2010-11-08 15:32:41 -08:00
Samantha Doherty
01637bcd32
Base theme styling for oauth pin and desktop mode.
2010-10-25 16:00:34 -04:00
Evan Prodromou
db5d7e0167
add CC BY 3.0 license to CSS files
2010-09-02 23:16:29 -04:00
Sarven Capadisli
534c12e540
Revert "Multiple file upload handling."
...
This reverts commit 260f00d60b
.
As mentioned in
260f00d60b (comment_8367)
Reverting this merge until the bugs are fixed and there is a general
agreement on the need for this enhancement.
2010-03-31 10:57:20 +02:00
Nick Holliday
260f00d60b
Multiple file upload handling.
2010-03-26 18:28:54 -04:00
Sarven Capadisli
7f1b852c97
If indenting is disabled on the output, this fixes the entity_tags crop
2010-03-25 17:47:04 +01:00
Sarven Capadisli
09ff213d1c
Using hCard label instead of location. Matches userprofile.
2010-03-24 20:58:13 +01:00
Sarven Capadisli
5808f86584
Removed print stylesheet
2010-03-24 15:13:38 +01:00
Sarven Capadisli
647b3a1f6b
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-24 14:50:12 +01:00
Sarven Capadisli
41633fcd47
Minor margin to more link
2010-03-19 18:35:40 +01:00
Sarven Capadisli
e2768b8635
Using an icon to represent the action for more text
2010-03-18 14:29:35 +01:00
Sarven Capadisli
052466ceab
Using … (hellip) instead of "more" for link text
2010-03-18 14:26:30 +01:00
Sarven Capadisli
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
Sarven Capadisli
0be70e390b
Removed dangling stylesheet
2010-03-16 19:34:20 +01:00
Sarven Capadisli
2f380f6a9a
Using rel=external instead of class=external for jOverlay title link
2010-03-14 15:01:24 -04:00
Sarven Capadisli
00fa7d4b0b
Updated theme dates
2010-03-11 16:41:40 -05:00
Sarven Capadisli
b8cb3d2833
Alignment fix for IE6
2010-03-08 16:08:03 +00:00
Sarven Capadisli
36d86463e4
Increased admin navigation width to handle longer text length
2010-03-04 13:31:49 -05:00
Sarven Capadisli
15aaae67d6
Another update to admin navigation alignment
2010-03-04 13:28:26 -05:00
Sarven Capadisli
6b4c3e59fa
Showing a vertical navigation for admin panels.
2010-03-04 12:50:29 -05:00
Sarven Capadisli
610238442e
Added styles for User Role
2010-03-03 19:24:18 -05:00
Sarven Capadisli
5c70481d30
Using the full width for the content area for the admin section. It
...
also makes the local navigation's tabs stay in context with the content
2010-03-03 15:43:02 -05:00
Sarven Capadisli
31ecc86198
Fixes entity_tags alignment
2010-02-27 16:59:33 +01:00
Sarven Capadisli
2466dbfc97
Break long strings in tagcloud
2010-02-24 14:55:35 +01:00
Sarven Capadisli
c36155e238
Fixes long strings from not breaking
2010-02-18 18:12:08 +01:00
Sarven Capadisli
f5c69dfbf9
Updated the base stylesheet for minor fixes (which relied on indenting)
2010-02-15 21:34:41 +01:00
Sarven Capadisli
b57e3dfae2
More style generalisation for dialogbox
2010-02-12 14:16:38 +01:00
Sarven Capadisli
42679a22dc
Extracted default values for dialogbox layout and uniqe for form_repeat
2010-02-12 12:04:14 +01:00
Sarven Capadisli
fd527b8de1
Moved colour properties out of base stylesheet
2010-02-12 11:34:23 +01:00
Sarven Capadisli
efa930ab00
Added right margin for notice text. Helps Conversation notices look
...
better.
2010-02-03 18:13:21 +01:00
Sarven Capadisli
dabfe19098
Fixed margin-left on lists inside .hentry and .form_settings
2010-02-01 23:17:12 +00:00
Sarven Capadisli
d40e72beca
Prevents app statistic text from wrapping around avatar
2010-02-01 20:32:18 +01:00
Sarven Capadisli
f6c8b8a868
Hides .author from XHR response in showstream
2010-01-29 15:21:47 +00:00
Sarven Capadisli
c6f8b94fa9
Showing processing indicator for form_repeat on submit instead of form
2010-01-28 16:02:39 +01:00
Evan Prodromou
a85a3ddc72
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-27 22:05:58 -05:00
Evan Prodromou
5e1a9ad04d
Merge branch 'testing'
...
Conflicts:
theme/base/css/display.css
2010-01-27 22:05:32 -05:00
Sarven Capadisli
5e31ecd82a
Centred leaderboard ad
2010-01-27 16:36:57 -05:00
Sarven Capadisli
1c875a5395
Moved rectangle ad into aside and leaderboard to the right in header.
...
Intention for this layout was to reduce whitespace in header area
2010-01-27 16:34:18 -05:00
Sarven Capadisli
e3bd97bfe4
Aligning wide skyscraper to the right instead of left
2010-01-27 16:34:17 -05:00
Evan Prodromou
1758ed453b
move UAP plugin to core
2010-01-27 16:34:17 -05:00