MaketRandevu/assets/css
Alex Tselegidis a3b8228122 Merge branch 'master' into develop
# Conflicts:
#	application/config/autoload.php
#	application/config/config.php
#	application/controllers/Appointments.php
#	application/controllers/Backend.php
#	application/controllers/Backend_api.php
#	application/controllers/Captcha.php
#	application/controllers/Console.php
#	application/controllers/Google.php
#	application/controllers/Installation.php
#	application/core/EA_Controller.php
#	application/core/EA_Model.php
#	application/libraries/Google_sync.php
#	application/libraries/Ics_file.php
#	application/models/Settings_model.php
#	application/views/appointments/book_success.php
#	assets/css/layouts/backend_layout.scss
#	assets/css/no_privileges.css
#	assets/js/backend_calendar_table_view.js
#	assets/js/backend_calendar_unavailability_events_modal.js
#	assets/js/frontend_book.js
#	assets/js/general_functions.js
#	assets/js/pages/booking_confirmation.js
#	assets/js/working_plan_exceptions_modal.js
#	composer.json
#	composer.lock
#	docs/console.md
#	docs/docker.md
#	docs/faq.md
#	docs/get-involved.md
#	docs/google-calendar-sync.md
#	docs/installation-guide.md
#	docs/manage-translations.md
#	docs/readme.md
#	docs/rest-api.md
#	docs/update-guide.md
#	gulpfile.js
#	system/core/Input.php
#	system/core/Output.php
#	system/core/Security.php
#	system/libraries/Session/drivers/Session_files_driver.php
2022-03-25 10:53:46 +01:00
..
components Create new color selection component. 2022-01-18 18:54:36 +01:00
layouts Make the captcha challenges more user friendly. 2022-01-26 22:04:33 +01:00
pages Update the project subtitle. 2022-01-18 13:05:42 +01:00
_bootswatch.scss Increase contrast for visual elements. 2022-01-24 14:18:47 +01:00
_variables.scss Import new bootwatch theme and adjust the styling of the app elements for better display 2022-01-24 12:55:45 +01:00
bootstrap.scss Import new bootwatch theme and adjust the styling of the app elements for better display 2022-01-24 12:55:45 +01:00
general.scss Message box button styling. 2022-01-24 14:10:49 +01:00
index.html Moved source files to the root directory. 2020-03-11 10:24:25 +01:00
no_privileges.css Merge branch 'master' into develop 2022-03-25 10:53:46 +01:00