aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-8/+5
|\ | | | | | | | | Conflicts: mod/connedit.php
| * css fixesMario Vavti2015-07-141-5/+1
| |
| * cleanup conneditMario Vavti2015-07-141-8/+9
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-111-16/+6
|\|
| * fix issue with profile photoMario Vavti2015-07-111-6/+6
| |
| * more revertMario Vavti2015-07-111-5/+0
| |
| * revert moving section and aside padding to style.css - it brings trouble to ↵Mario Vavti2015-07-111-5/+0
| | | | | | | | other layouts
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-105-26/+41
|\| | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * css fixesMario Vavti2015-07-101-2/+8
| |
| * do not change selected/active class color on hoverMario Vavti2015-07-101-1/+10
| |
| * re-enable selected/active classMario Vavti2015-07-101-4/+3
| |
| * add generic content wrapper to post/webpage editor and make editpost render ↵Mario Vavti2015-07-101-2/+2
| | | | | | | | correctly
| * schema focus: refine content width to be more in balance with the recent ↵Mario Vavti2015-07-101-1/+1
| | | | | | | | aside width
| * move section and aside padding from default.css to style.cssMario Vavti2015-07-103-6/+5
| |
| * fix vcard title spacingMario Vavti2015-07-091-1/+2
| |
| * fix aside width for collapsed stateMario Vavti2015-07-092-2/+2
| |
| * move profile image up and refine the aside widthMario Vavti2015-07-093-7/+8
| |
| * remove paddingMario Vavti2015-07-091-1/+0
| |
| * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-093-5/+6
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-073-6/+7
|\|
| * schema focus: adjust width to match photo width in /photosMario Vavti2015-07-071-1/+1
| |
| * various css fixesMario Vavti2015-07-072-5/+4
| |
| * more word wrap fixesMario Vavti2015-07-071-0/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-051-1/+1
|\|
| * schema focus: adjust default widthMario Vavti2015-07-051-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-291-1/+5
|\| | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * Update NL + 1 revert css, see comment here: ↵jeroenpraat2015-06-301-1/+0
| | | | | | | | https://github.com/redmatrix/redmatrix/commit/22b9e97ae2e46513c7a43cb27e7230bc5c40b9d4
| * Probably a ugly hack, but it's the only way I could found that cuts off very ↵jeroenpraat2015-06-291-0/+5
| | | | | | | | long channel names in the admin area. If there's a better alternative, be my guest.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-281-1/+6
|\| | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-281-1/+5
| |\
| | * css fixesMario Vavti2015-06-271-1/+5
| | |
| * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵redmatrix2015-06-281-0/+1
| |/ | | | | | | still pretty cool.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-242-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 Vavti2015-06-242-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/redmatrixredmatrix2015-06-213-5/+16
|\| | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * do not show default in scheme selection dropdown. default.php and ↵Mario Vavti2015-06-212-2/+5
| | | | | | | | default.css should be symlinks. adjust doco accordingly.
| * more generic-content-wrapper and some css fixesMario Vavti2015-06-191-3/+11
| |
* | more work on itemsredmatrix2015-06-113-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 setMario Vavti2015-06-113-4/+15
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-102-6/+15
|\|
| * assign right aside the same width as we have in left aside but hide it on ↵Mario Vavti2015-06-102-6/+15
| | | | | | | | small and xs screens. make aside width a variablee for easier handling.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-091-0/+12
|\| | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
| * css regression fixesMario Vavti2015-06-081-0/+12
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-0610-790/+616
|\| | | | | | | | | Conflicts: util/messages.po
| * missing commaMario Vavti2015-06-061-1/+1
| |
| * css fixesMario Vavti2015-06-061-17/+9
| |
| * whitespaceMario Vavti2015-06-061-169/+175
| |
| * some cleanup after scheme transitionMario Vavti2015-06-062-196/+19
| |
| * More schemas in new formatjeroenpraat2015-06-054-119/+114
| |
| * Schemas: should be ok now.jeroenpraat2015-06-037-342/+116
| |