Skip to content

Commit e2bef93

Browse files
ricardopoloricardopolo
committed
Colors changed
cc @ncampuzano @melissamanrique
1 parent ad05bca commit e2bef93

File tree

9 files changed

+5209
-15
lines changed

9 files changed

+5209
-15
lines changed

‎Tulpep.Integritul/App.xaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
1414
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
1515
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
16-
<ResourceDictionary Source="/Resources/MyIcons.xaml" />
17-
16+
<ResourceDictionary Source="/Resources/Icons.xaml" />
1817
</ResourceDictionary.MergedDictionaries>
1918
<BooleanToVisibilityConverter x:Key="BoolToVis" />
2019
</ResourceDictionary>

‎Tulpep.Integritul/Resources/Entypo-license.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Entypo (http://www.entypo.com/) is created by Daniel Bruce and released under the Creative Commons, Share Alike/Attribution license.
2+
3+
http://creativecommons.org/licenses/by-sa/3.0/

‎Tulpep.Integritul/Resources/Entypo.ttf‎

35.5 KB
Binary file not shown.

‎Tulpep.Integritul/Resources/Icons.xaml‎

Lines changed: 5131 additions & 0 deletions
Large diffs are not rendered by default.

‎Tulpep.Integritul/Resources/MyIcons.xaml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Tulpep.Integritul/Resources/WindowsIcons-license.txt‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# License
2+
3+
Please carefully understand the license and download the latest icons at ModernUIIcons.com.
4+
5+
## Understand Your Rights
6+
No Attribution and No Derived Works
7+
http://creativecommons.org/licenses/by-nd/3.0/ *
8+
9+
- If your project is open source include this license file in the source.
10+
- Nothing is needed in the front facing project (UNLESS you
11+
are using any of the icons listed below in the attribution section).
12+
- Commercial use is not only allowed but encouraged. If it is an icon
13+
in the attribution list below, you still need to attribute those!
14+
- Do not distribute the entire package (I've allowed this dozens of
15+
times for open source projects, but email me first).
16+
17+
## Creator
18+
- Austin Andrews (@templarian)
19+
20+
## Contributor**
21+
- Jay Zawrotny (@JayZawrotny)
22+
- A Bunch
23+
- Oren Nachman
24+
- appbar.chevron.down
25+
- appbar.chevron.up
26+
- appbar.chevron.left
27+
- appbar.chevron.right
28+
29+
## Derived Works
30+
- Alex Peattie
31+
- Social: http://www.alexpeattie.com/projects/justvector_icons/
32+
33+
## Attribution***
34+
- Kris Vandermotten (@kvandermotten)
35+
- appbar.medical.pulse
36+
- Constantin Kichinsky (@kichinsky)
37+
- appbar.currency.rubles
38+
- appbar.currency.grivna
39+
- Massimo Savazzi (@msavazzi)
40+
- List of missing exported icons
41+
- Proletkult Graphik, from The Noun Project
42+
- appbar.draw.pen (inspired)
43+
- Olivier Guin, from The Noun Project
44+
- appbar.draw.marker
45+
- Gibran Bisio, from The Noun Project
46+
- appbar.draw.bucket
47+
Andrew Forrester, from The Noun Project
48+
- appbar.fingerprint
49+
50+
* The license is for attribution, but this is not required.
51+
** Developers and designers that emailed Templarian the source .design icons to be added into the package. PNGs also accepted, but may take longer to be added.
52+
*** Icons I've copied so closely you want to attribute them and are also under the CC license.
53+
54+
Contact
55+
- http://templarian.com/
56+
- admin[@]templarian[.]com
57+
58+
* Does not apply to copyrighted logos
59+
- Skype
60+
- Facebook
61+
- Twitter
62+
- etc...

‎Tulpep.Integritul/Tulpep.Integritul.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@
103103
<DependentUpon>App.xaml</DependentUpon>
104104
<SubType>Code</SubType>
105105
</Compile>
106-
<Page Include="Resources\MyIcons.xaml">
107-
<SubType>Designer</SubType>
106+
<Page Include="Resources\Icons.xaml">
108107
<Generator>MSBuild:Compile</Generator>
108+
<SubType>Designer</SubType>
109109
</Page>
110110
<Page Include="Views\ResultOfComparisonView.xaml">
111111
<Generator>MSBuild:Compile</Generator>
@@ -144,13 +144,20 @@
144144
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
145145
</None>
146146
<AppDesigner Include="Properties\" />
147+
<Resource Include="Resources\Entypo.ttf" />
147148
</ItemGroup>
148149
<ItemGroup>
149150
<None Include="App.config" />
150151
</ItemGroup>
151152
<ItemGroup>
152153
<Resource Include="FodyWeavers.xml" />
153154
</ItemGroup>
155+
<ItemGroup>
156+
<Resource Include="Resources\WindowsIcons-license.txt" />
157+
</ItemGroup>
158+
<ItemGroup>
159+
<Resource Include="Resources\Entypo-license.txt" />
160+
</ItemGroup>
154161
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
155162
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
156163
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎Tulpep.Integritul/Views/HomeView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<controls:Tile Title="Save folder status"
1616
TiltFactor="1"
1717
Width="150" Height="150"
18-
Margin="0,100,0,0" x:Name="GenerateIntegrity" Content="{StaticResource my_appbar_page_search}">
18+
Margin="0,100,0,0" x:Name="GenerateIntegrity" Content="{StaticResource appbar_page_search}">
1919
<controls:Tile.Style>
2020
<Style>
2121

@@ -47,7 +47,7 @@
4747
<controls:Tile Title="Validate Integrity"
4848
TiltFactor="1"
4949
Width="150" Height="150"
50-
Margin="0,100,0,0" x:Name="CompareIntegrity" Content="{StaticResource my_appbar_checkmark_thick}" >
50+
Margin="0,100,0,0" x:Name="CompareIntegrity" Content="{StaticResource appbar_checkmark_thick}" >
5151
<controls:Tile.Style>
5252
<Style>
5353
<Style.Triggers>

‎Tulpep.Integritul/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
77
<package id="Fody" version="1.26.1" targetFramework="net45" developmentDependency="true" />
88
<package id="MahApps.Metro" version="1.0.0.0" targetFramework="net45" />
9+
<package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net45" />
910
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1011
</packages>

0 commit comments

Comments
 (0)