github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 07:26:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,038 Commits 190 Branches 500 Tags 938 MiB
4b0eb0e159
Commit Graph

1046 Commits

Author SHA1 Message Date
Robin Ward
f8a05195a1 Support images from the select2 plugin 2014-05-28 12:00:58 -04:00
Robin Ward
2164a25258 Merge pull request #2333 from rhacker/select2 
feature: use select2 instead of chosen
 2014-05-28 11:42:40 -04:00
Ben Lubar
73946e5402 quoting fixes 
- allow bbcode quotes to be nested
- don't allow the '=' to be omitted from quotes
- fix some css that made assumptions about nested quotes
 2014-05-27 21:46:31 -05:00
Kris Aubuchon
971494bf5a removing max-width on #site-logo from base and putting it back in mobile 2014-05-27 11:58:53 -04:00
Kris Aubuchon
d6a9f384aa fixing @mention background in quotes and embeds 2014-05-27 11:42:59 -04:00
Sam
57176a9f46 Merge pull request #2387 from velesin/wiki_topic_ie_fix 
[FIX] Wiki Topic - IE / FF problem with post admin menu.
 2014-05-27 20:54:59 +10:00
Sam
6c1c8be794 Work in progress, keeping avatars locally 
This introduces a new model to store the avatars and 3 uploads per user (gravatar, system and custom)

user can then pick which they want.
 2014-05-27 10:08:03 +10:00
Wojciech Zawistowski
d4ae913065 [FIX] Wiki Topic - IE / FF problem with post admin menu. 2014-05-26 22:19:28 +02:00
Jeff Atwood
13ff9980ac Merge pull request #2385 from fantasticfears/css_modal 
fix user/username error class
 2014-05-26 11:00:41 -07:00
Kris Aubuchon
9c02ad73ac merging more styles into base, also fixing <big> abuse 2014-05-26 11:33:47 -04:00
Neil Lalonde
c14d754e02 FIX: don't float left all h3's on mobile 2014-05-26 11:00:54 -04:00
Neil Lalonde
96ed5e0e54 FIX: layout problems in composer on mobile 2014-05-26 10:53:05 -04:00
Erick Guan
ecbda44be4 fix user/username error class 2014-05-26 17:46:31 +08:00
Jeff Atwood
f0dafb4132 unused category-column css -- doesn't exist 2014-05-23 01:51:52 -07:00
Jeff Atwood
13e18cb038 misaligned curlies 2014-05-23 01:42:53 -07:00
Jeff Atwood
0d2fffe180 remove size-based max-width from main-link 2014-05-23 01:37:20 -07:00
Jeff Atwood
52280170d5 a bit more room for reply-to-tab 2014-05-23 01:29:23 -07:00
Jeff Atwood
2eca37b7ae wider share-link dialog to better show URL 2014-05-23 00:46:45 -07:00
Jeff Atwood
132f04a0be Merge pull request #2380 from awesomerobot/master 
adding some padding to the topic-body
 2014-05-23 00:11:53 -07:00
Kris Aubuchon
3cd91b50ed adding some padding to the topic-body, helps selection is Firefox and makes highlighted posts look better 2014-05-23 02:40:55 -04:00
Jeff Atwood
61d17e961e unnecessary rule caused extra spacing in Firefox 2014-05-22 21:47:24 -07:00
Jeff Atwood
2531e4e3a1 old legacy css rule, not needed 2014-05-22 21:29:42 -07:00
Sam
2350227a6f Merge pull request #2379 from awesomerobot/master 
topic list highlight fix, some quote style fixes
 2014-05-23 12:36:26 +10:00
Kris Aubuchon
00278b42d8 topic list highlight fix, some quote style fixes 2014-05-22 21:55:50 -04:00
Jeff Atwood
3445661898 Merge pull request #2374 from awesomerobot/master 
darkening the too-light-grey and the primary black a bit
 2014-05-21 18:50:36 -07:00
Kris Aubuchon
e439df4b6b darkening the too-light-grey and the primary black a bit 2014-05-21 21:18:25 -04:00
Neil Lalonde
742841ddce Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites. 2014-05-21 18:35:10 -04:00
Vikhyat Korrapati
d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Jeff Atwood
32000228e6 correct error in CSS 2014-05-19 22:27:33 -07:00
riking
2c6ab4c699 Remove the special styling on the Categories link 2014-05-19 22:21:35 -07:00
Kris Aubuchon
7accf5aafa some simple style cleanup 2014-05-19 23:55:46 -04:00
Sam
c1776fa1ae Merge pull request #2360 from vikhyat/badge-system 
Badge system updates
 2014-05-20 08:24:26 +10:00
Jeff Atwood
84ead32956 Merge pull request #2361 from awesomerobot/master 
making the color customizer a little nicer with dark themes
 2014-05-18 22:40:38 -07:00
Vikhyat Korrapati
a25087b62a Badges admin UI improvements. 
* Query param to allow linking.
* Better handling of deleting unsaved badges.
* New badge list item style improvement.
 2014-05-19 10:50:57 +05:30
Kris Aubuchon
ffa33c572c making the color customizer a little nicer with dark themes 2014-05-19 01:17:59 -04:00
Sam
8bc8052ab8 BUGFIX: show usernames logic, logic failure 2014-05-19 09:11:01 +10:00
Erick Guan
81dda9fc3e Fix c6ef85d517. Align reply area, 10px padding. 2014-05-19 01:15:11 +08:00
Erick Guan
c6ef85d517 User prefrence: align all control groups on top. And some padding for follow category. 2014-05-18 16:34:12 +08:00
Erick Guan
76e26daf87 So sad, reply-new icon is not circle. I can't tolerate this <3 2014-05-18 00:24:51 +08:00
Kris Aubuchon
1fd6a9067b making onebox styles consistent with quotes 2014-05-16 10:19:02 -04:00
Sam
d897eada61 Improve visual styling for badges page 2014-05-16 11:08:06 +10:00
Jeff Atwood
a8d5860caf topic-map domains should be lighter 2014-05-15 01:34:43 -07:00
Neil Lalonde
eb7aab3e0b FIX: revert button on all colors in a new color scheme 2014-05-14 10:19:00 -04:00
Neil Lalonde
4980cff802 Add descriptions. Make all the actions buttons. Add a revert button to colors. Add a new variable: quaternary. 2014-05-14 10:19:00 -04:00
Neil Lalonde
0fa26022c0 Remove admin css from common 2014-05-14 10:18:12 -04:00
Neil Lalonde
c4d3aa3d47 Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline. 2014-05-14 10:18:12 -04:00
Jeff Atwood
b232736242 new-user styles not consistent 2014-05-14 01:05:24 -07:00
nXqd
0b6ebdac8a feature: use select2 instead of chosen 2014-05-14 08:01:08 +00:00
Jeff Atwood
d28e03c3aa user page instructions should be dimmed 2014-05-14 00:26:09 -07:00
Jeff Atwood
c0c0bfa35e both mobile and desktop 2014-05-13 22:27:04 -07:00
Jeff Atwood
f2d7e4906b symmetry between PM notifications and user page 2014-05-13 21:55:44 -07:00
Robin Ward
2e4d8b2e13 The main content of a post was being floated to the left in mobile. This 
was causing the topic map to surround the first post.
 2014-05-13 15:07:05 -04:00
Jeff Atwood
2c6ed24e26 more margin on show full post in mobile 2014-05-13 11:39:13 -07:00
Jeff Atwood
704a683903 mobile layout CSS tweaks 2014-05-13 11:10:29 -07:00
Jeff Atwood
8fa580f40d scale quote highlight color 2014-05-13 10:16:13 -07:00
Jeff Atwood
a83859ea59 the span highlight expand quote CSS went missing 2014-05-13 10:08:43 -07:00
Wojciech Zawistowski
960d64930c Wiki Post 2014-05-13 08:53:11 -04:00
Jeff Atwood
27c702464e bit more mobile css cleanup 2014-05-13 00:03:22 -07:00
Jeff Atwood
0e23641291 fix mobile badge colors, jay leno P chins 2014-05-12 23:37:25 -07:00
Jeff Atwood
8ff9b8388e minor mobile fixes 2014-05-12 22:50:52 -07:00
Régis Hanol
bc3de84ebf FEATURE: remove bookmark button in activity feed 2014-05-12 09:33:26 +02:00
Régis Hanol
9125453628 FEATURE: add the first 3 participants in a private message 2014-05-12 09:32:49 +02:00
Kris Aubuchon
0779621680 lighter TH on topic-list 2014-05-12 01:02:05 -04:00
Sam
c683fab2a1 Adjust username styling 2014-05-12 11:28:24 +10:00
Jeff Atwood
8714391bb2 fix p:last-of-type on embed topic blockquotes 2014-05-09 23:51:06 -07:00
Jeff Atwood
1e8e2590cf Merge pull request #2331 from awesomerobot/master 
rearranging layout to better fit the new username placement
 2014-05-09 23:30:38 -07:00
Jeff Atwood
c65fa01479 fix in-reply-to names for mobile embed 2014-05-09 23:20:23 -07:00
Kris Aubuchon
b2675a61ba rearranging layout to better fit the new username placement 2014-05-10 02:09:04 -04:00
Jeff Atwood
9afc5706e9 loosen spacing a bit on embedded topics 2014-05-09 22:50:45 -07:00
Jeff Atwood
6cfa5f78d9 make new user names a bit lighter 2014-05-09 13:32:36 -07:00
Jeff Atwood
5ee6ac3621 reply-to-tab doesn't need bgcolor 2014-05-09 13:25:28 -07:00
Robin Ward
2fd5ae2091 Move reply to to the right 2014-05-09 16:12:21 -04:00
Robin Ward
252b36bb86 FIX: Some avatars were too big in embedded CSS 2014-05-09 15:49:53 -04:00
Robin Ward
067381ed18 Move in reply to slightly in embedded posts 2014-05-09 15:42:48 -04:00
Robin Ward
e713cc40c4 First attempt: Move username on top of embedded posts 2014-05-09 15:14:00 -04:00
Arpit Jalan
93cff8deb5 Speech bubble waiting for an ajax response prior to rendering 2014-05-09 22:23:27 +05:30
Robin Ward
842dd91958 Revert "Merge pull request #2304 from techAPJ/speech-bubble-update" 
This reverts commit 6590ebbcbe, reversing
changes made to 3855ead62e.
 2014-05-09 12:01:36 -04:00
Robin Ward
6590ebbcbe Merge pull request #2304 from techAPJ/speech-bubble-update 
Speech bubble waiting for an ajax response prior to rendering
 2014-05-09 11:58:57 -04:00
Jeff Atwood
853bbbbf06 suppress reply-to-tab borders 2014-05-09 08:42:07 -07:00
Arpit Jalan
d16974fd4c Speech bubble waiting for an ajax response prior to rendering 2014-05-09 08:06:56 +05:30
Sam
0c2c92978d Merge pull request #2301 from vikhyat/accessibility 
Slightly improve header accessibility
 2014-05-08 09:23:29 +10:00
Kris Aubuchon
ae79078605 minor user(and group) page fixes 2014-05-07 13:49:59 -04:00
Vikhyat Korrapati
2f33c288a6 Remove extra anon glyphs, move sign in button. 
See: https://meta.discourse.org/t/add-sign-in-to-anonymous-header/15335
 2014-05-07 18:42:51 +05:30
Vikhyat Korrapati
17ad49ffbc Slightly improve header accessibility. 
Partially addresses: https://meta.discourse.org/t/links-without-text-make-blind-user-accessibility-worse/13538.
 2014-05-07 18:08:47 +05:30
Kris Aubuchon
22e7fd5ed0 some color fixes, general consistency 2014-05-06 23:53:04 -04:00
Jeff Atwood
41c6ca1686 don't color mobile topic map numbers 2014-05-06 15:38:22 -07:00
Neil Lalonde
9a1318879e FIX: blockquote colors on mobile 2014-05-06 15:38:19 -04:00
Neil Lalonde
ba68470d5a FIX red hightlighted rows in admin 2014-05-06 15:01:27 -04:00
Robin Ward
9e719e49da Only show a few topic links in the gutter and allow the user to expand 
them.
 2014-05-06 14:11:17 -04:00
Kris Aubuchon
905c7c7204 few small consistency changes 2014-05-06 12:30:05 -04:00
Neil Lalonde
ee08bf561f Fix a bunch of color issues 2014-05-06 11:44:28 -04:00
Kris Aubuchon
60bf76f152 a few small color fixes 2014-05-06 09:48:38 -04:00
Régis Hanol
8cf937cdcb BUGFIX: fix selected & unread notifications dropdown background color 2014-05-06 12:34:50 +02:00
Jeff Atwood
7870afbfd4 bring post borders back on mobile 2014-05-06 01:49:20 -07:00
Jeff Atwood
d1c876fcbc don't clear:left the btn-primary on mobile 2014-05-06 01:40:05 -07:00
Jeff Atwood
bebdd0d290 some stray } there 2014-05-06 01:29:28 -07:00
Jeff Atwood
27deae4ba4 unwanted editor border on Nexus 5 / iPhone 5 2014-05-06 01:17:35 -07:00
Jeff Atwood
1bf566ac8e a few more mobile CSS tweaks 2014-05-06 01:14:56 -07:00
Jeff Atwood
65af49f828 CSS, how does it work? 2014-05-06 00:52:28 -07:00
Jeff Atwood
e023849657 a few more mobile CSS annoyances 2014-05-06 00:48:44 -07:00
Jeff Atwood
4346190b2c fix some mobile CSS annoyances 2014-05-06 00:24:04 -07:00
Jeff Atwood
8e5888dee1 remove $quote-background color 2014-05-05 23:50:05 -07:00
Jeff Atwood
2a3993794b correct the $primary_border_color error 2014-05-05 23:42:53 -07:00
Kris Aubuchon
8ea63006e4 simplifying and segmenting color variables 2014-05-06 01:50:51 -04:00
Jeff Atwood
0f62a6f132 fix new user color 2014-05-01 01:39:08 -07:00
Jeff Atwood
41cb378142 why does .cooked need a right margin of 60 px?!? 2014-05-01 00:25:07 -07:00
Jeff Atwood
3c05f97f9e some /faq page layout fixes 2014-04-30 23:59:24 -07:00
Kris Aubuchon
e18f435318 some alignment fixes for the new username position 2014-04-30 10:14:27 -04:00
Sam
85e7033410 BUGFIX: styling 2014-04-30 17:04:54 +10:00
Sam
e964ca4d4e BUGFIX: merge played up correct visual styles 2014-04-30 16:13:08 +10:00
Sam
d8046a395f BUGFIX: improve alignment 2014-04-30 16:04:24 +10:00
Kris Aubuchon
7361519e52 some adjustments for the username relocation... 2014-04-30 00:45:11 -04:00
Sam
1d2cabc2a6 FEATURE: usernames are now on top. 2014-04-30 12:13:37 +10:00
Kris Aubuchon
449de0368e updating d-dropdown so long lists of categories can scroll 2014-04-29 09:50:02 -04:00
Sam
0fc4c47927 Merge pull request #2295 from vikhyat/badge-system 
Titleable badges
 2014-04-29 11:26:51 +10:00
Vikhyat Korrapati
b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Benjamin Kampmann
64918c35f5 Improved Plugins SCSS management 
- Moves the import of plugins for both mobile and desktop from common after discourse loading, allowing plugins to overwrite
 - Make desktop-option behave like the mobile-option: SCSS/CSS marked with that option will only be loaded for desktop from now on and ignored in mobile
 - Add variables-keyword, allowing plugins to ship and overwrite variables before they get imported by discourse (great for theming)
 2014-04-25 18:25:45 +02:00
Neil Lalonde
feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Sam
3ff1d63a8d Improve mobile style for topic lists 
This has been driving me nuts for a while now
 2014-04-24 11:10:50 +10:00
Sam
2debf7d97d Correct colors for tracking glyph in notification area 2014-04-24 10:48:04 +10:00
Jeff Atwood
6538874064 remove unnecessary css witdh 2014-04-22 16:22:25 -07:00
Vikhyat Korrapati
ba862439f2 Move badge styles from desktop to common/base. 2014-04-22 11:50:16 +05:30
Vikhyat Korrapati
d54edc7c0e Display username and granted at on badge page. 2014-04-22 11:49:31 +05:30
Kris Aubuchon
2c44f724f4 fixing the composer that I just re-broke 2014-04-21 11:54:57 -04:00
Kris Aubuchon
5fd874b74a desktop composer fix 2014-04-21 09:56:10 -04:00
Kris Aubuchon
e4d1aaa290 pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:17:11 -04:00
Kris Aubuchon
bffeba5e3b pulling some more styles out of desktop/mobile to common/base 2014-04-20 15:16:06 -04:00
Kris Aubuchon
3f102a98da initial move of common desktop/mobile styles to common/base 2014-04-19 14:04:22 -04:00
Vikhyat Korrapati
27b62df48b Change "awarded" to "granted". 2014-04-18 09:20:55 +05:30
Sam
87f37b3ee9 Merge pull request #2271 from vikhyat/badge-system 
Badge system updates
 2014-04-17 16:22:41 +10:00
Vikhyat Korrapati
b55734da91 Add badges tab to user profile. 2014-04-17 01:58:01 +05:30
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Vikhyat Korrapati
acfcf0b64e Add /badges route that lists all defined badges. 2014-04-16 18:42:06 +05:30
Vikhyat Korrapati
057c56ef9b Add user-badge component. 2014-04-16 18:08:00 +05:30
Vikhyat Korrapati
a1333989f4 Add username on top to CSS directory so it can be imported. 2014-04-16 14:44:55 +05:30
Sam
4a0c63ec7f Tweak badge styling 2014-04-14 15:58:52 +10:00
Sam
d3810ba3bc Merge pull request #2212 from vikhyat/badge-system 
Show badges in the poster expansion card
 2014-04-14 10:54:43 +10:00
Jeff Atwood
782f8e401e improve keyboard shortcut css styles 2014-04-13 14:51:30 -07:00
Vikhyat Korrapati
3f4c5ed451 Show badges in the poster expansion card. 2014-04-11 06:59:11 +05:30
Sam
fe6153ba96 Merge pull request #2232 from vikhyat/username-on-top-setting 
Add option to show username on top of posts instead of the left gutter
 2014-04-11 10:13:18 +10:00
Vikhyat Korrapati
af69b78ecb Changes to posts template to make it easier to display posts on top. 2014-04-10 21:56:13 +05:30
Sam
7b3618baf9 clean up style 2014-04-10 18:34:50 +10:00
Kris Aubuchon
ec96ca4c60 modifying some styles for the new pin/unpin feature 2014-04-09 23:27:05 -04:00
Kris Aubuchon
1725f6e5bc Merge remote-tracking branch 'upstream/master' 2014-04-09 21:26:00 -04:00
Kris Aubuchon
8067381782 de-bluing some non-links 2014-04-09 21:19:04 -04:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Sam
ac097e2d0f Merge pull request #2244 from vikhyat/css-import 
Site Customization @import fixes
 2014-04-10 07:01:34 +10:00
Vikhyat Korrapati
33307a50b3 Get rid of plugins.css, inject it using DiscourseSassImporter. 2014-04-09 19:42:43 +05:30
Sam
8cdf25532c Merge pull request #2207 from riking/list-setting 
UI for list site settings
 2014-04-09 09:34:50 +10:00
riking
6779bec58c Add UI for list site settings 2014-04-08 14:17:55 -07:00