Commit Graph

5007 Commits

Author SHA1 Message Date
Mario Vavti
138e0fe445 fix issue with profile photo 2015-07-11 13:25:06 +02:00
Mario Vavti
d3581d8562 more revert 2015-07-11 12:52:06 +02:00
Mario Vavti
d8e7f36c74 revert moving section and aside padding to style.css - it brings trouble to other layouts 2015-07-11 12:42:11 +02:00
Mario Vavti
d592d911c5 add css file for mod display 2015-07-11 12:05:39 +02:00
redmatrix
a497d8ee66 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php
2015-07-10 14:27:41 -07:00
jeroenpraat
115097f139 update Dutch strings 2015-07-10 21:46:19 +02:00
Mario Vavti
071a233fb8 css fixes 2015-07-10 13:44:23 +02:00
Mario Vavti
39d68bf7c7 do not change selected/active class color on hover 2015-07-10 13:34:36 +02:00
Mario Vavti
ebb07de788 re-enable selected/active class 2015-07-10 13:25:50 +02:00
Mario Vavti
fee607db56 more webpages - generic-content-wrapper fixes 2015-07-10 13:16:45 +02:00
Mario Vavti
1554b5a2ee add generic content wrapper to post/webpage editor and make editpost render correctly 2015-07-10 12:46:20 +02:00
Mario Vavti
7eb614c8aa schema focus: refine content width to be more in balance with the recent aside width 2015-07-10 11:15:05 +02:00
Mario Vavti
e1f64b6748 move section and aside padding from default.css to style.css 2015-07-10 10:09:54 +02:00
Mario Vavti
2b9a480c2f fix vcard title spacing 2015-07-09 22:23:24 +02:00
Mario Vavti
08996e5b9b fix aside width for collapsed state 2015-07-09 20:54:13 +02:00
Mario Vavti
115c18353e move profile image up and refine the aside width 2015-07-09 14:44:24 +02:00
Mario Vavti
59cddef032 remove padding 2015-07-09 14:05:35 +02:00
Mario Vavti
efa55437d4 increase width of the aside area and make default profile image size 300x300 2015-07-09 13:59:16 +02:00
redmatrix
6b41074396 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-07 16:50:25 -07:00
Mario Vavti
f6cf992aee fix sorting of channel suggestions 2015-07-07 22:48:01 +02:00
Mario Vavti
f67d9d59af rename function get_directory_settings => get_directory_setting and move sort options to directory title bar 2015-07-07 22:29:27 +02:00
Mario Vavti
18798b1d12 schema focus: adjust width to match photo width in /photos 2015-07-07 12:23:19 +02:00
Mario Vavti
adfb4072e8 various css fixes 2015-07-07 12:13:15 +02:00
Mario Vavti
2d0d5876ba more word wrap fixes 2015-07-07 10:23:39 +02:00
Mario Vavti
807471d2a5 move if clause outside of the div 2015-07-07 09:56:30 +02:00
Mario Vavti
ee01e67fa7 use default style for default webpage 2015-07-07 09:41:27 +02:00
redmatrix
1b3e046cd2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-06 17:54:29 -07:00
Mario Vavti
05b231b087 fix word wrapping in tagblock and dirtagblock and possibly other places 2015-07-06 10:36:57 +02:00
redmatrix
8fad0187ec Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-07-05 21:38:21 -07:00
Mario Vavti
2011784faf schema focus: adjust default width 2015-07-05 22:37:52 +02:00
Paolo Tacconi
7d4615e319 Updated Italian localization 2015-07-03 12:01:30 +02:00
redmatrix
1a5898bf80 sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
2015-07-02 21:58:28 -07:00
Mario Vavti
f54688a547 since we can now use plain upstream justifiedGallery library - switch to minified version 2015-07-01 11:42:17 +02:00
Mario Vavti
9c4e9f8759 update justifiedGallery to versio 3.6.0 2015-07-01 11:34:36 +02:00
redmatrix
97e8275dc2 Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-29 22:19:44 -07:00
redmatrix
0b347ccc14 turn the connection filter into a feature. 2015-06-29 20:35:56 -07:00
redmatrix
6e8ad5089e Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
2015-06-29 18:01:51 -07:00
jeroenpraat
aad8fc1946 Update NL + 1 revert css, see comment here: 22b9e97ae2 2015-06-30 00:26:16 +02:00
jeroenpraat
abb153e711 Probably a ugly hack, but it's the only way I could found that cuts off very long channel names in the admin area. If there's a better alternative, be my guest. 2015-06-29 23:09:36 +02:00
Mario Vavti
7ef4397634 fix directory location 2015-06-29 14:25:04 +02:00
redmatrix
63f2e9b412 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	include/zot.php
	mod/connedit.php
	util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
090dae46e5 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-06-28 21:19:28 -07:00
redmatrix
de13497333 no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool. 2015-06-28 21:16:56 -07:00
Mario Vavti
22b9e97ae2 css fixes 2015-06-27 22:27:17 +02:00
redmatrix
b06b6f798f localise event calendar 2015-06-25 18:23:48 -07:00
Mario Vavti
9406c5a55c Merge branch 'master' of https://github.com/redmatrix/redmatrix 2015-06-25 12:54:42 +02:00
redmatrix
5f3edabd45 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	doc/de/features.bb
	view/de/messages.po
	view/de/strings.php
2015-06-24 16:34:52 -07:00
Mario Vavti
e9cc06dc11 directory: only provide connect button if we are not already connected 2015-06-24 21:12:20 +02:00
zottel
50de9325b6 update to German strings 2015-06-24 16:53:46 +02:00
Mario Vavti
05c7022ff8 Add a new redbasic scheme called focus - It is supposed to focus on the main content by adding a slight shadow and centering the main content on the screen. Also the default width of the content is set to 640px. 2015-06-24 13:05:33 +02:00