Skip to content
Snippets Groups Projects

Syntax highlighting

Closed Petr Šťastný requested to merge (removed):syntax-highlighting into master

Syntax Highlighting, started in #78 (closed).

Screenshot_from_2018-08-21_21-40-07

Edited by Petr Šťastný

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Deimos
  • Deimos
  • Deimos
  • Deimos
  • Deimos
  • Thanks, this looks quite good, just a few things that will need updating.

    I'm finished reviewing for now, let me know if you need help with anything or when you're ready for review again.

  • Petr Šťastný added 38 commits

    added 38 commits

    • a002d82d...d5fe6379 - 30 commits from branch tildes:master
    • a56c7e61 - Users can now mark used language in code blocks. It is passed to server in class…
    • 264b18c0 - Used Pygments to add CSS classes to code
    • 9a46d9dc - Added styles for syntax highlighting
    • 565724dd - Fixed bug with no info string
    • 4e7dc40a - Added Pygments to requirements-freeze and sorted imports
    • 71c9dfaf - Unknown language no longer throws exception
    • 44fe7983 - Tweaked highlighting colors
    • 793c1e00 - Users can no longer add custom css classes to span and div elements

    Compare with previous version

  • added 1 commit

    • bd396f9b - Fixed git conflict in requirements-to-freeze

    Compare with previous version

  • Petr Šťastný resolved all discussions

    resolved all discussions

  • Petr Šťastný changed the description

    changed the description

  • To have different highlighting for different themes, you'd need to put it inside the _themes.scss file: https://gitlab.com/tildes/tildes/blob/master/tildes/scss/_themes.scss

    You could probably have it defined as a mixin in a separate file and just include it here, so that the huge block of styles doesn't need to be inside the _themes.scss file itself. I don't know if you want to try to set that up, but I can just do it in a follow-up commit if you want (switching to Solarized light/dark highlighting). If you do want to try, here are Pygments styles for light and dark: https://gist.github.com/nicolashery/5765395

  • Deimos
  • Deimos
  • Deimos
  • Deimos
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading