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 |
|
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
|
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
|
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 |
|
redmatrix
|
ae6612025d
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
util/messages.po
|
2015-06-21 20:51:07 -07:00 |
|
Mario Vavti
|
c1e0987b88
|
do not show default in scheme selection dropdown. default.php and default.css should be symlinks. adjust doco accordingly.
|
2015-06-21 17:53:44 +02:00 |
|
Mario Vavti
|
8b563951ff
|
more generic-content-wrapper and some css fixes
|
2015-06-19 15:49:06 +02:00 |
|
redmatrix
|
5733491ac8
|
more work on items
and
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
view/it/messages.po
view/it/strings.php
|
2015-06-11 17:56:56 -07:00 |
|
Mario Vavti
|
8c4b337918
|
set width for region_3 only if center page content is set
|
2015-06-11 13:07:45 +02:00 |
|
redmatrix
|
2128d5a256
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-10 15:47:23 -07:00 |
|
Mario Vavti
|
50ac9378e3
|
assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling.
|
2015-06-10 13:08:17 +02:00 |
|
redmatrix
|
03357481f7
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/home.php
mod/page.php
view/nl/messages.po
view/nl/strings.php
|
2015-06-09 16:52:00 -07:00 |
|
Mario Vavti
|
a6cedf0953
|
css regression fixes
|
2015-06-08 19:27:16 +02:00 |
|
redmatrix
|
ec1dcb8f2e
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
util/messages.po
|
2015-06-06 17:31:22 -07:00 |
|
Mario Vavti
|
f5e439236c
|
missing comma
|
2015-06-06 20:23:00 +02:00 |
|
Mario Vavti
|
2c52be8780
|
css fixes
|
2015-06-06 17:05:38 +02:00 |
|
Mario Vavti
|
d60c2b1621
|
whitespace
|
2015-06-06 15:51:15 +02:00 |
|
Mario Vavti
|
dff402293f
|
some cleanup after scheme transition
|
2015-06-06 15:06:27 +02:00 |
|
jeroenpraat
|
f51cfa6960
|
More schemas in new format
|
2015-06-05 21:15:21 +02:00 |
|
jeroenpraat
|
6e336d680d
|
Schemas: should be ok now.
|
2015-06-03 22:53:48 +02:00 |
|
jeroenpraat
|
03361acce5
|
2 more schemas in new format
|
2015-06-03 15:45:50 +02:00 |
|
jeroenpraat
|
76d7278c0a
|
empty php schema back
|
2015-06-03 13:57:10 +02:00 |
|
redmatrix
|
7cbc504874
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-06-02 17:47:47 -07:00 |
|
jeroenpraat
|
89fbd5c0f6
|
First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right?
|
2015-06-02 23:22:12 +02:00 |
|
redmatrix
|
37a63365f1
|
Merge branch 'master' of https://github.com/redmatrix/redmatrix
|
2015-05-07 16:44:28 -07:00 |
|
Mario Vavti
|
8ca10dcbab
|
adjust icon size
|
2015-05-07 10:35:22 +02:00 |
|
redmatrix
|
5b5f0666f9
|
second pass name change
|
2015-05-05 03:59:51 -07:00 |
|
redmatrix
|
a3c37f1458
|
first pass name change
|
2015-05-05 03:56:10 -07:00 |
|
Mario Vavti
|
08f799fff5
|
fix center page content setting
|
2015-05-04 15:58:49 +02:00 |
|
Mario Vavti
|
c6a75f407d
|
webpages layout fixes
|
2015-04-24 11:36:49 +02:00 |
|
Mario Vavti
|
c696860cc5
|
webpages blocks fixes
|
2015-04-23 21:04:01 +02:00 |
|
Mario Vavti
|
ba524e1a72
|
move .lockview to style.css and a typo
|
2015-04-21 23:27:30 +02:00 |
|
Mario Vavti
|
0bd9fe0b11
|
rework and hopefully improve webpage menu creation workflow
|
2015-04-21 10:05:26 +02:00 |
|
Mario Vavti
|
11b7fedd29
|
css fix
|
2015-04-18 16:23:14 +02:00 |
|
Mario Vavti
|
3ee78398aa
|
fix page-title margin
|
2015-04-18 13:32:40 +02:00 |
|
Mario Vavti
|
c02ff823f6
|
adjus webpage font size to match conv item font size
|
2015-04-17 13:53:09 +02:00 |
|
Mario Vavti
|
61e4ee753d
|
allow jot to be displayed expanded, remove deprected datetimepicker js and some random fixes
|
2015-04-17 11:20:22 +02:00 |
|
Mario Vavti
|
10cc643f65
|
wording and css fixes
|
2015-04-16 23:46:12 +02:00 |
|
Mario Vavti
|
865b602cf8
|
webpages appearence
|
2015-04-13 23:38:36 +02:00 |
|
Mario Vavti
|
05f018e509
|
add bs classes to design tools menu
|
2015-04-13 17:24:37 +02:00 |
|
Mario Vavti
|
8138373973
|
move style to style.css
|
2015-04-10 14:14:19 +02:00 |
|
friendica
|
68c1aac1e3
|
make search box border radius consistent with everything else. It looks really weird when it's so different.
|
2015-03-31 19:02:02 -07:00 |
|
jeroenpraat
|
d423c9b12c
|
Make sure long words (channel addresses, homepages) on the vcard are not on top of the content to the right.
|
2015-03-29 00:38:47 +01:00 |
|
Mario Vavti
|
2899c500ee
|
some colorbox styling
|
2015-03-27 12:12:12 +01:00 |
|
Mario Vavti
|
b59e2870ab
|
Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup.
|
2015-03-27 11:52:59 +01:00 |
|