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

784 commits

Author SHA1 Message Date
Steffen van Bergerem
cc58c66e3d Use media objects for mobile posts/comments/notifications 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
a3725599ef Use darker version creation-blue and creation-green for brand-primary and brand-success 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557 Refactor button colors 2015-06-04 18:05:44 +02:00
Augier
d7522d9498 corrected failing cuke and social buttons 2015-06-04 18:05:44 +02:00
theworldbright
5589dac108 Perform compositional styling to "getting started" 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
46abdbdd1f Style fixes for left navbar in notification view 2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8e9ceb9a2b Improve no message text and delete icon for conversations, fix regressions 2015-06-04 18:05:43 +02:00
Augier
0cbf581176 Better settings display 2015-06-04 18:05:43 +02:00
theworldbright
0e30c07903 Change line height to 20px for entypo form icons 2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8a004ee02a Overwrite Bootstrap variables and fix publisher 2015-06-04 18:05:43 +02:00
theworldbright
e372b4eb95 Remove some inline css and minor refactoring 2015-06-04 18:05:43 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
theworldbright
45a5e3d1c5 Change markdown-content hr style #5987 
The <hr> tag in the markdown-content was #eee,
and thus almost invisible. It has been changed to
$border-gray (currently #ddd) to be consistent
with the other <hr> tags.

Adjust markdown-content hr style further

The hr tag is now centered at 85% width. It also
adds a default vertical margin that is equivalent
to the 0.8em the paragraph tags provide.

Refactor scss for markdown-content hr

Closes #6016
 2015-05-31 20:39:55 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194 
closes #6005
 2015-05-29 11:41:57 +02:00
Benjamin Neff
604ffb445a optimized sprites 
- move mobile icons to mobile-folder, so they aren't included in the
  icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
  big other branding-images
- delete duplicate images

closes #6004
 2015-05-29 11:39:30 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip 
closes #5956
 2015-05-16 03:42:14 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Jonne Haß
59e8fc93a2 Merge pull request #5559 from SWW13/aspect_sort 
Readd aspect sorting
 2015-04-30 13:02:24 +02:00
Steffen van Bergerem
31bbfe8eab Merge pull request #5887 from szlend/5874-fix-bold-links 
Issue #5874 Fix styled links
 2015-04-30 11:05:24 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Simon Žlender
f5ce612299 Issue #5874 Fix styled links 2015-04-25 16:51:11 +02:00
Martin Artnik
283f22fc84 Fix unconventional image asset inclusion in css asset 2015-04-25 16:18:27 +02:00
Jonne Haß
9a9cf6f6a5 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:48:41 +02:00
Steffen van Bergerem
2d3c0680ea Fix uppercase registration/login labels and btn style 2015-04-21 20:48:30 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +02:00
Jonne Haß
d959dd725b Merge pull request #5850 from svbergerem/modal-for-new-aspect 
Use Bootstrap modal for new aspect form
 2015-04-20 22:34:51 +02:00
Jonne Haß
e996bd7e36 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:49:55 +02:00
Jonne Haß
6fe06f6d3c Merge pull request #5868 from SuperTux88/fix-service-icons 
fixed service-icons in sidebar
 2015-04-20 21:49:46 +02:00
Benjamin Neff
13a6b1389d fixed service-icons in sidebar 
recovered css from old application.scss

was removed in e188782a9a
 2015-04-20 21:49:36 +02:00
Jonne Haß
a06448447a Merge branch 'release/0.5.0.0-RC' into develop 2015-04-20 21:19:49 +02:00
Benjamin Neff
0211da4116 fix control icon alignment in chromium browser 2015-04-20 21:06:17 +02:00
Steffen van Bergerem
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
SansPseudoFix
5b90e1a060 Fix tag overflow mobile page 
modified:   app/assets/stylesheets/mobile/mobile.scss

	modified:   app/assets/stylesheets/mobile/mobile.scss
 2015-04-01 14:55:45 +02:00
Steffen van Bergerem
cb04e40de7 Remove border from conversation stream 2015-04-01 01:03:15 +02:00
Jonne Haß
e274470d55 Replace default.html with a regular view 
So we can correctly reference the images
 2015-03-28 23:12:07 +01:00
Dennis Schubert
61c2fbf5ef Merge pull request #5817 from jhass/generated_error_pages 
Generate error pages on assets:precompile
 2015-03-28 21:46:35 +01:00
Jonne Haß
e7d0a978ba Generate error pages on assets:precompile 
This allows us to reuse any CSS we have, unify
their look and unify their look with the regular
page design.

This works by instantiating ActionView and rendering
templates in a rake task.

Inspired by the errgent gem.
 2015-03-27 11:15:59 +01:00
Dennis Schubert
b07ad67946 Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message 
Add 'no contacts in this aspect yet' message
 2015-03-27 03:50:42 +01:00
Steffen van Bergerem
9069fd235d Add 'no contacts in this aspect yet' message 2015-03-27 03:20:42 +01:00
Steffen van Bergerem
6f7f820ff4 Fix oembed style regression 2015-03-26 23:51:08 +01:00
Steffen van Bergerem
b69239ed2f Merge pull request #5791 from SansPseudoFix/5745-Conversation-pagination-design-is-broken 
Fix for 5745 - conversation pagination design is broken
 2015-03-26 20:05:24 +01:00
SansPseudoFix
a97bfec39c add option pagination 
center pagination

Fix pagination css

Symbols for previous and next

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Add responsive pagination

Fix broken pagination

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/views/conversations/index.haml

Fix broken pagination for mobile

Mobile pagination

Unify desktop and mobile background

change background color
 2015-03-26 19:53:23 +01:00
Steffen van Bergerem
153efe7d7a Change url to image-url in registration.css, added in #5743 2015-03-26 01:13:11 +01:00
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