Skip to content
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.

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

Windows8 theme #52

Merged
merged 79 commits into from
Jan 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
4c44f64
Make a copy of Office 2010 as a base for Windows 8 Theme.
pekspro Jan 11, 2015
49eafe9
Fix backstage button
pekspro Jan 11, 2015
445b975
Backstage cleanup
pekspro Jan 11, 2015
6f033a2
Fix application menu button
pekspro Jan 11, 2015
cb35c0b
Remove gradient behind title bar
pekspro Jan 11, 2015
758a986
Remove animation when hovering over a ribbon group
pekspro Jan 11, 2015
daf635c
Set background behind tab control (not sure if this is correct).
pekspro Jan 11, 2015
4b89f01
Improve ribbon tab item
pekspro Jan 11, 2015
aa3006c
Remove soft corners on toggle button
pekspro Jan 11, 2015
a79ef26
Change selection color.
pekspro Jan 11, 2015
1cf891e
Change tab control background.
pekspro Jan 11, 2015
2c828bd
Button cleanup.
pekspro Jan 11, 2015
59b968c
Remove gradient from title bar.
pekspro Jan 11, 2015
f6ff429
Improve tab control
pekspro Jan 13, 2015
adc7a97
Fix checkbox
pekspro Jan 13, 2015
125cb49
Remove corner radius from drop down button.
pekspro Jan 13, 2015
90964b7
Remove corner radius from combo box item.
pekspro Jan 13, 2015
e51444b
Fix stupid error in test application.
pekspro Jan 14, 2015
ec37d0e
Create color definitions for button
pekspro Jan 14, 2015
c9c171b
Clean up toggle button
pekspro Jan 14, 2015
6833408
Clean up button and fix colors.
pekspro Jan 14, 2015
827160a
Fix drop down button style (not list yet).
pekspro Jan 14, 2015
0ac792c
Change split button
pekspro Jan 15, 2015
917a799
Fix bad colors
pekspro Jan 15, 2015
4ff1f4b
Remove corner radius from menu.
pekspro Jan 15, 2015
b572a7c
Menu item clean up.
pekspro Jan 15, 2015
44b530b
Fix gallery item.
pekspro Jan 15, 2015
90c17a3
Fix in ribbon gallery.
pekspro Jan 15, 2015
747b762
Remove corner radius.
pekspro Jan 15, 2015
16ff425
Remove black and blue color from the Windows 8 theme
pekspro Jan 16, 2015
ea552d7
Fix comboboxitem
pekspro Jan 16, 2015
e08bbbf
Changees in RibbonComboButtonControlTemplate
pekspro Jan 16, 2015
3929431
Fix buton in combo box.
pekspro Jan 16, 2015
080c59d
Remove gradiend from drop down button.
pekspro Jan 16, 2015
e21b4b9
Remove gradient from button.
pekspro Jan 16, 2015
423970a
Change gallery and button border color.
pekspro Jan 16, 2015
ee47d9e
Minor change in ribbon color.
pekspro Jan 16, 2015
457cc1a
Tweaks on tabs
pekspro Jan 16, 2015
156743b
More tweaks.
pekspro Jan 16, 2015
9ffc00f
Change tab item for Windows 8 theme
pekspro Jan 17, 2015
194607b
Remove gradient from line in tabcontrol
pekspro Jan 17, 2015
6c61d5e
Change margin on contextual tab.
pekspro Jan 17, 2015
e31d24c
Final (?) margin changes on tab control.
pekspro Jan 17, 2015
a73c6ef
Fix minor issue with split button.
pekspro Jan 17, 2015
1565733
Remove generated file
pekspro Jan 17, 2015
cb9fbca
Improved application menu.
pekspro Jan 18, 2015
ad14632
Minor quick access toolbar tweaks
pekspro Jan 18, 2015
354130b
Change ButtonHoverOuterBorderBrush to ButtonHoverBorderBrush
pekspro Jan 20, 2015
338ccb2
Change size on split button (which introduce a minor problem).
pekspro Jan 21, 2015
a0b3a92
Clean up in RibbonStatusBarContextMenuItemControlTemplate (how to tes…
pekspro Jan 21, 2015
21dc03f
Clean ups
pekspro Jan 21, 2015
dd647a2
Remove gradient from backstagetabitem.
pekspro Jan 23, 2015
a1206bd
Clean up back stage controls (not tested)
pekspro Jan 23, 2015
85876a5
Clean up color gallery
pekspro Jan 23, 2015
2ced32d
Clean up ribbon group box
pekspro Jan 23, 2015
342237f
Clean up spinner.
pekspro Jan 23, 2015
52102a6
Clean up slider.
pekspro Jan 23, 2015
1c02ed1
Rename color usage in RibbonScrollViewer
pekspro Jan 24, 2015
c230877
Color renaming in RibbonTabControlToggleButtonControlTemplate
pekspro Jan 24, 2015
92674de
Final clean up of button "inner/outer" colors.
pekspro Jan 24, 2015
f122c29
Remove gradients from group box separators.
pekspro Jan 24, 2015
9b2bc2d
Make spinners looks a little bit better.
pekspro Jan 24, 2015
52b520b
Clean up status bar.
pekspro Jan 24, 2015
3e11010
Clean up RibbonSeparatorBackgroundBrush. But don't understand how it'…
pekspro Jan 24, 2015
576273e
Remove unused color
pekspro Jan 24, 2015
6b149c7
Change back stage upper line.
pekspro Jan 24, 2015
4b1e67c
Remove shadow from back stage menu.
pekspro Jan 24, 2015
e74f9c8
Split button looks better in medium mode (still not perfect).
pekspro Jan 24, 2015
b7741a1
Improve split button in small mode.
pekspro Jan 24, 2015
4fecd13
Add border in split button small/medium
pekspro Jan 24, 2015
d34b2f1
Change to darker glyph color
pekspro Jan 24, 2015
088cf98
Remove customized scrollbar
pekspro Jan 25, 2015
b9c0425
Simplified repeat button.
pekspro Jan 25, 2015
9c5ec91
Improve split button
pekspro Jan 25, 2015
5eb12a9
Removed todo
pekspro Jan 25, 2015
595f144
Final fixes to make split button look good.
pekspro Jan 29, 2015
c2a9e71
Actual last changes to make split button look good.
pekspro Jan 29, 2015
1b2ffac
All references to images in the Windows 8 theme using images from Off…
pekspro Jan 29, 2015
6b76493
Remove duplicate files from Windows 8 Theme, using files from Office …
pekspro Jan 29, 2015
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
222 changes: 220 additions & 2 deletions Fluent/Fluent dotNET 4.0.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Utf8Output>true</Utf8Output>
<ExpressionBlendVersion>4.0.20621.0</ExpressionBlendVersion>
<BaseIntermediateOutputPath>..\build\obj\NET 4.0</BaseIntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\</IntermediateOutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -589,6 +589,218 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<None Include="Themes\Windows8\Colors\Colors.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<Page Include="Themes\Windows8\Colors\ColorsSilver.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<None Include="Themes\Windows8\Common.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ApplicationMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ApplicationMenuItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Backstage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\BackstageControls.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\BackstageTabControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\BackstageTabItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Button.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\CheckBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ColorGallery.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ComboBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ComboBoxItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\DropDownButton.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\EmptyFocusStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Gallery.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\GalleryGroupContainer.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\GalleryItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\InRibbonGallery.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\KeyTip.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Menu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\MenuItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\MenuSeparator.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\QuickAccessToolbar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RadioButton.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Ribbon.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonContextualTabGroup.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonGroupBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonScrollViewer.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonSeparator.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonStatusBar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonTabControl.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonTabItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonTextBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonTitleBar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonToolBar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\RibbonToolBarControlGroup.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ScreenTip.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ScrollBar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ScrollBarWhite.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\SeparatorTabItem.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Slider.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\Spinner.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\SplitButton.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\StatusBar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\TextBox.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\ToggleButton.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<None Include="Themes\Windows8\Controls\TwoLineLabel.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<Page Include="Themes\Windows8\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<None Include="Themes\Windows8\RibbonWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</None>
<Page Include="Themes\Windows8\Silver.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Resource Include="Themes\Office2013\Images\Warning.png" />
Expand Down Expand Up @@ -625,14 +837,20 @@
<ItemGroup>
<None Include="Themes\Generic.txt" />
<None Include="Themes\Office2013\Generic.txt" />
<Resource Include="Themes\Windows8\Effects\Grayscale.ps" />
<None Include="Themes\XamlCombine.exe" />
</ItemGroup>
<ItemGroup>
<Folder Include="Metro\Converters\" />
</ItemGroup>
<ItemGroup>
<None Include="Themes\Windows8\Effects\Grayscale.fx" />
<None Include="Themes\Windows8\Generic.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>"$(ProjectDir)Themes\XamlCombine.exe" Generic.txt Generic.xaml
"$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml</PreBuildEvent>
"$(ProjectDir)Themes\XamlCombine.exe" Office2013\Generic.txt Office2013\Generic.xaml
"$(ProjectDir)Themes\XamlCombine.exe" Windows8\Generic.txt Windows8\Generic.xaml</PreBuildEvent>
</PropertyGroup>
</Project>
Loading