This repository has been archived on 2024-08-19. You can view files and clone it, but cannot push or open issues or pull requests.

Haakon Meland Eriksen 17907f11a3 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	include/datetime.php
	include/text.php
	mod/events.php
	version.inc
	view/css/mod_events.css
	view/theme/redbasic/css/style.css
	view/tpl/event_head.tpl
	view/tpl/events-js.tpl
	view/tpl/jot.tpl

2015-11-28 16:26:24 +01:00

..

bootstrap-red.css

css fixes

2015-11-27 21:44:02 +01:00

choklet_bannertwo.css

css fixes

2015-09-18 13:07:04 +02:00

choklet_edgesthree.css

css fixes

2015-09-18 13:07:04 +02:00

choklet_edgestwo.css

css fixes

2015-09-18 13:07:04 +02:00

choklet_full.css

css fixes

2015-09-18 13:07:04 +02:00

choklet_three.css

css fixes

2015-09-18 13:07:04 +02:00

choklet.css

css fixes

2015-09-18 13:07:04 +02:00

colorbox.css

bring some styling back to the colorbox and improve the event preview ability

2015-02-09 18:58:43 -08:00

conversation.css

Removed my version of jot.tpl

2015-11-28 16:23:17 +01:00

custom_tinymce.css

major theme re-org, only duepuntozero and slackr working atm

2012-08-01 05:02:43 -07:00

default.css

css fixes

2015-09-18 13:07:04 +02:00

full.css

css fixes

2015-09-18 13:07:04 +02:00

mod_admin.css

commit 631eb4b broke the checkboxes in admin/site, so separate normal checkboxes from bulk edit checkboxes in the css

2015-08-17 16:11:10 -07:00

mod_apps.css

more adjustment to apps containers

2015-09-02 21:46:19 -07:00

mod_blocks.css

css fixes

2015-04-24 22:51:59 +02:00

mod_chat.css

Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.

2015-11-04 22:52:40 +01:00

mod_cloud.css

css fixes

2014-12-30 12:12:55 +01:00

mod_connect.css

Reworked switch to also display text

2015-01-02 18:14:23 +01:00

mod_connections.css

Fixed connection page. Page was overcrowded on systems with larger fonts.

2015-10-26 13:57:12 +01:00

mod_connedit.css

cleanup connedit

2015-07-14 12:46:40 +02:00

mod_directory.css

fix an issue with collapseHeight() and css margins/paddings in directory

2015-10-11 22:49:36 +02:00

mod_display.css

add css file for mod display

2015-07-11 12:05:39 +02:00

mod_events.css

Merge remote-tracking branch 'upstream/master'

2015-11-28 16:26:24 +01:00

mod_filestorage.css

missing permissions block in mod_filestorage

2014-04-30 16:35:50 -07:00

mod_group.css

group/collection edit page cleanup

2015-03-03 14:38:34 -08:00

mod_import.css

dang - this is almost testable. Still have to figure out the best way to deal with the profile photo. Otherwise if you're really brave you could give it a go and see what happens. The worst that could happen is that it destroys the universe. Not a big deal. More likely you could end up with a bunch of imported things that have to be cleaned up. Less likely but entirely possible is that nothing useful will happen at all and it'll white screen.

2013-02-19 19:08:04 -08:00

mod_layouts.css

Provide webpage layout description

2015-04-25 22:35:24 +02:00

mod_locs.css

crude skeleton for location manager and the UI sucks but at least it's on a webpage and you don't have to do it by hand.

2014-11-05 18:39:10 -08:00

mod_mail.css

private mail compositor changes

2015-10-02 17:51:37 +02:00

mod_manage.css

regression: need float clear on manage page so footer doesn't end up floated,

2015-01-05 20:57:30 -08:00

mod_menu.css

some fixes to make menu sharing work and expose it in the ui.

2015-05-29 13:08:01 +02:00

mod_message.css

porting more widgets to bs nav-pills

2014-10-07 18:11:36 +02:00

mod_mitem.css

rework and hopefully improve webpage menu creation workflow

2015-04-21 10:05:26 +02:00

mod_new_channel.css

provide link to help for channel permission roles when creating a channel

2014-12-19 01:48:47 -08:00

mod_page.css

missed adding these files yesterday, they're needed for pages to work

2013-01-15 13:59:52 -08:00

mod_photos.css

another try to avoid dubble photo deletion. allow to set a photo caption and simple status body (if create status post is enabled) on upload

2015-10-24 21:44:25 +02:00

mod_profile_photo.css

add mod_profile_photo.css

2012-12-19 16:59:45 -08:00

mod_profile.css

move profile css to mod_profile and minoor fixes

2014-12-11 11:44:46 +01:00

mod_profiles.css

Some more buttons. Not ready yet. Changed in private message -submit- to -send-. Confusing in other language(s).

2014-08-09 01:18:31 +00:00

mod_pubsites.css

minor adjustments

2014-07-01 22:02:36 -07:00

mod_rate.css

remote rating and addition of rate-me to channel profile sidebar

2015-02-04 17:32:29 -08:00

mod_ratings.css

increase size of rating value to make it stand out a bit.

2015-02-05 15:11:51 -08:00

mod_register.css

and add a border for delineation

2013-12-25 16:57:48 -08:00

mod_settings.css

Firefox share (that seems now the official name) button added to misc. settings.

2015-11-05 16:20:56 +01:00

mod_setup.css

wee bit of css cleanup

2013-08-06 18:26:57 -07:00

mod_sharedwithme.css

indicate new or updated items

2015-03-23 10:59:54 +01:00

mod_thing.css

Reworked switch to also display text

2015-01-02 18:14:23 +01:00

mod_viewconnections.css

some anomolies found when viewing connections in various cases.

2014-03-02 19:40:59 -08:00

mod_webpages.css

css fixes

2015-04-24 22:51:59 +02:00

redable.css

As talked about earlier: set body font size to 0.8rem and post/comment font size to 1.0rem. This respects the user's browser font settings. Please comment if this changes the font sizes to much. There are some other font sizes that need to be changed to a scalable size (like btn-xs), but they don't have a priority. First see if this works. - Also made it possible for users to zoom on smart devices. - Small update to Redable. Aside is now disabled on almost all tablets in portrait mode.

2014-07-29 19:09:07 +00:00

widgets.css

Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.

2015-11-04 22:52:40 +01:00