Skip to content

borrow styling from exec.py #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 20, 2017
Merged

borrow styling from exec.py #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fdd572
borrow styling from exec.py
braver Jul 20, 2017
b2167dd
restore example image
braver Jul 20, 2017
f62ce03
heading
braver Jul 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Preferences.sublime-settings
View file
Open in desktop

This file was deleted.

15 changes: 2 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@ View on [packagecontrol.io](https://packagecontrol.io/packages/Git%20blame)

> Right click > Git blame

## Example

## Examples


### Light scheme
![image](https://cloud.githubusercontent.com/assets/1134201/23709870/bcde89cc-0412-11e7-9464-3f97713bf747.png)

Light: (with a light theme)

![image](https://cloud.githubusercontent.com/assets/1134201/23709882/ce0c2ea2-0412-11e7-9bac-e5297629a15a.png)


### Dark scheme
![image](https://cloud.githubusercontent.com/assets/1134201/23709854/acfe8ed0-0412-11e7-8329-3aa51e530d19.png)
![image](https://user-images.githubusercontent.com/2543659/28410198-331b1ec8-6d3d-11e7-9ac1-57d43fb6ab60.png)
76 changes: 44 additions & 32 deletions git-blame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,57 @@
import subprocess
from subprocess import check_output as shell


template_scheme = {}
template_scheme['light'] = '''
<style>
span {
background-color: #aee;
color: #444;
}
strong, a {
text-decoration: none;
color: #000;
}
</style>
'''
template_scheme['dark'] = '''
<style>
span {
background-color: brown;
}
a {
text-decoration: none;
}
</style>
stylesheet = '''
<style>
div.blame-arrow {
border-top: 0.4rem solid transparent;
border-left: 0.5rem solid color(var(--greenish) blend(var(--background) 30%));
width: 0;
height: 0;
}
div.blame {
padding: 0.4rem 0 0.4rem 0.7rem;
margin: 0 0 0.2rem;
border-radius: 0 0.2rem 0.2rem 0.2rem;
background-color: color(var(--greenish) blend(var(--background) 30%));
}
div.blame span.message {
padding-right: 0.7rem;
}
div.blame a {
text-decoration: inherit;
}
div.blame a.close {
padding: 0.35rem 0.7rem 0.45rem 0.8rem;
position: relative;
bottom: 0.05rem;
border-radius: 0 0.2rem 0.2rem 0;
font-weight: bold;
}
html.dark div.blame a.close {
background-color: #00000018;
}
html.light div.blame a.close {
background-color: #ffffff18;
}
</style>
'''

template = '''
<span>
{scheme}
&nbsp;<strong>Git Blame:</strong> ({user})
<body>
{stylesheet}
<div class="blame-arrow"></div>
<div class="blame">
<span class="message">
<strong>Git Blame:</strong> ({user})
Updated: {date} {time} |
{sha}
<a href="copy-{sha}">[Copy]</a>
<a href="show-{sha}">[Show]</a>
<a href="close"><close>[X]</close></a>&nbsp;
<a class="close" href="close">''' + chr(0x00D7) + '''</a>
</span>
</div>
</body>
'''

# Sometimes this fails on other OS, just error silently
Expand Down Expand Up @@ -130,11 +146,7 @@ def run(self, edit):

sha, user, date, time = self.parse_blame(result)

settings = sublime.load_settings('Preferences.sublime-settings')
scheme_color = settings.get('gitblame.scheme') or 'dark'

body = template.format(sha=sha, user=user, date=date, time=time,
scheme=template_scheme.get(scheme_color, ''))
body = template.format(sha=sha, user=user, date=date, time=time, stylesheet=stylesheet)

phantom = sublime.Phantom(line, body, sublime.LAYOUT_BLOCK, self.on_phantom_close)
phantoms.append(phantom)
Expand Down