Commit graph

89 commits

Author SHA1 Message Date
Marek Marecki
0b37e9f736 Fix issue #4499: changed :width in .item_count to :min-width 2013-09-14 09:35:15 +02:00
Srihari Sriraman
5bd5f9198d Refactored the colors palette a little more
- Introduced text-dark-grey = #666666
- Converted text colors #777777 and #555555 to text-dark-grey
- Removed header-grey in favor of text-grey
- Included colors in a couple of files where it was missing
- Categorized the colors in the palette based on the contexts of usage
2013-08-30 17:58:39 +05:30
Srihari Sriraman
4348fc070d Add border-dark-grey
Substituting -grey for #999

Moving #888 text color to -grey

Adding border-dark-grey

Removing border-dark-grey from places where it isn't appropriate
2013-08-30 10:32:02 +02:00
Srihari Sriraman
0bcc62f07f Disable 'Mark all as read' for notifications when everything is read
- This action needn't be performed when all notifications are read,
  hence disabling it is a good practice
- Added a link-disabled-color
- Used css pointer-events to disable clicking on the link

Preventing default on click for the mark_all_read_link

- avoiding the use of pointer-events
- setting up disabled only for mark_all_read_link

Moved disabling of the link to a global handler

- Added disabled class to the button in /notifications when all are read
- Styled the disabled button
- Adding disabled class after completion of ajaxRequest
2013-08-29 12:12:26 +02:00
Srihari Sriraman
a6dc845f59 First stab at extracting a color palette
- Pulled out the existing palette in _mixins
- Took a stab at naming greys after their usage count in contexts
- Replaced #a40802 with #a80000, since they are very close and $red was already in the palette

Missed importing 'colors' in a couple of places

Removing a redefined  in favor of  in colors.css.scss

Fixing missed imports #2

Renamed $background to $background-white

Explicitly calling out the color of the background, since we have many
background colors
2013-08-28 10:25:04 +02:00
Srihari Sriraman
5b41539985 Fixing Invite code input width to be same across browsers
- It was wide on firefox and narrow on chrome
- This fits it within the parent's padding on all browsers
2013-08-27 11:51:15 +05:30
Steffen van Bergerem
324b09a72a add help page 2013-08-26 15:26:18 +02:00
flaburgan
96e18c6a7b Add aspect modification and fix check icon regression on contacts page, close #4397 2013-08-25 21:42:32 +02:00
Srihari Sriraman
e8b00458d3 Adding hover icoons for notifications & conversations
Added white versions of the icons on hover to match the hover of other
header items.
Changing the notifications hover icon to the regular notifications icon when active so
it is visible with the white background.

Fixing the hard coded background-position value for notifications_grey

Can not depend on generated sprite background position as it will change
with changes in icons

Moving the $icons variable to a broader scope

Since the variable is used in the header, the sprites now are imported
before the header

Using the default sprite map instead of the explicitly created sprite map
2013-08-25 11:49:34 +02:00
Jonne Haß
1b7bc02eee Merge pull request #4410 from rogerbraun/feature/spv-redesign
New single post view

Conflicts:
	app/assets/stylesheets/application.css.sass
2013-08-22 10:37:25 +02:00
Jonne Haß
0012a82f48 add the footer to the SPV 2013-08-22 09:56:36 +02:00
Jonne Haß
fa7b756d4d improve new SPV
* Hopefully fix OEmbed view
* Fix OpenGraph view
* Fix middle border
* Add spacing at the bottom
* Fix comment styles by not including old SPV styles for them (TODO: maybe rescue some stuff there, like the code tag styling)
* Fix avatar size for default avatar
* Remove border below comment pane
* Fix overflow of post body with a lot of text
* Fix stylesheet inclusion
2013-08-22 09:56:35 +02:00
flaburgan
d63dc9f0a5 Add images, fix layout rendering 2013-08-22 09:56:34 +02:00
Steffen van Bergerem
7fe972555a profile message and mention icons 2013-08-21 23:05:42 +02:00
Steffen van Bergerem
e5e63b09a3 fix opacity of control icons 2013-08-20 12:20:24 +02:00
Steffen van Bergerem
d73da263d9 Unify profile sidebar 2013-08-19 14:57:42 +02:00
Jonne Haß
eea3818c45 streamline new profile sidebar elements
* titlecase "Photos"
* Pull "See all" to the left (to match up with  "View all")
* Replace "See all" with "View all"
2013-08-19 14:26:14 +02:00
Steffen van Bergerem
f22b4d7da7 Change contact list on profile page 2013-08-19 14:02:08 +02:00
mokus
44d76fc6da rename contact_count to item_count 2013-08-19 12:49:38 +02:00
flaburgan
820fa4e9b2 Extract and factorize the header css in a new file, fix ugly registration header design 2013-08-11 20:18:40 +02:00
Sean Tilley
e7ea763ab5 Merge pull request #4373 from Flaburgan/patch-4
Make contacts visible in new aspect unchecked by default, close #4343
2013-08-10 15:00:16 -07:00
flaburgan
895a7c79a3 Remove overflow hidden on welcome banner, close #4377 2013-08-10 00:07:02 +02:00
Antoine D
ef24275f7c Make contacts visible in new aspect unchecked by default, close #4343 2013-08-09 22:13:40 +02:00
Jonne Haß
1639ae2b31 Merge pull request #4316 from Flaburgan/feature/4271-refactor-left-side-bar
Feature/4271 refactor left side bar
2013-08-06 11:45:15 -07:00
flaburgan
aa27b7a1f5 Resize preview button 2013-08-06 18:40:20 +02:00
flaburgan
ac533f8383 Refactor the left bar side menu, improve tag autosuggestion design, close #4271 2013-08-06 18:30:24 +02:00
arlogn
0cccd87259 Cursor pointer on upload-photos button in webkit browsers 2013-08-05 15:07:11 +02:00
Jonne Haß
6689f20710 Merge pull request #4321 from andrewcsmith/feature/4100-add-support-for-posting-to-wordpress-as-a-service
Feature/4100 add support for posting to wordpress as a service

Conflicts:
	Gemfile.lock
2013-08-04 17:15:39 +02:00
Andrew Smith
2bb6bc8eef Added Wordpress service functionality,
for cross-posting to OAuth-enabled Wordpress.com or Jetpack-enabled Wordpress.org blogs.

Added model for Wordpress service

Added very very basic Wordpress cross-posting functionality.

Added markdown support to post body

Fixed Wordpress::MAX_CHARACTERS problem

cleanup

Added default settings for Wordpress OAuth

Added default settings for Wordpress OAuth

Added Wordpress to configured services spec.

changelog changes
2013-08-04 07:46:56 -07:00
Fábián Tamás László
6e4c1fe3c6 Improved opengraph data display
Style fixup
2013-08-04 15:44:56 +02:00
Fábián Tamás László
176c6826e0 opengraph POC
Fixed small-frame opengraph view

Fixed incompletely saved OpenGraphCache bug
2013-08-04 15:42:29 +02:00
Jonne Haß
30dff802d5 Merge pull request #4243 from davexunit/feature/2948
Show the user if a contact is sharing with them when viewing their profile page
2013-06-29 10:16:41 +02:00
Antoine D
8e2633f8b3 Improve participants link style in conversation, close #4236
Move it to the right and replace the text by an image with the nice tooltip, modify the test.
2013-06-28 00:41:44 +02:00
David Thompson
2e83736f43 Add SASS for sharing message. 2013-06-20 07:39:56 -04:00
Steffen van Bergerem
21ef1c8e41 Remove alpha branding 2013-06-12 23:08:13 +02:00
Steffen van Bergerem
a02fdc6e45 unify ignore and hide #bugmash #monday 2013-06-12 14:11:06 +02:00
Juan Azambuja
3f3fe3ecc7 Add participants preview con conversations 2013-06-01 12:14:16 -03:00
Juan Azambuja
e59066bd66 Fix icons-deletelabel styles 2013-05-27 10:25:04 -03:00
Marco Gallardo
4aab8762fa Locator feature
added marker image for publisher, showing div for address, and added
functionality to close it when clicking 'X' image

showing marker image in publisher

renamed map-marker to locator

fixed style for map marker image in publisher

added locator.js to get user's location

loading google maps api

removed unecessary append and showing location next to publisher

moved location address inside div and  added image to close location

styled div location address an image to close location

removing location when clicking close image

cleaned code

cleaned code

showing loader while location is being obtained, translated normal js to
backbone structure, created locations db stuff, and removing location
div when clicking 'share'

refactored code; started to move code to backbone

refactored js code; moving functionality to backbone structure

created address function to make accessible address variable value

refactored locator.js

showing and removing location div from dom

created location; it belongs_to status_message

added location model and created association with status_message

added hidden field for location address and added respective code on js files to retrieve it on ajax call

saving location for status_message (post)

removing location when sharing

renamed locator backbone view to location, added template, showing
location, and saving lat and lng

prepared and added template to show location

added location to post model in order to have it accessible in backbone

retrieving location to show it in template

removed console.log XD

fixes when removing location

cleanind location_address hidden field when location is removed

more fixes; showing location when sharing

saving location just when it exists

created method to retrieve location address just when location was created

fixed issue about showing 'Near from' message when there was not any location

added style for location

cleaned code

renamed locator view

retrieving lat and lng from locator.js

saving lat and lng in location_coords

saving lat and lng

added style for input location_address

removed location_address  hidden field; the value will be taken directly from input with the location

replaced div with location for input; the user will be able to edit the place

avoiding submitting the form when pressing Enter key on new input for location

added missed spec file for location model

refactored location_view code

refactored location_view code

cleaned code

added sinon library for testing

added describes for new publisher's view functions

created test for destroyLocation function

added test for showLocation publisher view function

created test for avoidEnter publisher view function

removed unnecessary div

Created first test for locations view, added more specs, added Sinon.js,
and fixed issue with assets

loading locator.js for tests

moved location stuff to app/assets

moved locator.js and sinon.js to app/assets

fixed route for images

included locator.js to assets

fixed issue when post object is different than StatusMessage; also fixed issue with lat and lng

loading Sinon for specs

refactoring locator errorGettingposition and start replacing google maps stuff with OSM

added OpenLayers JS, osmlocator, and added them into the main js

changing the locator from Google to OSM instance

changing lat and lng value in the backbone view

removing google javascript tag in application layout

adding jasmine to locator test and removed locator.js

adding jasmine to locator test using OSM

adding Jasmine test to OSM locator

removed locator.js

removed require locator and updated schema

fixed js response; added location

since we are using OSM Locator we don't need locator-spec test

fixed spec for location view; we are not using google maps anymore

changed description of osmlocator-spec

fixed issue with status-message-location template

fixed style for location_address textbox

fixed tests for locator

moved split function to model

created test for location model

removed puts

added effect for location marker

added translations for locator

removed conflicting-unnecessary lines that were loading files for specs

removed sinon library; using sinon-rails gem

removed useless code

removed puts; added Rails.logger.error

added sinon.js file

added specific version of sinon-rails gem

improving validations sintax

using openlayers-rails gem

removed 'google API' text

using sinon gem

isolating LocationStream view

refactored validation

getting location when post is a Reshare

refactored code

fixed aligment for elements under location message

improved styling for location message

refactored begin-rescue block

getting absolute root instead of just the root

added address method to retrive address of location

removed code from Post model; also added descriptinon why it was removed

removed validation when retrieving address; with latest refactorizations we dont need them any more

interpolated location; using file in locales

fixed width for div of location

moved Sinon gem into development and test group

fixed method's description

added missed indexes

updated schema with locations table

removed openlayers-rails gem

preventing location to be saved if there are not coordinates

fixed spec; wrong closing tag
2013-05-02 17:31:53 -05:00
Steffen van Bergerem
6e724fc1d4 preview posts in stream 2013-04-07 17:43:27 +02:00
Bruno Machado
1e50d1465a Convert some stylesheets to SCSS #3796 2013-04-06 15:34:15 -03:00
Bruno Machado
29af94ce4e Remove unnecessary dotted CSS borders. Closes #2940 2013-04-01 15:53:27 -03:00
Tom Scott
cdc4e869d1 Merge pull request #3841 from tubbo/fix-close-buttons
Align close button images

Sorry this took so long to merge in guys, I had this weird feeling that I had already done so. Looks like the 'X' button is coming after the custom popover HTML so this looks OK to merge in.
2013-03-30 06:29:19 -07:00
Juan Manuel Azambuja
c10aefb30f Fix email icon on right section 2013-03-28 11:16:18 -03:00
Juan Manuel Azambuja
d68aac88f8 Add inline-block directive to social_media_icons on publisher 2013-03-28 10:52:10 -03:00
Juan Manuel Azambuja
2556f08b89 [Sprites] update sprites after develop merge 2013-03-11 20:16:16 -03:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
8686cb4fcb [Sprites] social media logos sprite usage 2013-03-11 19:27:35 -03:00
Juan Manuel Azambuja
8747e6601d [Sprites] add sprites for branding 2013-03-11 19:26:57 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00