Skip to content

Commit 3ef9d6c

Browse files
committed
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons. # User-specific files *.suo *.user *.userosscache *.sln.docstates # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs # Build results [Dd]ebug/ [Dd]ebugPublic/ [Rr]elease/ [Rr]eleases/ x64/ x86/ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ # Visual Studio 2015 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* # NUNIT *.VisualState.xml TestResult.xml # Build Results of an ATL Project [Dd]ebugPS/ [Rr]eleasePS/ dlldata.c # DNX project.lock.json project.fragment.lock.json artifacts/ *_i.c *_p.c *_i.h *.ilk *.meta *.obj *.pch *.pdb *.pgc *.pgd *.rsp *.sbr *.tlb *.tli *.tlh *.tmp *.tmp_proj *.log *.vspscc *.vssscc .builds *.pidb *.svclog *.scc # Chutzpah Test files _Chutzpah* # Visual C++ cache files ipch/ *.aps *.ncb *.opendb *.opensdf *.sdf *.cachefile *.VC.db *.VC.VC.opendb # Visual Studio profiler *.psess *.vsp *.vspx *.sap # TFS 2012 Local Workspace $tf/ # Guidance Automation Toolkit *.gpState # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user # JustCode is a .NET coding add-in .JustCode # TeamCity is a build add-in _TeamCity* # DotCover is a Code Coverage Tool *.dotCover # NCrunch _NCrunch_* .*crunch*.local.xml nCrunchTemp_* # MightyMoose *.mm.* AutoTest.Net/ # Web workbench (sass) .sass-cache/ # Installshield output folder [Ee]xpress/ # DocProject is a documentation generator add-in DocProject/buildhelp/ DocProject/Help/*.HxT DocProject/Help/*.HxC DocProject/Help/*.hhc DocProject/Help/*.hhk DocProject/Help/*.hhp DocProject/Help/Html2 DocProject/Help/html # Click-Once directory publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml # TODO: Comment the next line if you want to checkin your web deploy settings # but database connection strings (with potential passwords) will be unencrypted #*.pubxml *.publishproj # Microsoft Azure Web App publish settings. Comment the next line if you want to # checkin your Azure Web App publish settings, but sensitive information contained # in these scripts will be unencrypted PublishScripts/ # NuGet Packages *.nupkg # The packages folder can be ignored because of Package Restore **/packages/* # except build/, which is used as an MSBuild target. !**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config # NuGet v3's project.json files produces more ignoreable files *.nuget.props *.nuget.targets # Microsoft Azure Build Output csx/ *.build.csdef # Microsoft Azure Emulator ecf/ rcf/ # Windows Store app package directories and files AppPackages/ BundleArtifacts/ Package.StoreAssociation.xml _pkginfo.txt # Visual Studio cache files # files ending in .cache can be ignored *.[Cc]ache # but keep track of directories ending in .cache !*.[Cc]ache/ # Others ClientBin/ ~$* *~ *.dbmdl *.dbproj.schemaview *.jfm *.pfx *.publishsettings node_modules/ orleans.codegen.cs # Since there are multiple workflows, uncomment next line to ignore bower_components # (github/gitignore#1529 (comment)) bower_components/ # RIA/Silverlight projects Generated_Code/ # Backup & report files from converting an old project file # to a newer Visual Studio version. Backup files are not needed, # because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm # SQL Server files *.mdf *.ldf # Business Intelligence projects *.rdl.data *.bim.layout *.bim_*.settings # Microsoft Fakes FakesAssemblies/ # GhostDoc plugin setting file *.GhostDoc.xml # Node.js Tools for Visual Studio .ntvs_analysis.dat # Visual Studio 6 build log *.plg # Visual Studio 6 workspace options file *.opt # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts **/*.DesktopClient/ModelManifest.xml **/*.Server/GeneratedArtifacts **/*.Server/ModelManifest.xml _Pvt_Extensions # Paket dependency manager .paket/paket.exe paket-files/ # FAKE - F# Make .fake/ # JetBrains Rider .idea/ *.sln.iml # CodeRush .cr/ # Python Tools for Visual Studio (PTVS) __pycache__/ *.pyc # Ignore Theme Files /Calltime.Web/Theme/ /Calltime.Web/assets/ /Calltime.Web/assets # Ignore runtime scripts /Calltime.Web/Scripts /Calltime.Web/Scripts/
1 parent 4f2da51 commit 3ef9d6c

File tree

799 files changed

+214479
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

799 files changed

+214479
-105
lines changed

Calltime.Web/App_Start/BundleConfig.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public static void RegisterBundles(BundleCollection bundles)
2727

2828
bundles.Add(new StyleBundle("~/bundles/css").Include(
2929
"~/Content/bootstrap.css",
30+
"~/Content/oz.site.css",
3031
"~/assets/css/style.css",
3132
"~/assets/css/headers/header-v6.css",
3233
"~/assets/css/headers/footer-v6.css",
@@ -37,7 +38,8 @@ public static void RegisterBundles(BundleCollection bundles)
3738
"~/assets/css/custom.css",
3839
"~/assets/plugins/sliding-panel/style.css",
3940
"~/assets/plugins/sliding-panel/styleMessenger.css",
40-
"~/assets/plugins/parallax-slider/css/parallax-slider.css"));
41+
"~/assets/plugins/parallax-slider/css/parallax-slider.css"
42+
));
4143

4244
//Unify Theme Global JS Implementing Plugins
4345
bundles.Add(new ScriptBundle("~/bundles/js/globalPlugins").Include(
@@ -73,14 +75,7 @@ public static void RegisterBundles(BundleCollection bundles)
7375
"~/ScriptsApp/modules/crud/directives/*.js",
7476
"~/ScriptsApp/modules/crud/services/*.js",
7577
"~/ScriptsApp/modules/crud/templates/*.js"));
76-
77-
//"~/Scripts/appAngular/appMod/crud/crudDir.js",
78-
//"~/Scripts/appAngular/appMod/crud/crudCtrl.js",
79-
//"~/Scripts/appAngular/appMod/crud/crudSvc.js",
80-
//"~/Scripts/appAngular/appMod/crud/crudForm/crudFormCtrl.js",
81-
//"~/Scripts/appAngular/appMod/crud/crudForm/crudFormDir.js",
82-
//"~/Scripts/appAngular/appMod/crud/crudTable/crudTableCtrl.js",
83-
//"~/Scripts/appAngular/appMod/crud/crudTable/crudTableDir.js"));
8478
}
79+
8580
}
8681
}

Calltime.Web/Calltime.Web.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@
262262
</ItemGroup>
263263
<ItemGroup>
264264
<Content Include="App_Data\AddressBook_Script.sql" />
265-
<Content Include="assets\css\custom.css" />
266265
<Content Include="assets\img\key-art\headset4.jpg" />
267266
<Content Include="assets\img\logos\CalltimeColorClock2Small.png" />
268267
<Content Include="assets\plugins\sliding-panel\icon-close-dark.svg" />
@@ -284,13 +283,15 @@
284283
<Content Include="bower_components\api-check\karma.conf.js" />
285284
<Content Include="Content\bootstrap.css" />
286285
<Content Include="Content\bootstrap.min.css" />
286+
<Content Include="Content\oz.site.css" />
287287
<Content Include="favicon.ico" />
288288
<Content Include="fonts\glyphicons-halflings-regular.svg" />
289289
<Content Include="Global.asax" />
290-
<Content Include="Content\Site.css" />
290+
<Content Include="Content\site.css" />
291291
<Content Include="ScriptsApp\appModel.model.js" />
292292
<Content Include="ScriptsApp\modules\crud\crud.module.js" />
293-
<Content Include="ScriptsApp\modules\crud\directives\crudTableFormToggle.dir.js" />
293+
<Content Include="ScriptsApp\modules\crud\directives\addCrudForm.dir.js" />
294+
<Content Include="ScriptsApp\modules\crud\directives\zzz.crudTableFormToggle.dir.js" />
294295
<Content Include="ScriptsApp\modules\crud\templates\productionCrudForm.template.html" />
295296
<Content Include="ScriptsApp\modules\crud\views\production.view.html" />
296297
<Content Include="ScriptsApp\zzzArchives\boilerplateCode\entity.svc..js" />

Calltime.Web/Content/Site.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ input,
2121
select,
2222
textarea {
2323
max-width: 280px;
24-
}*/
24+
}

Calltime.Web/Content/oz.site.css

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+

2+
/*--------FORMS---------*/
3+
form input.oz-hidden-input-field {
4+
display: none;
5+
}
6+
7+
/*----CRUD Forms---*/
8+
9+
/*Post*/
10+
11+
div.panel-primary h3 {
12+
color: white;
13+
}
14+
15+
.crudPage h3 span {
16+
margin-left: 10px;
17+
}
18+
19+
oz-crud-form form button.oz-submit {
20+
float: right
21+
}
22+
23+
h3.panel-title {
24+
text-transform: capitalize;
25+
}
26+
27+
div.crudFormPlaceholder {
28+
display:none;
29+
}
30+
31+
.header-v6 .navbar-brand img.shrink-logo {
32+
height: 25px;
33+
}
34+
35+
div.renderBody {
36+
margin-top: 94px;
37+
padding-top: 20px;
38+
}
39+
40+
div.promo-key-art-headset {
41+
background: url(../img/key-art/headset4.jpg);
42+
background-size: cover;
43+
background-position: center center;
44+
}
45+
46+
div.promo-key-art-headset {
47+
background: url(../img/key-art/headset4.jpg);
48+
background-size: cover !important;
49+
background-position: center center !important;
50+
}
51+
52+
div.row {
53+
margin-left: 0px;
54+
margin-right: 0px;
55+
}
56+
57+
div.crudTableSearchCreateRow {
58+
margin-bottom: 15px;
59+
}
60+
61+
div.crudTable button {
62+
margin-left: 7px;
63+
margin-right: 7px;
64+
float: right;
65+
}
66+
67+
/*
68+
div.navbar button.adjustedPositionRight {
69+
margin-top: 30px;
70+
margin-bottom: 0px;
71+
margin-left: 15px;
72+
padding-top: 0px;
73+
padding-right: 20px;
74+
padding-bottom: 0px;
75+
}
76+
77+
div.navbar div.adjustedPositionLeft{
78+
padding-top: 0px;
79+
padding-left: 15px;
80+
padding-bottom: 0px;
81+
}
82+
83+
div.navbar, div.navbar div.adjustedPositionHeader {
84+
height: 75px;
85+
}
86+
87+
div.navbar li.adjustedPositionMenuHeader {
88+
line-height: 75px;
89+
padding-right: 0px !important;
90+
}
91+
92+
div.navbar li.adjustedPositionMenuHeader i.fa-bell-o {
93+
line-height: 75px;
94+
}*/
95+
96+
/*@media (max-width: 700px) and (max-height: 400px) and (orientation: landscape) {
97+
div.promo-bg-fixed div.margin-bottom-20 {
98+
display: none;
99+
}
100+
}*/

0 commit comments

Comments
 (0)