8000 Polish peek view for inline reviews by donokuda · Pull Request #1080 · github/VisualStudio · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Polish peek view for inline reviews #1080

Merged
merged 69 commits into from
Aug 8, 2017
Merged

Polish peek view for inline reviews #1080

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
858ad49
Start updating the comment glyph
donokuda Jul 14, 2017
a4ddc60
Good enough to be centered
donokuda Jul 14, 2017
1484429
Set dimensions on canvas and something about line endings
donokuda Jul 14, 2017
84e1662
Update CommentView styles
donokuda Jul 18, 2017
6353aa4
Theme peek window toolbar
donokuda Jul 18, 2017
b6e9d76
Bind background color to peek view
donokuda Jul 18, 2017
25b3343
Theme the comment reply textbox
donokuda Jul 18, 2017
ca08c3f
Theme the reply box border
donokuda Jul 18, 2017
7ec6d8d
Adjust margins for button area in comment section
donokuda Jul 18, 2017
daa8f84
Merge branch 'master' into ui/inline-themes
donokuda Jul 18, 2017
9ba4fac
Merge remote-tracking branch 'origin/master' into ui/margin-polish
donokuda Jul 19, 2017
a81fff4
Oh just fixing what I broke nothing to see here
donokuda Jul 19, 2017
e004037
Merge branch 'master' of https://github.com/github/VisualStud 8000 io into …
donokuda Jul 19, 2017
e78b629
Update colors for Comment glyphs
donokuda Jul 19, 2017
290f804
Basic theming for TooltipCommentThreadView
jcansdale Jul 20, 2017
045d177
Merge branch 'master' into ui/inline-themes
jcansdale Jul 20, 2017
c2aee39
Avoid squiggles by adding DesignTimeResources.xaml
jcansdale Jul 20, 2017
209a44d
Theme glyph background color using DiffChangeType
jcansdale Jul 20, 2017
e61e38e
Pass background colors to glyphs via a ResourceDictionary
jcansdale Jul 20, 2017
3b70c76
Make SharedDictionary.xaml resources available to glyphs
jcansdale Jul 20, 2017
9544e21
Add SharedDictionarys to DesignTimeResources.xaml
jcansdale Jul 20, 2017
94f2d8d
Something about background colors
donokuda Jul 20, 2017
38130b2
Do glyph DiffChangeType styling via Theme*.xaml
jcansdale Jul 21, 2017
3ef16c2
Use GitHubVsBrandedUIBorder resource for separator color
jcansdale Jul 21, 2017
4941dbd
Prefer WindowText for timestamp color (and set opacity instead)
donokuda Jul 21, 2017
db1e3a3
Merge branch 'ui/inline-themes' of https://github.com/github/VisualSt…
donokuda Jul 21, 2017
cd95652
Merge branch 'ui/margin-polish' into ui/inline-themes
donokuda Jul 21, 2017
17c0443
Bring back the fill colors
donokuda Jul 21, 2017
6e1750f
Try out some new gutter colors
donokuda Jul 21, 2017
8aee33d
Use a bluer color in light theme for none changed diff type
donokuda Jul 21, 2017
5ed1e99
Actually, something more purple
donokuda Jul 21, 2017
1bb641c
Remove commented xaml
donokuda Jul 21, 2017
aeedb1e
Rationalize the use of SharedDictionaryManager
jcansdale Jul 24, 2017
cdd40eb
Merge branch 'master' into ui/inline-themes
donokuda Jul 24, 2017
0c396aa
Update Add/Delete fill colors for comment glypths
donokuda Jul 24, 2017
1272564
Merge branch 'ui/inline-themes' of https://github.com/github/VisualSt…
donokuda Jul 24, 2017
af48b5d
Use a square icon for adding comments instead
donokuda Jul 24, 2017
1f44318
Fix border
donokuda Jul 24, 2017
71821b0
Adjust blue for dark theme
donokuda Jul 24, 2017
ee3a425
Make VsColor/VsBrush resources visible to designer
jcansdale Jul 25, 2017
e40fb48
Merge branch 'ui/inline-themes' into ui/vs-colors-and-brushes
jcansdale Jul 25, 2017
cf40358
Remove diff colors from comment margin
jcansdale Jul 27, 2017
569257c
Merge branch 'master' into ui/inline-themes
shana Jul 27, 2017
b6781f3
Smaller avatars
donokuda Aug 3, 2017
57f5321
Unbox the comment view
donokuda Aug 3, 2017
d9774c6
Remove avatar in reply section
donokuda Aug 3, 2017
e17cb9b
Use VS color for the peekview command bar
donokuda Aug 3, 2017
75b3531
Update icon fills
donokuda Aug 4, 2017
57c044c
Fix icon alignments
donokuda Aug 4, 2017
9c121be
Fix hover styles
donokuda Aug 4, 2017
9bce4b3
Merge branch 'master' into ui/inline-themes
shana Aug 4, 2017
b0af9ba
Fix merge
shana Aug 4, 2017
f14b716
Use windowtext key for markdown viewer
donokuda Aug 4, 2017
589d986
Add a separator between the comment field
donokuda Aug 5, 2017
82e60b2
Merge branch 'master' into ui/inline-themes
grokys Aug 7, 2017
8d56e76
Merge branch 'ui/inline-themes' of https://github.com/github/VisualSt…
donokuda Aug 7, 2017
593b19f
Merge branch 'master' into ui/inline-themes
donokuda Aug 7, 2017
7f04075
Add GitHubPeekViewBackground brush
donokuda Aug 7, 2017
3a1e4e0
Update PromptTextBox background color
donokuda Aug 7, 2017
71e8d79
Update margin background colors
donokuda Aug 7, 2017
aebb7a7
Update styles for codeblocks
donokuda Aug 7, 2017
744a910
Remove unneeded triggers
donokuda Aug 8, 2017
bff81de
Remove unused colors
donokuda Aug 8, 2017
fd862e8
Add a little more top margin for comments
donokuda Aug 8, 2017
2ba07ba
Finesse some margin glyph stuff
donokuda Aug 8, 2017
025ee71
Remove unneeded background declaration
donokuda Aug 8, 2017
abd2d0b
Remove all the unneccesary borders in the margin
donokuda Aug 8, 2017
3f4bd13
Merge branch 'master' into ui/inline-themes
donokuda Aug 8, 2017
903b958
Merge branch 'master' into ui/inline-themes
grokys Aug 8, 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
Prev Previous commit
Next Next commit
Rationalize the use of SharedDictionaryManager 
Avoid defining for each glyph (just so resources show in designer).
  • Loading branch information
@jcansdale
jcansdale committed Jul 24, 2017
commit aeedb1e1afe8aa1c9f02ca0970792f018f34cc0c
4 changes: 4 additions & 0 deletions src/GitHub.InlineReviews/Properties/DesignTimeResources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/GitHub.VisualStudio.UI;component/Styles/ThemeBlue.xaml" />
</ResourceDictionary.MergedDictionaries>

</ResourceDictionary>
12 changes: 1 addition & 11 deletions src/GitHub.InlineReviews/Tags/AddInlineCommentGlyph.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d">

<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>

<!-- GitHubDiffChangeBackground.* are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml -->
<!-- Resourcess are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml (and Properties\DesignTimeResources.xaml) -->
<UserControl.Style>
<Style TargetType="UserControl">
<Style.Triggers>
Expand Down
12 changes: 1 addition & 11 deletions src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,7 @@
mc:Ignorable="d"
ToolTipService.ShowDuration="600000">
< 8000 br>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>

<!-- GitHubDiffChangeBackground.* are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml -->
<!-- Resourcess are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml (and Properties\DesignTimeResources.xaml) -->
<UserControl.Style>
<Style TargetType="UserControl">
<Style.Triggers>
Expand Down
2 changes: 0 additions & 2 deletions src/GitHub.InlineReviews/Views/GlyphMarginGrid.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<Grid.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
Expand Down
0