jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: CSS Style for <button>

Browse Source
This commit is contained in:
Gary Sharp
2013-07-15 22:30:04 +10:00
parent 2d5509c195
commit c3733c908c
14 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0704.1521")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0704.1521")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.Client/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0625.1304")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0625.1304")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.ClientBootstrapper/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0625.1304")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0625.1304")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.Data/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0704.1521")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0704.1521")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.Models/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0704.1521")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0704.1521")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.Services/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0704.1521")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0704.1521")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.Web.Extensions/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0704.1521")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0704.1521")] [assembly: AssemblyFileVersion("1.2.0715.2224")]
Disco.Web/ClientSource/Style/BundleSite.css
+12 -6
View File
@@ -1973,10 +1973,12 @@ select {
padding: 2px; padding: 2px;
color: #444; color: #444;
} }
input[type="submit"] { input[type="submit"],
button {
padding: 5px; padding: 5px;
} }
input[type="submit"].button { input[type="submit"].button,
button.button {
font-size: 12px; font-size: 12px;
padding: 6px 10px 4px 10px; padding: 6px 10px 4px 10px;
margin: 2px; margin: 2px;
@@ -1987,20 +1989,24 @@ input[type="submit"].button {
text-transform: uppercase; text-transform: uppercase;
cursor: pointer; cursor: pointer;
} }
input[type="submit"].button.alert { input[type="submit"].button.alert,
button.button.alert {
border-color: #990000; border-color: #990000;
background-color: #e90000; background-color: #e90000;
} }
input[type="submit"].button.small { input[type="submit"].button.small,
button.button.small {
padding: 2px 5px; padding: 2px 5px;
font-size: .9em; font-size: .9em;
} }
input[type="submit"].button[disabled] { input[type="submit"].button[disabled],
button.button[disabled] {
background: #9e9e9e; background: #9e9e9e;
border: 1px solid #696969; border: 1px solid #696969;
cursor: default; cursor: default;
} }
input[type="submit"].button:hover { input[type="submit"].button:hover,
button.button:hover {
border: 1px solid #696969; border: 1px solid #696969;
background: #9e9e9e; background: #9e9e9e;
} }
Disco.Web/ClientSource/Style/BundleSite.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Style/Site.css
+12 -6
View File
@@ -795,10 +795,12 @@ select {
padding: 2px; padding: 2px;
color: #444; color: #444;
} }
input[type="submit"] { input[type="submit"],
button {
padding: 5px; padding: 5px;
} }
input[type="submit"].button { input[type="submit"].button,
button.button {
font-size: 12px; font-size: 12px;
padding: 6px 10px 4px 10px; padding: 6px 10px 4px 10px;
margin: 2px; margin: 2px;
@@ -809,20 +811,24 @@ input[type="submit"].button {
text-transform: uppercase; text-transform: uppercase;
cursor: pointer; cursor: pointer;
} }
input[type="submit"].button.alert { input[type="submit"].button.alert,
button.button.alert {
border-color: #990000; border-color: #990000;
background-color: #e90000; background-color: #e90000;
} }
input[type="submit"].button.small { input[type="submit"].button.small,
button.button.small {
padding: 2px 5px; padding: 2px 5px;
font-size: .9em; font-size: .9em;
} }
input[type="submit"].button[disabled] { input[type="submit"].button[disabled],
button.button[disabled] {
background: #9e9e9e; background: #9e9e9e;
border: 1px solid #696969; border: 1px solid #696969;
cursor: default; cursor: default;
} }
input[type="submit"].button:hover { input[type="submit"].button:hover,
button.button:hover {
border: 1px solid #696969; border: 1px solid #696969;
background: #9e9e9e; background: #9e9e9e;
} }
Disco.Web/ClientSource/Style/Site.less
+1 -1
View File
@@ -875,7 +875,7 @@ select
color: #444; color: #444;
} }
input[type="submit"] input[type="submit"], button
{ {
padding: 5px; padding: 5px;
Disco.Web/ClientSource/Style/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/Disco.Web.csproj
+5 -5
View File
@@ -824,14 +824,14 @@
<Generator>RazorGenerator</Generator> <Generator>RazorGenerator</Generator>
<LastGenOutput>Install.generated.cs</LastGenOutput> <LastGenOutput>Install.generated.cs</LastGenOutput>
</None> </None>
<Content Include="Areas\Public\Views\HeldDevices\Index.cshtml"> <None Include="Areas\Public\Views\HeldDevices\Index.cshtml">
<Generator>RazorGenerator</Generator> <Generator>RazorGenerator</Generator>
<LastGenOutput>Index.generated.cs</LastGenOutput> <LastGenOutput>Index.generated.cs</LastGenOutput>
</Content> </None>
<Content Include="Areas\Public\Views\HeldDevices\Noticeboard.cshtml"> <None Include="Areas\Public\Views\HeldDevices\Noticeboard.cshtml">
<Generator>RazorGenerator</Generator> <Generator>RazorGenerator</Generator>
<LastGenOutput>Noticeboard.generated.cs</LastGenOutput> <LastGenOutput>Noticeboard.generated.cs</LastGenOutput>
</Content> </None>
<None Include="ClientSource\Scripts\Core.min.js.map"> <None Include="ClientSource\Scripts\Core.min.js.map">
<DependentUpon>Core.js.bundle</DependentUpon> <DependentUpon>Core.js.bundle</DependentUpon>
</None> </None>
@@ -1911,7 +1911,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" /> <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.0704.1521")] [assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0704.1521")] [assembly: AssemblyFileVersion("1.2.0715.2224")]