Commit graph

165 commits

Author SHA1 Message Date
Robin Ward
4a7ef8b460 Adjust margins of ul, ol: they were slightly to the left 2013-11-05 17:57:05 -05:00
Robin Ward
25ef66c60b User invites page now has search, displays first invites_shown records 2013-11-05 17:53:26 -05:00
Sam
2c1b58c8cc mini profiler is there for a reason :) 2013-11-05 13:43:50 +11:00
Kris Aubuchon
5c3f12f369 merging
Merge remote-tracking branch 'upstream/master'
2013-11-04 12:59:17 -05:00
Kris Aubuchon
1c2b5015a3 fixing user title line-height, adding @mention style back in, consistent category width/alignment 2013-11-04 12:45:18 -05:00
Robin Ward
7360112759 Merge pull request #1600 from GManzato/user_page_flat
Flatter design on User Page
2013-11-04 07:25:57 -08:00
Régis Hanol
b063c4326f Merge pull request #1609 from awesomerobot/master
some general simplification to modal, menus, etc
2013-11-04 06:52:25 -08:00
Kris Aubuchon
70fd4f7f6b merging local with master
Merge remote-tracking branch 'upstream/master'
2013-11-04 09:17:12 -05:00
Kris Aubuchon
4ce711a3b7 some general simplification to modal, menus, etc 2013-11-04 09:16:47 -05:00
Régis Hanol
12ac2f2e99 FIX issues with quote button
Fix the following issues
- Quote button quotes only one word on iOS
- Quote reply popup should not come up when selecting the text in the ‘reply’ button
2013-11-04 12:51:39 +01:00
Robin Ward
7a567d730d Merge pull request #1601 from awesomerobot/master
main logo size consistency fix
2013-11-01 13:32:37 -07:00
Robin Ward
04aa1690e2 Adjust ul,ol margins 2013-11-01 15:48:28 -04:00
Kris Aubuchon
1f283b5ca9 main logo size consistency fix 2013-11-01 15:45:56 -04:00
Gilles Manzato
3826e67007 Flatter design on User Page
- Cleanup of the design ( remove border-radius ... )
- Fixed some alignment and width in mobile and lower screen size
2013-11-01 15:38:07 +01:00
Robin Ward
b93ca1089e List subcategories on categories page 2013-10-31 18:02:24 -04:00
Neil Lalonde
d3c7bbe268 Merge pull request #1597 from awesomerobot/master
topic vertical alignment fixes, admin logs table width fix
2013-10-31 06:58:10 -07:00
Kris Aubuchon
396b626bdc topic vertical alignment fixes, admin logs table width fix 2013-10-31 09:35:49 -04:00
Sam
c97ab672c7 Merge pull request #1593 from awesomerobot/master
Some code cleanup, touch/non-touch gutter, little design/alignment tweaks
2013-10-30 14:45:29 -07:00
Kris Aubuchon
d01185215d some reorganization, touch optimization, poster expansion design 2013-10-30 12:40:16 -04:00
Kris Aubuchon
9f42bde110 fixing topic title line height to accomodate overflow 2013-10-30 09:57:56 -04:00
Régis Hanol
689c4cd947 Merge pull request #1592 from awesomerobot/master
fixing errors in formatting from last commit
2013-10-30 06:33:23 -07:00
Kris Aubuchon
032997ccff fixing errors in formatting from last commit 2013-10-30 09:31:26 -04:00
Régis Hanol
9a2e3245b8 Merge pull request #1591 from awesomerobot/master
fixing pre/sub/sup/code/kbd formatting, post selection buttons
2013-10-30 06:20:59 -07:00
Kris Aubuchon
7900fa0184 fixing pre/sub/sup/code/kbd formatting 2013-10-30 09:11:05 -04:00
Kris Aubuchon
ef954f46ba fixing blockquote that I just broke 2013-10-29 22:33:09 -04:00
Kris Aubuchon
be27e1dfee fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent 2013-10-29 22:00:18 -04:00
Sam
4fa32c4dc0 Merge pull request #1590 from awesomerobot/master
fixing the category creation/edit modal alignment
2013-10-29 18:40:35 -07:00
Kris Aubuchon
0337c293c1 fixing the category creation/edit modal alignment 2013-10-29 21:01:41 -04:00
Sam
36352e437f Merge pull request #1589 from awesomerobot/master
Some underlying topic title clean-up, fixed private message user list alignment
2013-10-29 17:49:28 -07:00
Kris Aubuchon
60d9b4d808 fixing private message users, post title alignment 2013-10-29 20:47:37 -04:00
Kris Aubuchon
3043efcb0a cleaning up the topic-title alignment a bit 2013-10-29 17:15:56 -04:00
Robin Ward
6063b52d6a Support for choosing a destination category when splitting topics. 2013-10-29 15:30:06 -04:00
Kris Aubuchon
4c8944626a making post-info text brighter, making category nav dropdown text smaller and bold 2013-10-29 00:37:18 -04:00
Kris Aubuchon
0d0a2cb947 category nav style 2013-10-28 17:37:31 -04:00
Kris Aubuchon
5d19e66470 merging with the new category nav feature
Merge remote-tracking branch 'upstream/master'
2013-10-28 17:08:00 -04:00
Robin Ward
8c882fd392 Changed breadcrumb dropdowns 2013-10-28 15:34:38 -04:00
Kris Aubuchon
c016a081f1 further simplification over all, changes include: flatter button style, styling admin table, topic-list style 2013-10-28 13:46:59 -04:00
Kris Aubuchon
cafc1a088d catching up with the master
Merge remote-tracking branch 'upstream/master'
2013-10-28 12:26:12 -04:00
Kris Aubuchon
1cb7b29b62 some topic-list simplification 2013-10-28 12:25:52 -04:00
Robin Ward
098673ecc0 Put back the user collapsing 2013-10-28 11:29:23 -04:00
Robin Ward
1775271d46 Reverse positions of buttons on user profile 2013-10-28 11:19:18 -04:00
Robin Ward
a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde
90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
Sam
a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Robin Ward
61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward
ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Sam
636976e5d4 fix alignment of n person liked this. 2013-10-24 15:30:41 +11:00
Robin Ward
cc9b11ecc5 Simple category breadcrumb component 2013-10-23 17:00:02 -04:00
Régis Hanol
a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam
9ae4245955 Merge pull request #1565 from awesomerobot/master
topic page: alignment fixes for replies, minor alignment changes
2013-10-22 23:09:44 -07:00
Kris Aubuchon
ca82d07f6d simplfying the header, some more alignment adjustments on the topic page 2013-10-23 00:22:24 -04:00
Kris Aubuchon
0ef064fd93 removed white line in quotes, cleaned up some markup 2013-10-22 18:31:40 -04:00
Jeff Atwood
5e2d8dcf37 even out blockquote top/bottom padding 2013-10-22 14:18:41 -07:00
Jeff Atwood
d90001e857 even out blockquote paras w/top & bottom margin 2013-10-22 14:17:19 -07:00
Kris Aubuchon
649b3d44a6 topic page: alignment fixes for replies, minor alignment changes 2013-10-22 16:36:32 -04:00
Kris Aubuchon
c2865e3e2c fixing alignment on replies, buttons - also making topic new gutter link visible on touch 2013-10-22 15:37:44 -04:00
Robin Ward
97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Jeff Atwood
d2cc9c39ac don't define bgcolor on in-reply-to 2013-10-22 01:33:51 -07:00
Jeff Atwood
5203ba41eb tighten up spacing on notification control 2013-10-21 23:56:46 -07:00
Jeff Atwood
4693019e90 remove bottom border on posts-wrapper 2013-10-21 23:39:17 -07:00
Jeff Atwood
e994ac451b fix quote reply z-order 2013-10-21 23:31:54 -07:00
Régis Hanol
9aca8e14ba fix code highlithing in list 2013-10-21 22:57:06 +02:00
Régis Hanol
6adba747b9 fix images height on IE 2013-10-21 22:56:59 +02:00
Kris Aubuchon
2feb82b4b7 differentiating visited topics better, fixing extra white space in the title header (also realigning title header) 2013-10-21 16:23:55 -04:00
Kris Aubuchon
ecb6ec0b6d fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small 2013-10-21 15:15:32 -04:00
Régis Hanol
c9dd83cba4 force max-width on images/svgs in composer preview and post view
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
2013-10-21 20:01:10 +02:00
Robin Ward
f565766b1e Merge pull request #1555 from awesomerobot/master
fixed progress indicator a bit, line under title doesn't span full width...
2013-10-21 07:51:07 -07:00
Kris Aubuchon
2c384e0073 fix for long usernames 2013-10-21 10:13:16 -04:00
Kris Aubuchon
77540ed999 fixed progress indicator a bit, line under title doesn't span full width anymore 2013-10-21 09:38:35 -04:00
Jeff Atwood
21ee05583c no line above topic footer buttons please 2013-10-21 01:38:01 -07:00
Jeff Atwood
cec9bcfb5d make user titles smaller than usernames 2013-10-21 01:22:36 -07:00
Jeff Atwood
1a0e800afb fix line-height on topic titles 2013-10-21 00:51:11 -07:00
Jeff Atwood
2ac8f3d20b extra-info-wrapper at top of topic too narrow now 2013-10-21 00:38:24 -07:00
Sam
a241ddf9d2 Merge pull request #1554 from awesomerobot/master
gutter links shouldn't fade, fixed
2013-10-20 22:20:10 -07:00
Kris Aubuchon
d4db161133 css transitions were too slow, sped up 2013-10-21 00:45:19 -04:00
Kris Aubuchon
94b5b24d88 gutter links shouldn't fade, fixed 2013-10-21 00:41:16 -04:00
Sam
6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Sam
243a6ae291 Merge pull request #1552 from awesomerobot/master
a few general fixes to the new flatter theme
2013-10-20 19:33:38 -07:00
Kris Aubuchon
5d88bfa8e3 a few more fixes, detailed here: http://meta.discourse.org/t/flatter-styling-now-deployed/10515 2013-10-20 22:16:02 -04:00
Kris Aubuchon
aa42a36b8a a few general fixes to the new flatter theme 2013-10-20 21:59:46 -04:00
Sam
6cfdd083d5 Merge pull request #1525 from squareleaf/logo_header_height
Change fixed width of logo in header to max-height.
2013-10-20 17:37:55 -07:00
Sam
614f45d003 correct topic and category counting query
revive old styling that was stripped
2013-10-21 10:20:16 +11:00
Tiffany Green
6681751531 Change fixed width of logo in header to max-height. Addresses issue #1045
Add max width
2013-10-20 17:35:37 -05:00
Kris Aubuchon
88a97bcb71 minimizing the desktop topic view, also effects the background on all pages and removed bootstrap 2013-10-19 18:18:25 -04:00
Sam
6f32cb52d6 minor styling changes, kill n+1 query 2013-10-18 11:23:08 +11:00
Sam
e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam
8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Jeff Atwood
4b53c45d3d make category descriptions plain black 2013-10-17 15:32:11 -07:00
Neil Lalonde
3927913a7e FIX: composer for creating a new topic on mobile 2013-10-17 13:17:54 -04:00
Robin Ward
a215fc5bdc Collapse user details when not viewing index view 2013-10-17 11:27:03 -04:00
Robin Ward
7e9b119c9c Minor tweaks to user view 2013-10-16 16:22:16 -04:00
Robin Ward
dd63e6d28f Two Column User View 2013-10-16 15:51:01 -04:00
Robin Ward
c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Régis Hanol
ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
Neil Lalonde
bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Régis Hanol
94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward
50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -04:00
Robin Ward
d2a1118e67 Make date on User expansion gray 2013-10-04 17:50:56 -04:00