Commit Graph

1405 Commits

Author SHA1 Message Date
Andreas Nedbal 9d5d205ded Fix muted text variant not overriding Bootstrap default 2020-05-05 02:02:49 +02:00
Andreas Nedbal 04c4e4c7f1 Add variables for light/dark color variants 2020-05-05 02:02:33 +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 53979580d8 Merge branch 'master' into feature/bootstrap 2020-05-04 23:19:54 +02:00
Andreas Nedbal a3a1250dcf Fix default text color of list group actions 2020-05-04 20:47:00 +02:00
Andreas Nedbal d93548891d Remove obsolete render_theme_with_context 2020-05-04 17:26:57 +02:00
Andreas Nedbal e7c5b1a4a3 Remove theme preview route and logic 2020-05-04 17:26:38 +02:00
Andreas Nedbal 582f8606b0 Changed theme preview to work without hitting an endpoint 2020-05-04 17:26:18 +02:00
Andreas Nedbal fe357eaa07 Update layout of the theme settings page 2020-05-04 15:37:13 +02:00
Andreas Nedbal 9235533f59 Adjust button styles for theming
- Default (unstyled) buttons use the body text color
- Colored buttons use their text color equivalent
2020-05-03 21:57:19 +02:00
Andreas Nedbal a36bcf6cd3 Add Bootstrap modal overrides for CSS variables 2020-05-03 21:44:12 +02:00
Andreas Nedbal ea638305cc Fix customized hover/focus styles for list group items 2020-05-03 20:39:45 +02:00
Andreas Nedbal 1eddb0ad36 Adjust input styling to be a bit more lenient in themes 2020-05-03 20:39:21 +02:00
Andreas Nedbal a6b21a85e5 Add more theming changes to dropdowns 2020-05-03 20:24:32 +02:00
Andreas Nedbal 241b8cbdcb Rename card variables to "raised" 2020-05-03 20:10:50 +02:00
Andreas Nedbal 02cc1c418d WIP: Initial implementation of CSS variable based theming 2020-05-03 17:28:41 +02:00
Andreas Nedbal 51bef29ace More style adjustments to default and core elements 2020-05-03 17:28:19 +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 1f5ec4e28d Remove unused variable file 2020-05-02 17:47:07 +02:00
Andreas Nedbal 7601da1975 Remove unused panel styles 2020-05-02 17:44:43 +02:00
Andreas Nedbal f40435da4b Remove unused classes from base and add imports to main file 2020-05-02 17:38:23 +02:00
Andreas Nedbal 22ef4f4656 Add smiles scss component 2020-05-02 17:37:58 +02:00
Andreas Nedbal 948bc27810 Add body element scss file for body style adjustments 2020-05-02 17:37:42 +02:00
Andreas Nedbal 1e2259fe40 Rename j2-page class to container--main 2020-05-02 17:37:19 +02:00
Andreas Nedbal 4e9311c25b Add generic navbar-height variable 2020-05-02 17:36:40 +02:00
Andreas Nedbal 2c11272bd4 Move utility class to utilities file 2020-05-02 17:36:22 +02:00
Andreas Nedbal 8c3ff8f31d Add overrides for growls and sweet-alert 2020-05-02 17:36:05 +02:00
Georg Gadinger 0109322610 add spec for Ajax::ModerationController 2020-05-01 22:41:26 +02:00
Andreas Nedbal 185b5a65c8 Refactor notification styling and layout 2020-05-01 21:57:14 +02:00
Andreas Nedbal aa5ca6c64a Remove unused variables and move remaining ones to proper file 2020-05-01 19:50:51 +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 33e2533467 Add overrides files for bs-datetimepicker and minicolors 2020-05-01 18:38:49 +02:00
Andreas Nedbal 86744a3da4 Refactor userbox styling and layout 2020-05-01 18:38:29 +02:00
Georg Gadinger 3e95d5ebeb add spec for Ajax::ReportController 2020-05-01 10:17:05 +02:00
Georg Gadinger 6f3f3afa2f add spec for Ajax::GroupController 2020-05-01 10:17:05 +02:00
Georg Gadinger 54532c71e1 add spec for Ajax::QuestionController
also fix some minor annoyances
2020-05-01 10:17:05 +02:00
Georg Gadinger 1824fb1c25 add spec for Ajax::InboxController 2020-05-01 10:17:05 +02:00
Georg Gadinger dd5f718f31 Question: user association is optional 2020-05-01 10:17:05 +02:00
Georg Gadinger d492cd34f6 AjaxController: also rescue from StandardError 2020-05-01 10:17:05 +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 e8bbf2c2f1 Adjust casing of $colorNames variable 2020-04-29 18:26:15 +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 77b650ed86 Remove unused "about--moderator" styles 2020-04-29 15:49:13 +02:00
Andreas Nedbal cc5489c357 Remove group styles and adjust group modal layout 2020-04-29 15:26:50 +02:00
Andreas Nedbal 0bf0b7d6da Remove more "no-header" styles for profiles 2020-04-29 14:49:43 +02:00
Andreas Nedbal 56bef6a4aa Remove unnecessary styles for "data" page 2020-04-29 14:49:24 +02:00
Andreas Nedbal ea36f7e218 Remove mobile specific profile styles 2020-04-29 14:48:35 +02:00
Andreas Nedbal 91a7f7ed33 Fix wrong partial in Ajax::CommentController#create 2020-04-29 14:01:48 +02:00
Andreas Nedbal b22c7d358c Fix wrong partial path in Ajax::AnswerController#create 2020-04-29 13:33:53 +02:00
Andreas Nedbal 45b11bddfd Merge branch 'master' into feature/bootstrap 2020-04-29 02:49:07 +02:00
Georg Gadinger 29a5d0408c ajax_controller: fix variable name 2020-04-28 21:42:41 +02:00
Georg Gadinger 66527a8c9c views/ajax: delete 2020-04-28 20:39:17 +02:00
Georg Gadinger 2f2b9ab1f4 New Relic be like: *notices your errors* OwO what's this? 2020-04-28 20:32:36 +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 22197a9e51 Add Bootstrap input CSS variable overrides 2020-04-28 15:56:38 +02:00
Andreas Nedbal 01499797a1 Add Bootstrap text-muted CSS variable override 2020-04-28 15:52:20 +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 ddb2537926 Add Bootstrap dropdown CSS variable overrides 2020-04-28 15:02:23 +02:00
Andreas Nedbal a0c99574ba Fix usage of deprecated size() method 2020-04-28 13:26:20 +02:00
Andreas Nedbal e7d076d699 Add missing --color-text variables for themes 2020-04-28 13:19:59 +02:00
Andreas Nedbal 93fc9c2963 Add Bootstrap alert CSS variable overrides 2020-04-28 13:17:02 +02:00
Andreas Nedbal aa453ab770 Moved $colors list into variables
Also renamed it because it would cause a collission with Bootstraps $colors surely at some point.
2020-04-28 13:07:16 +02:00
Andreas Nedbal a7cefa11b3 Add customizable hover styles to buttons 2020-04-27 19:57:10 +02:00
Andreas Nedbal 1951779c00 Fix Jumbotron styles being broken due to adjusted *-text behaviour 2020-04-27 18:39:24 +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 76c91180b0 Added overrides for Bootstrap styles to use CSS variables 2020-04-27 18:38:24 +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 61dbfda395 Remove panel overide styles 2020-04-27 01:36:37 +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 5550dd9100 Move variables to style root 2020-04-26 23:55:28 +02:00
Andreas Nedbal 84ee5eec68 Adjust background color of website 2020-04-26 23:54:26 +02:00
Andreas Nedbal dcb314d9a5 Adjust footer link visibilty to work with Bootstrap 4 2020-04-26 23:54:02 +02:00
Georg Gadinger acc394a110
Merge pull request #88 from Retrospring/replace-dead-links
Replace dead links
2020-04-26 23:44:31 +02:00
Georg Gadinger 6a0d9063ba Revert "Prevent the Return key from submitting while composing using an IME"
This reverts commit d13f1cf7b8.
2020-04-26 23:40: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
Andreas Nedbal 711d6a9f4e WIP: Add initial overrides for Bootstrap 4 styling 2020-04-26 21:48:25 +02:00
Andreas Nedbal 8d9f1d5efb Adjust list_group_item helper for Bootstrap 4 2020-04-26 21:48:02 +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 4917ce46d3 Fix "nav-item" assigning class in nav_entry helper 2020-04-26 14:30:23 +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 f42cc6aed9 Remove all other references to removed roles 2020-04-25 21:20:02 +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 8b8a5a1e72 Add parent_layout helper 2020-04-25 17:02:59 +02:00
Andreas Nedbal 9ee5811243 Remove piwik 2020-04-25 16:22:09 +02:00
Dominik M. Kwiatek 9f992d398f
Fix exception being thrown upon attempting to ban a user (#82) 2020-04-25 14:51:28 +01:00
Karina Kwiatek d13f1cf7b8 Prevent the Return key from submitting while composing using an IME
Based on the following article by Michael Stum:
https://www.stum.de/2016/06/24/handling-ime-events-in-javascript/
2020-04-25 14:35:04 +01: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
Georg Gadinger 445d9ebe2a Fix user questions page 2020-04-23 03:31:07 +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 3aa2e5899c Remove JoJoke 2020-04-22 15:51:45 +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
Dominik M. Kwiatek 516bc48aa0
Merge pull request #70 from Retrospring/feature/announcements
Implement Announcements
2020-04-19 23:10:47 +01: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
Georg Gadinger 477ec3e9c9 Do not allow creation of groups with empty names 2020-04-19 23:28:50 +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 a505e7ee71 Ensure we're logged in as an admin when using the AnnouncementController 2020-04-19 21:45:07 +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 2ecc746e23 Implement validation for announcements 2020-04-19 21:11:22 +01:00
Karina Kwiatek 6187cb0b6c Add the ability to edit announcements 2020-04-19 20:58:57 +01:00