Commit Graph

692 Commits

Author SHA1 Message Date
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
Samantha Doherty 7f50315168 Quick fix for popular notices in cleaner theme. 2011-02-25 13:43:21 -05:00
Samantha Doherty 09a3db628c First revision of new theme, cleaner. 2011-02-25 12:00:55 -05:00
Brion Vibber 5b8e74f8d4 normalize line endings in shiny/css/display.css 2011-01-31 11:09:20 -08:00
Samantha Doherty 8bc296bdbb A few wee fixes for rebase and shiny themes. 2011-01-25 18:32:12 -05:00
Samantha Doherty 0fc46d1629 Rounded corner fixes for base theme. 2011-01-25 18:29:07 -05:00
Evan Prodromou ba2128f2d1 make nav look right-ish in shiny 2011-01-23 13:07:47 -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 9df856e667 Merge branch '0.9.x' into merge
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08: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
Brion Vibber ca489631db Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Samantha Doherty 01637bcd32 Base theme styling for oauth pin and desktop mode. 2010-10-25 16:00:34 -04:00
Samantha Doherty 16aec72984 Wee fixin for overflowing notice content in sidebar. 2010-10-20 19:18:21 -04:00
Samantha Doherty d464ebfc12 Quick fix for wee regression in entity_action button hover states. 2010-10-19 21:33:56 -04:00
Brion Vibber 3593f3f132 Merge branch '0.9.x' into 1.0.x 2010-10-19 15:18:07 -07:00
Samantha Doherty fd55eef795 Just a little more mobile stylin. 2010-10-19 14:08:01 -04:00
Samantha Doherty f6bf804f1a Quick mobile stylesheet for shiny theme. 2010-10-19 12:27:50 -04:00
Samantha Doherty e5ae754020 Big updates for themes rebase, clean, and shiny. A few more adjustments to come for 0.9.6, time (probably not) permitting. 2010-10-19 11:07:53 -04:00
Brion Vibber 6c959c83ce Merge branch '0.9.x' into 1.0.x 2010-10-07 13:32:26 -07:00
Samantha Doherty 1ad8c67843 A few quick theme fixes, mostly for IE. Full update to follow. 2010-10-06 16:30:43 -04:00
Brion Vibber 8ff45823ba Merge branch '0.9.x' into 1.0.x 2010-10-05 11:40:49 -07:00
Brion Vibber 0aa9f08dd2 Victorian theme by Michael R. Bernstein
Includes Linux Libertine font, used under SIL Open Font License.
2010-10-05 11:27:05 -07:00
Brion Vibber f6d3118576 mnml theme by Michael R. Bernstein
Includes TeX Gyre Heros font, used under GUST Font License
2010-10-05 11:24:24 -07:00
Brion Vibber 59119482ca Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php
2010-10-04 12:54:36 -07:00
Samantha Doherty a2bfcc9734 Provisional versions of two new themes (plus new base). 2010-09-23 10:50:45 -04:00
Samantha Doherty 5f409a0d7c Cloudy theme fixes: show notice form only on appropriate pages; IE fix for top padding. 2010-09-22 22:41:17 -04:00
Evan Prodromou 86a702953a Merge branch '0.9.x' into 1.0.x 2010-09-06 10:12:17 -04:00
Evan Prodromou db5d7e0167 add CC BY 3.0 license to CSS files 2010-09-02 23:16:29 -04:00
Brion Vibber 6f540f963b Switch default, identica themes from @import to theme.ini include key; doesn't make much difference for internal core themes but it'll provide cut-n-pasters with a better example. :) 2010-09-02 15:06:47 -07:00
Brion Vibber 3040a5ff85 Quick fix for IE7 via sammy: remove redundant media specifiers from base style @import in main themes.
The <link>s already specify screen/etc media, so all it was doing was breaking. There are still some issues, but most things seem to work-ish as long as Realtime plugins are off.
2010-07-22 05:22:09 +00: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 518551bf70 Fix for processing indicator for aside 2010-03-25 17:33:59 +01:00
Sarven Capadisli 1089c0e23c Updated biz theme to use realtime icons from core 2010-03-25 15:08:00 +01:00
Sarven Capadisli 97e83112d2 A lot of updates to keep the themes current (at least in functionality) 2010-03-24 23:31:30 +01:00
Sarven Capadisli 2c50d4aa44 location -> label class for cloudy 2010-03-24 22:40:59 +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 0a6b30552d Minor core alignment for cloudy 2010-03-22 14:14:07 +01:00
Sarven Capadisli aaec5345f6 Updated logos 2010-03-22 14:07:59 +01:00
Sarven Capadisli 029eea21ec Removed box-shadow and outline on notice more link focus 2010-03-19 22:26:50 +01:00
Sarven Capadisli f23fc93a43 Using opacity on the notice more link icon 2010-03-19 19:06:54 +01:00
Sarven Capadisli 41633fcd47 Minor margin to more link 2010-03-19 18:35:40 +01:00
Brion Vibber c33a7ddb5e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-19 10:27:47 -07:00
Sarven Capadisli c320b29c10 Updated biz theme logo 2010-03-19 10:06:06 +01:00