Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 1 | -1/+5 | |
| |\ | ||||||
| | * | css fixes | Mario Vavti | 2015-06-27 | 1 | -1/+5 | |
| | | | ||||||
| * | | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -0/+1 | |
| |/ | | | | | | | still pretty cool. | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 2 | -0/+92 | |
|\| | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | |||||
| * | Add a new redbasic scheme called focus - It is supposed to focus on the main ↵ | Mario Vavti | 2015-06-24 | 2 | -0/+92 | |
| | | | | | | | | 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. | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 3 | -5/+16 | |
|\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | |||||
| * | do not show default in scheme selection dropdown. default.php and ↵ | Mario Vavti | 2015-06-21 | 2 | -2/+5 | |
| | | | | | | | | default.css should be symlinks. adjust doco accordingly. | |||||
| * | more generic-content-wrapper and some css fixes | Mario Vavti | 2015-06-19 | 1 | -3/+11 | |
| | | ||||||
* | | more work on items | redmatrix | 2015-06-11 | 3 | -4/+15 | |
|\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | |||||
| * | set width for region_3 only if center page content is set | Mario Vavti | 2015-06-11 | 3 | -4/+15 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 2 | -6/+15 | |
|\| | ||||||
| * | assign right aside the same width as we have in left aside but hide it on ↵ | Mario Vavti | 2015-06-10 | 2 | -6/+15 | |
| | | | | | | | | small and xs screens. make aside width a variablee for easier handling. | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -0/+12 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | |||||
| * | css regression fixes | Mario Vavti | 2015-06-08 | 1 | -0/+12 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-06 | 10 | -790/+616 | |
|\| | | | | | | | | | Conflicts: util/messages.po | |||||
| * | missing comma | Mario Vavti | 2015-06-06 | 1 | -1/+1 | |
| | | ||||||
| * | css fixes | Mario Vavti | 2015-06-06 | 1 | -17/+9 | |
| | | ||||||
| * | whitespace | Mario Vavti | 2015-06-06 | 1 | -169/+175 | |
| | | ||||||
| * | some cleanup after scheme transition | Mario Vavti | 2015-06-06 | 2 | -196/+19 | |
| | | ||||||
| * | More schemas in new format | jeroenpraat | 2015-06-05 | 4 | -119/+114 | |
| | | ||||||
| * | Schemas: should be ok now. | jeroenpraat | 2015-06-03 | 7 | -342/+116 | |
| | | ||||||
| * | 2 more schemas in new format | jeroenpraat | 2015-06-03 | 4 | -239/+473 | |
| | | ||||||
| * | empty php schema back | jeroenpraat | 2015-06-03 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 2 | -123/+237 | |
|\| | ||||||
| * | First schema completely to the new format. git-marijus: Can you please ↵ | jeroenpraat | 2015-06-02 | 2 | -123/+237 | |
| | | | | | | | | quickly check if I'm doing it right? | |||||
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-07 | 1 | -2/+2 | |
|\| | ||||||
| * | adjust icon size | Mario Vavti | 2015-05-07 | 1 | -2/+2 | |
| | | ||||||
* | | second pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 | |
| | | ||||||
* | | first pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 | |
|/ | ||||||
* | fix center page content setting | Mario Vavti | 2015-05-04 | 1 | -1/+2 | |
| | ||||||
* | webpages layout fixes | Mario Vavti | 2015-04-24 | 1 | -0/+1 | |
| | ||||||
* | webpages blocks fixes | Mario Vavti | 2015-04-23 | 1 | -0/+1 | |
| | ||||||
* | move .lockview to style.css and a typo | Mario Vavti | 2015-04-21 | 1 | -1/+5 | |
| | ||||||
* | rework and hopefully improve webpage menu creation workflow | Mario Vavti | 2015-04-21 | 1 | -3/+3 | |
| | ||||||
* | css fix | Mario Vavti | 2015-04-18 | 1 | -1/+1 | |
| | ||||||
* | fix page-title margin | Mario Vavti | 2015-04-18 | 1 | -0/+4 | |
| | ||||||
* | adjus webpage font size to match conv item font size | Mario Vavti | 2015-04-17 | 1 | -1/+2 | |
| | ||||||
* | allow jot to be displayed expanded, remove deprected datetimepicker js and ↵ | Mario Vavti | 2015-04-17 | 1 | -6/+10 | |
| | | | | some random fixes | |||||
* | wording and css fixes | Mario Vavti | 2015-04-16 | 1 | -3/+2 | |
| | ||||||
* | webpages appearence | Mario Vavti | 2015-04-13 | 1 | -1/+6 | |
| | ||||||
* | add bs classes to design tools menu | Mario Vavti | 2015-04-13 | 1 | -22/+0 | |
| | ||||||
* | move style to style.css | Mario Vavti | 2015-04-10 | 1 | -0/+6 | |
| | ||||||
* | make search box border radius consistent with everything else. It looks ↵ | friendica | 2015-03-31 | 1 | -1/+1 | |
| | | | | really weird when it's so different. | |||||
* | Make sure long words (channel addresses, homepages) on the vcard are not on ↵ | jeroenpraat | 2015-03-29 | 1 | -0/+1 | |
| | | | | top of the content to the right. | |||||
* | some colorbox styling | Mario Vavti | 2015-03-27 | 1 | -5/+11 | |
| | ||||||
* | Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it ↵ | Mario Vavti | 2015-03-27 | 3 | -8/+15 | |
| | | | | there). Comment out some most probably deprecated js includes. Some css cleanup. | |||||
* | adjust category auto-complete background color (blue) to match the blue we ↵ | friendica | 2015-03-26 | 1 | -0/+3 | |
| | | | | use for buttons. It was a completely unrelated shade of blue and looked out of place. | |||||
* | remove some vars from style.css | Mario Vavti | 2015-03-26 | 10 | -136/+146 | |
| | ||||||
* | remove unused vars | Mario Vavti | 2015-03-20 | 1 | -2/+0 | |
| | ||||||
* | remove more $vars from style.css | Mario Vavti | 2015-03-20 | 10 | -189/+276 | |
| |