Skip to content

Commit

Permalink
Colors changed
Browse files Browse the repository at this point in the history
cc @ncampuzano @melissamanrique
  • Loading branch information
ricardopolo committed Mar 10, 2015
1 parent ad05bca commit e2bef93
Show file tree
Hide file tree
Showing 9 changed files with 5,209 additions and 15 deletions.
3 changes: 1 addition & 2 deletions Tulpep.Integritul/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseLight.xaml" />
<ResourceDictionary Source="/Resources/MyIcons.xaml" />

<ResourceDictionary Source="/Resources/Icons.xaml" />
</ResourceDictionary.MergedDictionaries>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
</ResourceDictionary>
Expand Down
3 changes: 3 additions & 0 deletions Tulpep.Integritul/Resources/Entypo-license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Entypo (http://www.entypo.com/) is created by Daniel Bruce and released under the Creative Commons, Share Alike/Attribution license.

http://creativecommons.org/licenses/by-sa/3.0/
Binary file added Tulpep.Integritul/Resources/Entypo.ttf
Binary file not shown.
5,131 changes: 5,131 additions & 0 deletions Tulpep.Integritul/Resources/Icons.xaml

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions Tulpep.Integritul/Resources/MyIcons.xaml

This file was deleted.

62 changes: 62 additions & 0 deletions Tulpep.Integritul/Resources/WindowsIcons-license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# License

Please carefully understand the license and download the latest icons at ModernUIIcons.com.

## Understand Your Rights
No Attribution and No Derived Works
http://creativecommons.org/licenses/by-nd/3.0/ *

- If your project is open source include this license file in the source.
- Nothing is needed in the front facing project (UNLESS you
are using any of the icons listed below in the attribution section).
- Commercial use is not only allowed but encouraged. If it is an icon
in the attribution list below, you still need to attribute those!
- Do not distribute the entire package (I've allowed this dozens of
times for open source projects, but email me first).

## Creator
- Austin Andrews (@templarian)

## Contributor**
- Jay Zawrotny (@JayZawrotny)
- A Bunch
- Oren Nachman
- appbar.chevron.down
- appbar.chevron.up
- appbar.chevron.left
- appbar.chevron.right

## Derived Works
- Alex Peattie
- Social: http://www.alexpeattie.com/projects/justvector_icons/

## Attribution***
- Kris Vandermotten (@kvandermotten)
- appbar.medical.pulse
- Constantin Kichinsky (@kichinsky)
- appbar.currency.rubles
- appbar.currency.grivna
- Massimo Savazzi (@msavazzi)
- List of missing exported icons
- Proletkult Graphik, from The Noun Project
- appbar.draw.pen (inspired)
- Olivier Guin, from The Noun Project
- appbar.draw.marker
- Gibran Bisio, from The Noun Project
- appbar.draw.bucket
Andrew Forrester, from The Noun Project
- appbar.fingerprint

* The license is for attribution, but this is not required.
** 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.
*** Icons I've copied so closely you want to attribute them and are also under the CC license.

Contact
- http://templarian.com/
- admin[@]templarian[.]com

* Does not apply to copyrighted logos
- Skype
- Facebook
- Twitter
- etc...
11 changes: 9 additions & 2 deletions Tulpep.Integritul/Tulpep.Integritul.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Resources\MyIcons.xaml">
<SubType>Designer</SubType>
<Page Include="Resources\Icons.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\ResultOfComparisonView.xaml">
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -144,13 +144,20 @@
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<AppDesigner Include="Properties\" />
<Resource Include="Resources\Entypo.ttf" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\WindowsIcons-license.txt" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Entypo-license.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
4 changes: 2 additions & 2 deletions Tulpep.Integritul/Views/HomeView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<controls:Tile Title="Save folder status"
TiltFactor="1"
Width="150" Height="150"
Margin="0,100,0,0" x:Name="GenerateIntegrity" Content="{StaticResource my_appbar_page_search}">
Margin="0,100,0,0" x:Name="GenerateIntegrity" Content="{StaticResource appbar_page_search}">
<controls:Tile.Style>
<Style>

Expand Down Expand Up @@ -47,7 +47,7 @@
<controls:Tile Title="Validate Integrity"
TiltFactor="1"
Width="150" Height="150"
Margin="0,100,0,0" x:Name="CompareIntegrity" Content="{StaticResource my_appbar_checkmark_thick}" >
Margin="0,100,0,0" x:Name="CompareIntegrity" Content="{StaticResource appbar_checkmark_thick}" >
<controls:Tile.Style>
<Style>
<Style.Triggers>
Expand Down
1 change: 1 addition & 0 deletions Tulpep.Integritul/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
<package id="Fody" version="1.26.1" targetFramework="net45" developmentDependency="true" />
<package id="MahApps.Metro" version="1.0.0.0" targetFramework="net45" />
<package id="MahApps.Metro.Resources" version="0.4.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
</packages>

0 comments on commit e2bef93

Please sign in to comment.