Skip to content

Commit

Permalink
Bootstrap fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-norton committed Jul 5, 2019
1 parent c109644 commit 96dd8cc
Show file tree
Hide file tree
Showing 35 changed files with 27 additions and 50 deletions.
30 changes: 0 additions & 30 deletions CitSciScribe/App_Start/WebApiConfig.cs

This file was deleted.

5 changes: 4 additions & 1 deletion CitSciScribe/CitSciScribe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\Startup.Auth.cs" />
<Compile Include="App_Start\IdentityConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Attrributes\HasTranscribeFilter.cs" />
<Compile Include="Attrributes\HasApproveFilter.cs" />
<Compile Include="Attrributes\MultipleButtonFilter.cs" />
Expand Down Expand Up @@ -273,6 +272,10 @@
<Content Include="Content\fonts\glyphicons-halflings-regular.ttf" />
<Content Include="Content\fonts\glyphicons-halflings-regular.woff" />
<Content Include="Content\fonts\glyphicons-halflings-regular.woff2" />
<Content Include="Content\bootstrap.min.css.map" />
<Content Include="Content\bootstrap.css.map" />
<Content Include="Content\bootstrap-theme.min.css.map" />
<Content Include="Content\bootstrap-theme.css.map" />
<None Include="Scripts\jquery-1.10.2.intellisense.js" />
<Content Include="Scripts\jquery-1.10.2.js" />
<Content Include="Scripts\jquery-1.10.2.min.js" />
Expand Down
1 change: 1 addition & 0 deletions CitSciScribe/Content/bootstrap-theme.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions CitSciScribe/Content/bootstrap-theme.min.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions CitSciScribe/Content/bootstrap.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions CitSciScribe/Content/bootstrap.min.css.map

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/Frog.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/Lizard.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/Salamander.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/Snake.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/Turtle.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/citsci-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/coreHerp300.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/dragonfly.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/dukeMarine180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/dukeMarineInvert.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CitSciScribe/Content/images/frog_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed CitSciScribe/Content/images/wedigbio_circle.png
Binary file not shown.
1 change: 0 additions & 1 deletion CitSciScribe/Global.asax.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ protected void Application_Start()
//System.Data.Entity.Database.SetInitializer<DBContext>(null);
GlobalFilters.Filters.Add(new UserProfileActionFilter(), 0);
//AreaRegistration.RegisterAllAreas();
GlobalConfiguration.Configure(WebApiConfig.Register);
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Account/ForgotPassword.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content">
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Account/Login.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content">
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Account/Register.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content">
Expand Down
3 changes: 1 addition & 2 deletions CitSciScribe/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content home-content">
Expand All @@ -11,7 +11,6 @@
<p>Since 1879, the North Carolina Museum of Natural Sciences has documented the biodiversity of the southeastern U.S. and beyond. This incredible record of the region’s natural history has powerful applications for research, conservation, and education. However, much of this potential remains hidden away in historic written records.</p>
<p>Join us! Become a Citizen Science Curator and unlock these hidden treasures. As you transform written records into a digital format you will make this valuable information available to anyone, anywhere in the world.</p>
<p>Get started today by clicking Transcribe Now below!</p>
<p>You can now automatically track your progress on <a href="https://scistarter.com/">SciStarter</a> by registering and joining the <a href="https://scistarter.com/project/18106-CitSciScribe">CitSciScribe project</a>.</p>
</div>
<div class="col-sm-10 col-sm-offset-1 col-xs-12">
<ul class="stats-list home-stats">
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Import/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content">
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Manage/ChangePassword.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content">
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Manage/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" id="logo" alt="CitSciScribe" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content profile-content">
Expand Down
2 changes: 0 additions & 2 deletions CitSciScribe/Views/Shared/_CardLayout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
<script type="text/javascript" src="~/Scripts/bootstrap.min.js"></script>
<script type="text/javascript" src="~/Scripts/jquery-ui.min.js"></script>
<script type="text/javascript" src="~/Scripts/jquery-scrolltofixed-min.js"></script>
<script data-profile="input[name='profile_id']" src="https://scistarter.com/static/api/apihelper.js"></script>
<script type="text/javascript" src="~/Scripts/scistarter-ajax.js"></script>
<script type="text/javascript" src="~/Scripts/jquery.slidereveal.min.js"></script>
<script type="text/javascript" src="~/Scripts/vertical-layout.js"></script>
<script type="text/javascript" src="~/Scripts/card-script.js"></script>
Expand Down
12 changes: 10 additions & 2 deletions CitSciScribe/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,16 @@
<div id="wrapper" class="row container-fluid">
<div class="col-sm-2 sidebar sidebar-lg">
@Html.Partial("_Sidebar")
</div>
<div class="col-sm-10 main-content-area">
</div>@{
var backgroundImages = new List<string>{
"../Content/images/fish_background.png",
"../Content/images/frog_background.png",
"../Content/images/turtle_background.png",
"../Content/images/pipefish_background.png",
};
var index = (new Random()).Next(backgroundImages.Count);
}
<div class="col-sm-10 main-content-area" style="background-image: url('@backgroundImages[index]');">
@RenderBody()
</div><!-- col-md-10 end -->
<div class="col-sm-2 sidebar mobile-only">
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/Views/Transcription/Projects.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div id="inner-wrapper" class="col-sm-offset-2">
<div class="row">
<div class="col-xs-12 col-logo">
<img src="" alt="CitSciScribe" id="logo" class="citsci-logo img-responsive"/>
<img src="~/Content/images/citsci-logo.png" alt="CitSciScribe" class="citsci-logo img-responsive" />
</div>
</div>
<div class="row main-content projects">
Expand Down
4 changes: 0 additions & 4 deletions CitSciScribe/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<connectionStrings>
<!--<add name="DefaultConnection" connectionString="Data Source=XAVIER;Initial Catalog=CitSciScribe;Integrated Security=True" providerName="System.Data.SqlClient" />-->
<!--<add name="DefaultConnection" connectionString="Data Source=NRC-MNS114ZSD;Initial Catalog=CitSciScribe;Integrated Security=True" providerName="System.Data.SqlClient" /> -->
<!--<add name="DefaultConnection" connectionString="Data Source=SQL5027.Smarterasp.net;Initial Catalog=DB_9FBE4A_citsciscribe;User Id=DB_9FBE4A_citsciscribe_admin;Password=chm5gu3y;" providerName="System.Data.SqlClient" /> -->
<add name="DefaultConnection" connectionString="Data Source=SQL5029.site4now.net;Initial Catalog=DB_9FBE4A_citsciscribe2;User Id=DB_9FBE4A_citsciscribe2_admin;Password=chm5gu3y;" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<add key="webpages:Version" value="3.0.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion CitSciScribe/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
<package id="bootstrap" version="3.3.7" targetFramework="net45" />
<package id="EntityFramework" version="6.1.1" targetFramework="net45" />
<package id="jQuery" version="1.10.2" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Core" version="2.1.0" targetFramework="net45" />
Expand Down

0 comments on commit 96dd8cc

Please sign in to comment.