nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16347 commits 4 branches 0 tags 121 MiB
Commit graph

737 commits

Author SHA1 Message Date
flaburgan
ef977a170f Replace Make Something text by the diaspora ball logo on registration page 
Add ball.svg to /graphics
 2015-03-26 00:32:41 +01:00
Steffen van Bergerem
4d6c513b8e Refactor post content css, fix margin-bottom for lists in comments 2015-03-22 02:19:36 +01:00
Steffen van Bergerem
50c187537d Merge pull request #5721 from sam09/fixissue5626 
Added margin top to lists. Fixes issue #5626
 2015-03-22 00:38:51 +01:00
Sam Radhakrishnan
af410ef4e5 Added margin top to lists. Fixes issue5626 2015-03-22 02:43:01 +05:30
Steffen van Bergerem
4a7781f1e7 Unify invite code and contacts page link style 2015-03-19 02:46:25 +01:00
Steffen van Bergerem
e7ec3d495f Refactor and improve sidebar css 2015-03-16 02:03:53 +01:00
Jonne Haß
25e80fddc8 Merge pull request #5781 from svbergerem/various-style-fixes 
Various style fixes
 2015-03-15 04:20:47 +01:00
Steffen van Bergerem
caf7470e8e Various style fixes 2015-03-15 01:58:29 +01:00
Steffen van Bergerem
ca087d6b26 Conversations: Add rounded corners to participants count and improve readability 2015-03-14 18:16:21 +01:00
Lisa Passing
a11322fd5d make css nicer 
update Changelog

remove weird merge thing

think of the padding and margin
 2015-03-14 17:00:14 +01:00
Christophe
e2a591249a Replace JQuery slide with transition 
Conflicts:
	app/assets/javascripts/inbox.js
	app/assets/stylesheets/conversations.css.scss
 2015-03-14 14:30:59 +01:00
Jonne Haß
2c2b47eae2 Merge pull request #5769 from svbergerem/remove-unused-css 
Remove unused css and reduce blockquote font-size
 2015-03-13 10:44:44 +01:00
Steffen van Bergerem
6dc18ac317 Reduce blockquote font-size 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
SansPseudoFix
8dd8daf37e Change overflow-x to overflow for long tag button 2015-03-12 23:46:15 +01:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls 
Use entypo for control icons
 2015-03-12 19:29:40 +01:00
Steffen van Bergerem
af9d6ddab3 Use handlebars helpers wherever possible 2015-03-12 16:20:32 +01:00
Marcelo Briones
7be56849d9 DRY on avatars 2015-03-12 09:52:36 -03:00
goobertron
b04a2638a5 Add box shadow and radius to avatars 2015-03-12 09:52:36 -03:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Steffen van Bergerem
e99fe86ca0 Merge pull request #5752 from SansPseudoFix/fix-tag-button-overflow 
fix tag button overflow
 2015-03-12 10:43:56 +01:00
SansPseudoFix
26ad537a18 fix tag button overflow 
fix tag button overflow

	modified:   app/assets/stylesheets/tag.scss
	modified:   app/assets/templates/tag_following_action_tpl.jst.hbs
 2015-03-12 00:28:31 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Steffen van Bergerem
be175e969e Fix mobile sign up with invitation 2015-03-11 10:52:42 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Jonne Haß
add6dd3c50 Merge pull request #5749 from svbergerem/char-counter-fix 
Publisher: fix services char counter
 2015-03-10 17:43:32 +01:00
SansPseudoFix
6cf509454c fix overflow blockquote stream 
change word-break to wrap-wrap

	modified:   app/assets/stylesheets/stream_element.scss

remove useless word-wrap

global prevent for overflow

global overflow fix

Remove useless word-wrap

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/assets/stylesheets/new_styles/_base.scss
	modified:   app/assets/stylesheets/new_styles/_code.scss
	modified:   app/assets/stylesheets/single-post-view.scss
	modified:   app/assets/stylesheets/stream_element.scss

indent
 2015-03-09 23:59:52 +01:00
Steffen van Bergerem
1b2b10877a Fix services char counter 2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
9d6fc0a671 Merge pull request #5744 from Flaburgan/conversation-design 
Fix conversaton publisher trailing border
 2015-03-08 22:49:44 +01:00
flaburgan
ab4467954b Fix conversaton publisher border 2015-03-08 21:59:23 +01:00
Steffen van Bergerem
49894ec05d Merge pull request #5740 from jhass/publisher_margin 
Reduce gap between publisher and stream
 2015-03-08 16:08:51 +01:00
Jonne Haß
e6444cea67 Reduce gap between publisher and stream [ci skip] 2015-03-08 14:27:07 +01:00
Jonne Haß
00817c8583 Merge pull request #5728 from SansPseudoFix/5716-focus-link-color-bootstrap-header 
Fix #5716 focus header link color
 2015-03-06 23:44:03 +01:00
Steffen van Bergerem
b083560266 Improve Bootstrap stream style 2015-03-06 21:59:36 +01:00
Steffen van Bergerem
96fcae3532 Remove unused (vendor) css 2015-03-06 07:58:13 +01:00
Steffen van Bergerem
0f9ba4885c Import chat.scss and change container to container-fluid 2015-03-06 01:18:37 +01:00
SansPseudoFix
53ac63cafa refactoring - grey link with dark grey dots for focus 2015-03-04 23:46:52 +01:00
SansPseudoFix
f8b69ae7d7 grey link with black grey dots border 2015-03-04 18:35:59 +01:00
SansPseudoFix
2b29bfe403 focus link grey with grey dots 2015-03-04 15:00:39 +01:00
SansPseudoFix
330ae471f1 Fix #5716 focus header link color 2015-03-04 11:03:44 +01:00
Augier
5be2fbafab Changed color border on active text" 2015-03-03 21:18:53 +01:00
Steffen van Bergerem
0c7d319fdc Remove unused css files 2015-03-02 00:04:58 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Pablo Cuadrado
3721861c94 border on the left of the stream and profile header 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
b0a8ecf8be margin 0 was messing up the left bar 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
c402c65f56 unprefixing opacity 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
52fef10bea lame BR removed 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
84739a86d1 invite code box fix 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
9cbc09316d text shadow made the buttons look blurry 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +01:00
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cb99ad9e68 left bar styles adjusted 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
e48679affe removing a missing mixing, using row instead of row-fluid 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
c4fda4b563 main_stream ported, no further styling applied 2015-03-01 12:04:51 +01:00
Dennis Schubert
ab4e04e8c4 Don't specify file extensions in SCSS imports 2015-02-28 05:04:39 +01:00
Jonne Haß
c96834bdf2 Remove .css extension from SCSS files 
sass-rails 5.0 deprecated those
 2015-02-28 03:37:46 +01:00
Jonne Haß
e8440bb25f Merge pull request #5683 from svbergerem/mobile-fix-style-more 
Mobile: fix style of 'more' button
 2015-02-27 15:53:36 +01:00
Jonne Haß
be1ab6c6a3 Merge branch 'collimarco-issue5350' into develop 2015-02-27 15:33:55 +01:00
Jonne Haß
073e99992e Some fixes to participation controls 
* prevent default event in JS handlers to prevent jumping back to the
  top.
* Use js-routes
* Use sprite for icons
* Reply with 200 instead of 204 when destroying a participation,
  to prevent errors in the browser console.
 2015-02-27 15:31:30 +01:00
Augier
168adae009 Adding help section for chat 2015-02-26 18:06:39 +01:00
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
Steffen van Bergerem
b3558d0db1 Fix captcha and box-shadow 2015-02-18 22:45:46 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
flaburgan
44649e9167 Unify not connected pages 2015-02-18 22:45:46 +01:00
Steffen van Bergerem
06ab4d0514 Mobile: fix style of 'more' button 2015-02-18 20:41:01 +01:00
Steffen van Bergerem
7d485ce6a6 Add opacity transition for post controls 2015-02-18 18:16:10 +01:00
SansPseudoFix
0c49219ca7 Global prevent for overflow in mobile view 2015-02-17 13:00:39 +01:00
Steffen van Bergerem
d1dfd7c1cd Style improvements for the year on the notifications page 2015-02-16 21:45:39 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Steffen van Bergerem
4da6b075ad Bootstrap stream: fix interaction buttons 2015-02-16 06:23:34 +01:00
Steffen van Bergerem
f1836580db Bootstrap stream: add spinner and improve comment box 2015-02-16 04:56:35 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails 
profile photos as thumbnails
 2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Faldrian
32ca5cc16d removed css-spill on reshare link in stream 2015-02-08 17:24:16 +01:00
Faldrian
db6464ed61 Fixed moderation-button-position when viewing reshare 2015-02-03 00:24:26 +01:00
Marco Colli
eccab62e32 Allow user to enable / disable notifications for a post from stream #5350 2015-01-25 18:40:47 +01:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
SansPseudoFix
7e9525740b fix #5568 - overflow json exporter 2015-01-21 17:54:59 +01:00
Dumitru Ursu
36b66624e2 Invert gradient 2015-01-09 17:13:35 +02:00
Dumitru Ursu
80b4cb90ef Use the standard syntax for gradient 2015-01-09 16:49:26 +02:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
Steffen van Bergerem
a5068259bb Improve wording for tagged people on tag page 2014-12-15 18:08:53 +01:00
Steffen van Bergerem
7c775208b1 Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile 
Fix code overflow spv and profile
 2014-12-02 22:44:08 +01:00
SansPseudoFix
6d681f8306 Fix code overflow 
new file:   app/assets/stylesheets/new_styles/_code.scss
 2014-12-02 16:51:50 +01:00
Steffen van Bergerem
d742f23cd5 Content shouldn't exceed the profile sidebar 2014-12-02 02:03:15 +01:00
Steffen van Bergerem
4cc1b40443 Only remove photos from view when destroyed on server 2014-12-01 00:36:56 +01:00
Steffen van Bergerem
b275b2edbc Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden 
A temporary fix for mention modal #5329
 2014-11-30 13:48:24 +01:00
SansPseudoFix
90b9f227d8 A temporary fix for mention modal #5329 
A temporary fix for mention modal #5329

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss
 2014-11-29 17:36:46 +01:00
Jonne Haß
544501a0e6 Merge pull request #5418 from svbergerem/publisher-counter-style-fix 
Fix character count placement for publisher
 2014-11-29 16:11:45 +01:00
SansPseudoFix
322ca4dac0 display handle for search bar 
fix margin and color

hidden overflow for long handle and names

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss

add min width 300px

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss
 2014-11-24 13:17:57 +01:00
Steffen van Bergerem
8cb6e242bf Fix character count placement for publisher 2014-11-23 18:36:05 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00