Commit Graph

991 Commits

Author SHA1 Message Date
Andreas Nedbal c76f839ea7 Fixed announcement JavaScript functionality 2020-05-07 20:36:14 +02:00
Andreas Nedbal 8a8c2667de Adjust theme settings page layout
- Moved color section to come right after General
- Adjusted buttons for light/dark preview to not trigger form submit
2020-05-07 20:28:20 +02:00
Andreas Nedbal 6e51294eca Adjust announcement index page design 2020-05-07 19:49:39 +02:00
Andreas Nedbal 5d63d0ba27 Update announcement styling and adjust announcement views 2020-05-07 19:30:13 +02:00
Andreas Nedbal 1cc49cf03c Adjust warning-text default theme value 2020-05-07 19:28:26 +02:00
Andreas Nedbal 633f69c163 Fix about page icon styles 2020-05-07 15:09:55 +02:00
Andreas Nedbal d607a8790b Fix styling of new inbox entries 2020-05-07 15:01:35 +02:00
Andreas Nedbal 787ec882c4 Fix answerbox text layout on mobile 2020-05-07 03:46:44 +02:00
Andreas Nedbal 207769d164 Fix layout of profile header in profile settings 2020-05-07 02:30:50 +02:00
Andreas Nedbal 12955cc663 Fix design of user and questionboxes 2020-05-07 02:12:44 +02:00
Andreas Nedbal b443aff964 Fix moderation comment layout 2020-05-06 22:54:36 +02:00
Andreas Nedbal e4561862e5 Adjust frontpage text to match master version 2020-05-06 22:22:16 +02:00
Andreas Nedbal 83f51b6422 Add new styling for Devise views 2020-05-06 21:56:10 +02:00
Andreas Nedbal 6c54f8b79f Adjust image spacing in profile settings 2020-05-06 21:29:06 +02:00
Andreas Nedbal 65e66003ee Fix theme deletion not working 2020-05-06 18:51:06 +02:00
Andreas Nedbal 859d2825d1 Remove mention of shutdown from export page 2020-05-06 14:23:11 +02:00
Andreas Nedbal 689dd3880f Adjust texts in tabs/feed template 2020-05-06 13:56:09 +02:00
Andreas Nedbal c142920c6c Adjust answerbox layout on mobile 2020-05-05 05:04:54 +02:00
Andreas Nedbal 22ae1f6655 Adjust navigation layout on main feed pages 2020-05-05 04:31:15 +02:00
Andreas Nedbal aa25e8199f Remove old theme styling file 2020-05-05 03:27:56 +02:00
Andreas Nedbal 83cebe4d9b Fix theme preview not applying
This happens because the generated "preview style tag" is added before the main style one. This change makes sure the theme is rendered right after the application style
2020-05-05 02:03:49 +02:00
Andreas Nedbal 880429f5f9 Add new fields for themes
- In the settings view
- In the model validation
- In the controller parameter permissions
- In the CoffeeScript/Ruby helpers
2020-05-05 02:02:16 +02:00
Andreas Nedbal fe357eaa07 Update layout of the theme settings page 2020-05-04 15:37:13 +02:00
Andreas Nedbal 02cc1c418d WIP: Initial implementation of CSS variable based theming 2020-05-03 17:28:41 +02:00
Andreas Nedbal 9b38b1d736 Refactor comment styles and layout 2020-05-02 21:23:04 +02:00
Andreas Nedbal 85d97b0c71 Rename changed classes across templates 2020-05-02 20:35:48 +02:00
Andreas Nedbal b508eb3f21 Refactor and adjust answerbox styles 2020-05-02 20:35:28 +02:00
Andreas Nedbal 2a8a80e859 Refactor locale panel styles 2020-05-02 18:29:04 +02:00
Andreas Nedbal 28c21dcc3d Refactor smile user list styles 2020-05-02 18:12:55 +02:00
Andreas Nedbal 1e2259fe40 Rename j2-page class to container--main 2020-05-02 17:37:19 +02:00
Andreas Nedbal 185b5a65c8 Refactor notification styling and layout 2020-05-01 21:57:14 +02:00
Andreas Nedbal e8b003fde4 Refactor entry styling and adjust layouts where used 2020-05-01 19:29:05 +02:00
Andreas Nedbal 932c611dab Fix userbox layout on frontpage 2020-05-01 18:55:18 +02:00
Andreas Nedbal 86744a3da4 Refactor userbox styling and layout 2020-05-01 18:38:29 +02:00
Andreas Nedbal 7bd7b91ea4 Refactor and redesign user profile section 2020-04-30 20:35:22 +02:00
Andreas Nedbal 3f0d84a4ad Re-add answer/show template 2020-04-30 20:33:05 +02:00
Andreas Nedbal d61fa91f0d Refactor question styles
- Created styles in component/question
- Removed old styles from scss/panel
- Moved question partial to question controller resource, as it is only used there, not shared
2020-04-30 00:44:43 +02:00
Andreas Nedbal c4c0c44eec Remove old navbar styles and refactor navigation
- Create components/buttons for btn-fab element
- Create components/avatars for defined avatar size classes and behaviour
2020-04-29 18:15:52 +02:00
Andreas Nedbal cc5489c357 Remove group styles and adjust group modal layout 2020-04-29 15:26:50 +02:00
Andreas Nedbal 56bef6a4aa Remove unnecessary styles for "data" page 2020-04-29 14:49:24 +02:00
Andreas Nedbal 45b11bddfd Merge branch 'master' into feature/bootstrap 2020-04-29 02:49:07 +02:00
Georg Gadinger 66527a8c9c views/ajax: delete 2020-04-28 20:39:17 +02:00
Georg Gadinger e07d069c73 Refactor Ajax::*Controllers
Also removed the unused `Ajax::QuestionController#preview` method and
route
2020-04-28 20:28:00 +02:00
Andreas Nedbal d53abd307d Remove no-header classes from profile page 2020-04-28 19:33:54 +02:00
Andreas Nedbal 650751e875 Adjust profile statistics layout
- Instead of being in the sidebar, they are now present as a tabbed navigation
- The questionbox is now present on any layout
2020-04-28 15:03:51 +02:00
Andreas Nedbal 56b63d60b7 Add "navbar-themed" class to use CSS variables in navigation 2020-04-27 18:39:01 +02:00
Andreas Nedbal e9e0a222b0 Merge branch 'master' into feature/bootstrap 2020-04-27 02:11:54 +02:00
Andreas Nedbal 40df3a59d8 Remove "discover" class 2020-04-27 01:55:31 +02:00
Andreas Nedbal 416a12f956 Remove "centre" class 2020-04-27 01:31:43 +02:00
Andreas Nedbal e8a6644998 Refactor frontpage design and styles 2020-04-27 01:18:46 +02:00
Andreas Nedbal 05efd4a42e Refactor jumbotron styles 2020-04-27 00:59:53 +02:00
Andreas Nedbal dcb314d9a5 Adjust footer link visibilty to work with Bootstrap 4 2020-04-26 23:54:02 +02:00
Georg Gadinger dc25b5f0c1 Capitalise organisation name in GitHub urls 2020-04-26 23:18:02 +02:00
Georg Gadinger b2b6419b5d Use HTTPS in links 2020-04-26 23:16:20 +02:00
Georg Gadinger c634d5f03c Update some dead links 2020-04-26 23:12:29 +02:00
Georg Gadinger aeef50ad78
Merge pull request #86 from Retrospring/cleanup
Minor Cleanup
2020-04-26 20:03:46 +02:00
Andreas Nedbal c124138a4a Fix layout issues in questionbox 2020-04-26 17:30:06 +02:00
Andreas Nedbal 7513ef2b9e Clean up answerbox layout 2020-04-26 17:13:31 +02:00
Andreas Nedbal 0afff3f84d Adjustments and smaller fixes
- Fixed initially selected Discover tabs being empty
- Removed spacing classes from inbox templates
- Fixed feed layout and sidebar display
- Adjust some profile layout nits
2020-04-26 16:25:54 +02:00
Andreas Nedbal 1f678b80c1 Fixed issue rendering privilege item partials 2020-04-26 15:27:19 +02:00
Andreas Nedbal b550e78272 Refactor notifications into partials
All notification type layouts have been:

1) present in both the navigation layout and the notification page
2) in a single file

This commit addresses both issues and creates partials for all notfication types.
2020-04-26 15:26:55 +02:00
Andreas Nedbal 1885343900 Clean up main navigation
- Move main navigation into views/navigation
- Split guest navigation into seperate file
- Move main navigation partials into subfolder
- Further adjustments for Bootstrap 4 compatibility
2020-04-26 14:29:23 +02:00
Karina Kwiatek 926631eca3 Remove more left-over references to role fields 2020-04-25 22:23:37 +01:00
Karina Kwiatek 9d933c933e Remove unused (removed) roles from Your Data / Export 2020-04-25 21:14:26 +01:00
Karina Kwiatek 71e62dddcf Remove unused roles from privileges modal 2020-04-25 21:06:36 +01:00
Karina Kwiatek 10a9ca5577 Fix bad replace; update schema.rb 2020-04-25 21:01:46 +01:00
Andreas Nedbal 18d4fad00e Move notification navigation to new location 2020-04-25 20:27:56 +02:00
Andreas Nedbal aeedee8b2f Move moderation navigation to new location 2020-04-25 20:20:00 +02:00
Andreas Nedbal 2fb1966c5b Move feed navigation to new location 2020-04-25 20:11:33 +02:00
Andreas Nedbal e56e65cf40 Further adjustments to inbox layout
- Fixed base styling of cards due to layout differences between panels of Bootstrap 3
- Removed duplicate rendering of sidebar
2020-04-25 19:45:53 +02:00
Andreas Nedbal e15cedd56c Adjust tab classes to Bootstrap 4 2020-04-25 19:02:39 +02:00
Andreas Nedbal a9812f5800 Clean up feed layouts 2020-04-25 18:23:02 +02:00
Andreas Nedbal 2a074227ac Clean up inbox layouts 2020-04-25 18:10:48 +02:00
Andreas Nedbal baf5ba698d Clean up moderation layout 2020-04-25 18:05:35 +02:00
Andreas Nedbal ae4c68a10b Use layout inheritance by convention 2020-04-25 17:54:52 +02:00
Andreas Nedbal 19e7ed557e Remove .html.haml prefix from modal files 2020-04-25 17:52:24 +02:00
Andreas Nedbal 245c6493d3 Clean up notifications layout 2020-04-25 17:51:00 +02:00
Andreas Nedbal 6e22e84081 Clean up user profile layouts 2020-04-25 17:21:39 +02:00
Andreas Nedbal c870b00f65 Clean up user setting layouts 2020-04-25 17:04:23 +02:00
Andreas Nedbal ea77168b50 Port application layout to use parent_layout 2020-04-25 17:03:59 +02:00
Andreas Nedbal 9ee5811243 Remove piwik 2020-04-25 16:22:09 +02:00
Andreas Nedbal 96309eb8ba Move all modals into shared views/modal directory 2020-04-25 15:16:45 +02:00
Andreas Nedbal 3885c24825 Properly align navbar when not signed in 2020-04-25 14:29:52 +02:00
Andreas Nedbal 7767eeae9f Merge branch 'master' into feature/bootstrap 2020-04-25 13:14:01 +02:00
Dominik M. Kwiatek a8c335899d
Use email field for password reset (#77)
Fixes unsubmmittable password reset form
2020-04-22 19:22:16 +01:00
Karina Kwiatek 47fde17560 Remove deprecated gravatar_url method 2020-04-20 23:18:14 +01:00
Georg Gadinger 101b3b68d3 Use cursored pagination, remove WillPaginate 2020-04-20 23:13:24 +02:00
Andreas Nedbal 2dbc6eff01 Adjust navbar styling 2020-04-20 00:04:01 +02:00
Andreas Nedbal 3994917ce9 Adjust notification navigation to Bootstrap 4 2020-04-19 23:42:37 +02:00
Andreas Nedbal 0c3dee30ae Add row to notification list 2020-04-19 23:34:09 +02:00
Andreas Nedbal b5a833e917 Remove superfluous card-default class 2020-04-19 23:31:24 +02:00
Karina Kwiatek 4889071f95 Add JS for dismissing announcements 2020-04-19 22:27:50 +01:00
Andreas Nedbal 21fceccf2f Adjust modal layouts to Bootstrap 4 2020-04-19 23:26:29 +02:00
Andreas Nedbal efd2ff4db0 Convert visibility classes to Bootstrap 4 2020-04-19 23:14:05 +02:00
Andreas Nedbal fa14859a6a Adjust dropdowns to Bootstrap 4 layout 2020-04-19 23:13:39 +02:00
Andreas Nedbal 213eb1d11f Add row classes to fix grid layouts 2020-04-19 23:12:23 +02:00
Andreas Nedbal 33cd5b57a3 Convert panel classes to card classes 2020-04-19 23:11:14 +02:00
Andreas Nedbal 2b39888679 Adjust base navigations Bootstrap 4 2020-04-19 23:03:34 +02:00
Karina Kwiatek 80c6a4272a Fix indentation in new.html.haml 2020-04-19 21:58:08 +01:00
Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements
# Conflicts:
#	db/schema.rb
2020-04-19 21:52:58 +01:00
Karina Kwiatek b6d6c1fded Add announcements to the top of the application template 2020-04-19 21:38:21 +01:00
Georg Gadinger 946bb3ae9d Use Rolify for admin and moderator roles 2020-04-19 22:35:58 +02:00
Karina Kwiatek 473f2cdcc5 Show announcement validation errors on the frontend 2020-04-19 21:26:55 +01:00
Karina Kwiatek 6187cb0b6c Add the ability to edit announcements 2020-04-19 20:58:57 +01:00
Karina Kwiatek f14a168bce Implement deletion of announcements 2020-04-19 20:50:33 +01:00
Karina Kwiatek e3b89f7346 Implement creation of announcements 2020-04-19 20:34:48 +01:00
Karina Kwiatek 8a632a09cd Create Announcement model & controller 2020-04-19 20:12:22 +01:00
Georg Gadinger 6999695ff8 Cleanup 2020-04-19 19:49:47 +02:00
Georg Gadinger 6f6ac3cc7d Merge remote-tracking branch 'origin/master' into rails5 2020-04-19 14:32:47 +02:00
Georg Gadinger 9fa8ef1501 enable 'Discover' page for mods 2020-04-19 13:55:13 +02:00
Georg Gadinger 323f9d91ac Fix NoMethodError on the data page 2020-04-19 01:19:25 +02:00
Georg Gadinger 3e7497a144 Upgrade to Rails 5 2020-04-19 00:59:22 +02:00
Georg Gadinger 66400c87dd Merge remote-tracking branch 'github/master' 2018-05-20 14:18:02 +02:00
liv c0ace7cec4
remove dead bug tracker link 2018-05-15 17:37:13 +02:00
Tina 106b9fd71f twitter.com/retrospringnet -> retrospring 2018-04-29 21:22:16 +02:00
Tina eec1065c83
twitter.com/retrospringnet -> retrospring 2018-04-12 05:40:46 +02:00
Georg Gadinger 4424cb64cd Fix JS translations 2017-04-02 09:04:49 +02:00
Georg Gadinger f8e494094f Evil hack on production for frontend translations 2017-04-01 01:13:16 +02:00
Georg Gadinger 28cc6b5938 Certain features can now be enabled/disabled from config 2017-03-31 22:21:38 +02:00
Georg Gadinger 10d16466fd fuck 2017-03-31 15:13:52 +02:00
Georg Gadinger 9766ede53c Hotfix to not break discover page 2017-03-31 15:11:38 +02:00
Georg Gadinger 3424cc47c9 Hotfix lmao 2017-03-31 15:04:58 +02:00
Georg Gadinger b8701e7626 Make user_screen_name helper use kwargs, add link_only arg 2017-03-30 19:17:25 +02:00
pixeldesu f7d06135ef don't include unnecessary theme files on user profiles 2017-03-29 15:49:27 -07:00
pixeldesu 8d4d2ffce1 apply changes to groups page, adjust heading for header 2017-03-29 15:29:07 -07:00
pixeldesu 598fce6f83 add header classes to profile pages 2017-03-29 15:20:37 -07:00
pixeldesu f345f8628f add header to other profile sections 2017-03-29 15:18:11 -07:00
pixeldesu b153a04b54 remove visible traces of team members 2017-03-29 14:52:26 -07:00
Georg G 573fd89887 added export tab 2016-01-05 21:29:53 +01:00
Georg G b034986e43 update text 2016-01-05 21:11:14 +01:00
Georg G 0deb4c4ccc added export view/controller/routes 2016-01-05 20:54:38 +01:00
funerally b10ca0d736 Fixed twitter link
Fixed broken twitter link on about page.
2015-10-03 00:00:44 -04:00
pixeldesu b0ca8a6219 Fix wording 2015-09-20 15:32:41 +02:00
pixeldesu 08644306fc Update frontpage styling and content 2015-09-20 15:16:24 +02:00
pixeldesu 927d6632c1 make the notification center smaller and shorten content 2015-09-16 23:59:47 +02:00
pixeldesu 24f7ff98ec Fix comment notifications and markdownify content 2015-09-16 22:46:33 +02:00
pixeldesu ede3ad1b92 Update notification design and behaviour
- Add display of content that was replied to/with
- Instead of marking notifications new, only show new items and hide seen entries
- Add a 'New Notifications' page and set it as default
- Add proper display if there are no new notifications
- Adjust theme to fit new changes
2015-09-16 22:18:40 +02:00
pixeldesu 419b578956 fix missing coloring of question panel 2015-09-01 07:45:40 +02:00
pixeldesu a9ad31b285 move check if user is logged in out of template 2015-08-28 16:36:49 +02:00
pixeldesu 8c5badf0b8 fix Retrospring/bugs#95 2015-08-28 16:29:02 +02:00
Yuki bbb1e001e2 swippty swooty comin for that .panel-success > .panel-heading .media * { color: #deadbeef !important } 2015-08-27 05:57:16 +05:30
Yuki 9b7a014121 Panel my panel no default (season 2) 2015-08-27 05:39:10 +05:30
Yuki 71caf3cce5 Several changes to theming, solving a bunch of bugs 2015-08-27 05:30:26 +05:30
pixeldesu 683ce43294 implement pgHero 2015-08-26 21:37:29 +02:00
pixeldesu 107bbb3aeb add entry-subtext styling 2015-08-26 04:14:03 +02:00
pixeldesu d3a7bca68f another occurence of nav tabs instead of list-groups 2015-08-26 01:45:03 +02:00
pixeldesu 764a36e4be %ul.nav -> .list-group 2015-08-25 23:46:49 +02:00
Yuki 010d0a327e i'm about to give up 2015-08-26 02:26:47 +05:30
Yuki 7c68b2a167 PRODUCTION V DEVELOPMENT, ROUND 3 FIGHT 2015-08-26 00:45:08 +05:30
Yuki 6642408b61 Fix show foreign themes bug 2015-08-26 00:35:36 +05:30
pixeldesu 675ba646ea Merge remote-tracking branch 'origin/feature-themes' 2015-08-25 20:55:42 +02:00
Yuki 4b646b7e80 Drop ERB loop 2015-08-26 00:07:55 +05:30
Yuki 54167416f5 Fix ask all button color 2015-08-26 00:02:20 +05:30
Yuki 906692e78f Theming is finished
Previews, settings pane and presets!
2015-08-25 23:57:06 +05:30
Yuki 1912fc3766 Model goop
also made the theme selection logic for user profiles and current user, and the saving logic
2015-08-25 13:56:36 +05:30
Yuki e42f81193b Finalize theme file 2015-08-25 10:48:01 +05:30
Yuki 0bfbbbc856 Theme Progress
New notifications
notifications page
tabs
pills/lists
badges
panel badges
2015-08-25 10:19:25 +05:30
Yuki e7e28efcab Theme Progress
Link color
Notification dropdown text fix
Dropdown select color
Panels
Modals
Buttons, Labels and Alerts
nprogress
fix and rename __THEME_CSS_CACHE to __THEME_CSS_CACHE_V1
2015-08-25 01:26:59 +05:30
Yuki 47344a5774 ThemeHelper.render_theme_with_context 2015-07-29 22:24:33 +05:30
Yuki aec452cbd1 CSS -> SCSS 2015-07-29 22:01:34 +05:30
pixeldesu 9f8c43f8a4 fix #39, copypasta issue 2015-07-29 17:11:20 +02:00
Yuki 3444fcc93e rework some theme code, particlefield now adapts color 2015-07-29 20:38:07 +05:30
Yuki 9ef71a84e9 Merge branch 'master' of github.com:Retrospring/retrospring into feature-themes 2015-07-29 19:52:14 +05:30
Yuki 9734e5463e Merge pull request #33 from colons/master
Do not declare mobile app capability
2015-07-28 04:33:56 +05:30
Yuki 21f2467f45 Fix question pagination 2015-07-25 23:18:27 +05:30
Yuki 12b2ec8a3b Turbolinks stop removing the god damn spreadsheet you twat 2015-07-24 22:44:16 +05:30
Yuki 54b051a7e7 Temp. layout for testing 2015-07-24 22:42:14 +05:30
pixeldesu 6ea04faf4f update show_follow JS to address changes 2015-07-24 17:14:42 +02:00
pixeldesu 6f65f8c9f4 Merge branch 'feature-userbox-header' 2015-07-24 17:10:28 +02:00
pixeldesu 5ce5d69e4a remove the TODO from the userbox 2015-07-24 17:09:17 +02:00
pixeldesu 1a9660bc05 update userbox style with headers 2015-07-24 17:04:46 +02:00
Iain Dawson 92ffb71c3b Do not declare mobile app capability. 2015-07-24 08:15:44 +01:00
Yuki 5c2168b9af The copy paste is strong 2015-07-23 23:23:51 +05:30
Yuki deb6d12108 Moderation Priority + IP 2015-07-23 23:21:13 +05:30
Yuki 5c86833601 Fix emails 2015-07-23 12:12:36 +05:30
Yuki 38d1c21118 Someone wanted even paddings, here you go. also made the support more wide. 2015-07-23 11:50:21 +05:30
Yuki 54e27896f4 Add missing ='s to text templates 2015-07-21 23:57:59 +05:30
Yuki eb85f38220 Fix text, add more templates 2015-07-21 23:50:54 +05:30
Yuki 362292716f Mail templating, hopefully 2015-07-21 23:43:14 +05:30
pixeldesu 19d6ccd855 change logic for deletion when no user or no question is found 2015-07-17 22:31:10 +02:00
pixeldesu e1d38ebb89 removing more logic from templates + simpler coffeescript 2015-07-17 21:45:45 +02:00
pixeldesu 84f80c824e fix broken pagination and wrong question count for deletion 2015-07-17 20:54:11 +02:00
pixeldesu e9ae442431 add ability to show/search questions from specific users 2015-07-17 20:29:19 +02:00
pixeldesu ca41890ada replaced big avatar image on main timeline page 2015-06-28 01:36:58 +02:00
Yuki 409c82b5ed Flag switcher 2015-06-21 12:33:29 +05:30
pixeldesu aab109dd42 add sign in count to data page 2015-06-21 04:35:27 +02:00
pixeldesu c600b0562a copycat mistakes 2015-06-20 21:15:38 +02:00
pixeldesu f76e997708 empty != blank 2015-06-20 21:09:30 +02:00
pixeldesu 58e80919df add data page 2015-06-20 20:38:07 +02:00
pixeldesu c1faf41305 added translator badge to profiles 2015-06-19 14:46:23 +02:00
pixeldesu 1daa44f5bf fixes Retrospring/bugs#82 2015-06-17 12:07:51 +02:00
Georg G 53fe52b3b6 fixed wrong style on timestamps in answerbox 2015-06-09 18:24:27 +02:00
Yuki e5ecea8414 Fix third-person notifications showing the wrong user 2015-06-09 21:19:29 +05:30
Yuki 649b1cda3b Fix Retrospring/bugs#77 2015-06-09 17:57:49 +05:30
Yuki 428bd99a63 Fix another issue 2015-06-09 09:36:09 +05:30
pixeldesu 341372d874 finalize 2015-06-08 21:51:46 +02:00
pixeldesu a8fd3624b6 localize even more final stuff 2015-06-08 21:11:35 +02:00
pixeldesu d28f64adf1 localize placeholders 2015-06-08 20:48:23 +02:00
pixeldesu 7c5f9b082a add missing profile setting locales 2015-06-08 16:05:20 +02:00
pixeldesu 488d582afa add i18n-js and localize javascript (not implemented yet) 2015-06-08 16:01:16 +02:00