Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

Commit

Permalink
Merge branch 'canary' of https://github.com/ZA-PT/Obsidian into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
SamLangTen committed Oct 12, 2017
2 parents b87768f + 6be8e78 commit c1b79ba
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 83 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
- sudo apt-get update
- curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
- nvm install node
- sudo apt-get install -y yarn
- dotnet restore
- cd ./src/Obsidian/
- yarn
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -495,66 +495,6 @@ exports[`PortalHeader render snapshot 1`] = `
Scopes
</a>
</li>
<li
className="dropdown"
>
<a
className="dropdown-toggle"
data-toggle="dropdown"
href="#"
>
Dropdown
<span
className="caret"
/>
</a>
<ul
className="dropdown-menu"
role="menu"
>
<li>
<a
href="#"
>
Action
</a>
</li>
<li>
<a
href="#"
>
Another action
</a>
</li>
<li>
<a
href="#"
>
Something else here
</a>
</li>
<li
className="divider"
/>
<li>
<a
href="#"
>
Separated link
</a>
</li>
<li
className="divider"
/>
<li>
<a
href="#"
>
One more separated link
</a>
</li>
</ul>
</li>
</ul>
<form
className="navbar-form navbar-left"
Expand Down
2 changes: 1 addition & 1 deletion src/Obsidian/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<p>Environment: @RuntimeInformation.ProcessArchitecture process running on @RuntimeInformation.OSArchitecture @RuntimeInformation.OSDescription</p>
<p>Built at: @buildTime UTC</p>
</footer>
</div> <!-- /container -->
</div>


<link href="~/css/Landing.css" rel="stylesheet" />
3 changes: 2 additions & 1 deletion src/Obsidian/wwwroot/css/Landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
}

.container{
background-color: rgba(233, 233, 233, 0.3)
background-color: rgba(233, 233, 233, 0.3);
}


body {
color:whitesmoke;
margin:0;
Expand Down
20 changes: 0 additions & 20 deletions src/Obsidian/wwwroot/css/site.css

This file was deleted.

0 comments on commit c1b79ba

Please sign in to comment.