aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
Commit message (Collapse)AuthorAgeFilesLines
* private mail compositor changesMario Vavti2015-10-021-29/+4
|
* private mail template and css fixesMario Vavti2015-10-021-12/+13
|
* private mail: some work on conversations viewMario Vavti2015-09-251-58/+12
|
* some heavy private mail restructuring - work in progressMario Vavti2015-09-241-0/+1
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-181-4/+7
|\ | | | | | | | | Conflicts: util/messages.po
| * fix calculation of content height with marginsMario Vavti2015-09-171-4/+7
| |
| * quick fix for choklet bannertwoMario Vavti2015-09-141-3/+5
| |
* | css fixesMario Vavti2015-09-188-1/+8
| |
* | quick fix for choklet bannertwoMario Vavti2015-09-141-3/+5
| |
* | fix banner for full flavourMario Vavti2015-09-131-4/+3
| |
* | hopefully fix banner for choklet flavourMario Vavti2015-09-135-22/+17
| |
* | an attempt to fix the banner messMario Vavti2015-09-121-4/+3
| |
* | center page content by defaultMario Vavti2015-09-111-1/+0
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-09-021-1/+11
|\|
| * more adjustment to apps containersredmatrix2015-09-021-2/+3
| |
| * sort out some app display weirdnessredmatrix2015-09-021-1/+10
| |
| * increase height of app-container so edit controls aren't shadowedredmatrix2015-09-021-1/+1
| |
* | increase width of tasklist input elementredmatrix2015-08-221-1/+5
| |
* | limit the height of tasklistredmatrix2015-08-201-0/+8
| |
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-171-1/+1
|\| | | | | | | | | Conflicts: view/nl/messages.po
| * commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵redmatrix2015-08-171-1/+1
| | | | | | | | checkboxes from bulk edit checkboxes in the css
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-08-161-1/+6
|\|
| * issue #386 - account and channel bulk edit checkboxes not visible and ↵redmatrix2015-08-161-1/+6
| | | | | | | | therefore not useable. Also change wording to remove the offensive 'user' designation.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-141-178/+8
|\| | | | | | | | | Conflicts: mod/connedit.php
| * cleanup conneditMario Vavti2015-07-141-178/+8
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-112-0/+17
|\|
| * revert moving section and aside padding to style.css - it brings trouble to ↵Mario Vavti2015-07-111-0/+14
| | | | | | | | other layouts
| * add css file for mod displayMario Vavti2015-07-111-0/+3
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-102-3/+2
|\| | | | | | | | | | | | | | | Conflicts: mod/editpost.php util/messages.po view/nl/messages.po view/nl/strings.php
| * move section and aside padding from default.css to style.cssMario Vavti2015-07-101-2/+1
| |
| * move profile image up and refine the aside widthMario Vavti2015-07-091-1/+1
| |
| * increase width of the aside area and make default profile image size 300x300Mario Vavti2015-07-091-1/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-071-4/+0
|\|
| * various css fixesMario Vavti2015-07-071-4/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-07-061-0/+4
|\|
| * fix word wrapping in tagblock and dirtagblock and possibly other placesMario Vavti2015-07-061-0/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-281-0/+2
|\| | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po
| * css fixesMario Vavti2015-06-271-0/+2
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-231-60/+13
|\| | | | | | | | | | | Conflicts: include/items.php mod/item.php
| * some work on directoryMario Vavti2015-06-231-60/+13
| |
* | more work on itemsredmatrix2015-06-111-2/+1
|\| | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
| * fix rendering of affinity sliderMario Vavti2015-06-111-2/+1
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-101-4/+2
|\|
| * assign right aside the same width as we have in left aside but hide it on ↵Mario Vavti2015-06-101-4/+2
| | | | | | | | small and xs screens. make aside width a variablee for easier handling.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-311-1/+14
|\|
| * some fixes to make menu sharing work and expose it in the ui.Mario Vavti2015-05-291-4/+4
| |
| * show created/edited dates for menusMario Vavti2015-05-291-1/+14
| |
* | Merge branch 'master' into tresredmatrix2015-05-142-7/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php
| * provide ability to create submenusMario Vavti2015-05-102-4/+5
| |
| * adjust icon sizeMario Vavti2015-05-071-3/+3
| |