Skip to content

Commit

Permalink
Merge branch 'package-release'
Browse files Browse the repository at this point in the history
  • Loading branch information
@alc-compent
alc-compent committed Jul 24, 2018
2 parents 5e9615b + cab2d12 commit 230c326
Show file tree
Hide file tree
Showing 246 changed files with 3,370 additions and 1,979 deletions.
13 changes: 6 additions & 7 deletions cakeBuild/build.cake
View file
Expand Up @@ -20,13 +20,13 @@ var project = GetBuildProject(projectName, configuration);
var compentUIntraProject = GetBuildProject(CompentUintraProjectFileName, configuration);

// SETUP / TEARDOWN
Setup(() =>
Setup((ctx) =>
{
// Executed BEFORE the first task.
Information("Running tasks...");
});

Teardown(() =>
Teardown((ctx) =>
{
// Executed AFTER the last task.
Information("Finished running tasks.");
Expand All @@ -52,13 +52,12 @@ Task("NuGet-Restore-Packages")
{
Information("Restoring {0}...", project.Directory);
var nugetConfig = GetFiles("../**/NuGet.Config").SingleOrDefault();
if(nugetConfig == null){
throw new Exception("Can't find nuget.config.");
var solutionFile = GetFiles($"../**/*.sln").SingleOrDefault();
if(solutionFile == null){
throw new Exception("Could not find solution file.");
}
var nuGetRestoreSettings = new NuGetRestoreSettings { ConfigFile = nugetConfig };
NuGetRestore(project.File, nuGetRestoreSettings);
NuGetRestore(solutionFile);
});

Task("Build")
Expand Down
8 changes: 3 additions & 5 deletions src/Compent.uIntra.sln
View file
Expand Up @@ -14,7 +14,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D11512F1-8ED3-404D-B566-9000A46130A4}"
ProjectSection(SolutionItems) = preProject
..\.gitignore = ..\.gitignore
..\build.ps1 = ..\build.ps1
GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
EndProjectSection
EndProject
Expand Down Expand Up @@ -232,8 +231,8 @@ Global
{4D9F910E-24E0-43B3-BCCB-FEF527D5FF2F}.Release|Any CPU.Build.0 = Release|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.Compent.Debug|Any CPU.ActiveCfg = Compent.Debug|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.Compent.Debug|Any CPU.Build.0 = Compent.Debug|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.Debug|Any CPU.ActiveCfg = Dev|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.Debug|Any CPU.Build.0 = Dev|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.PublicNuget|Any CPU.ActiveCfg = PublicNuget|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.PublicNuget|Any CPU.Build.0 = PublicNuget|Any CPU
{8AB86D6B-6422-4D06-B9F3-B3A8C6F1588F}.QA|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -249,8 +248,7 @@ Global
{B690420E-AF06-4B17-93F7-A04362A1CD3D}.QA|Any CPU.Build.0 = QA|Any CPU
{B690420E-AF06-4B17-93F7-A04362A1CD3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B690420E-AF06-4B17-93F7-A04362A1CD3D}.Release|Any CPU.Build.0 = Release|Any CPU
{1D741FAD-003C-4B2C-9A22-C87FA3A9DE33}.Compent.Debug|Any CPU.ActiveCfg = Compent.Debug|Any CPU
{1D741FAD-003C-4B2C-9A22-C87FA3A9DE33}.Compent.Debug|Any CPU.Build.0 = Compent.Debug|Any CPU
{1D741FAD-003C-4B2C-9A22-C87FA3A9DE33}.Compent.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D741FAD-003C-4B2C-9A22-C87FA3A9DE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D741FAD-003C-4B2C-9A22-C87FA3A9DE33}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D741FAD-003C-4B2C-9A22-C87FA3A9DE33}.PublicNuget|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion src/Compent.uIntra/App_Plugins/BaseControls/DatePicker/date-picker.js
View file
Expand Up @@ -19,7 +19,7 @@
return function (dates) {
var value = dates && dates.length ? (isSingleMode(config.mode) ? dates[0] : dates) : null;
$scope.$apply(function () {
$scope.model = value ? value.toDateString() : null;
$scope.model = value ? value.toIsoDateTimeString() : null;

if ($scope.change) {
$scope.change();
Expand Down
3 changes: 1 addition & 2 deletions src/Compent.uIntra/App_Plugins/Bulletins/Create/CreationForm.cshtml
View file
Expand Up @@ -47,8 +47,7 @@
<button type="button" class="ql-link" title="link"></button>
</span>
<span class="ql-formats">
<button type="button" class="js-dropzone _upload" data-allowed="@Model.AllowedMediaExtensions" data-remove-text="@Html.Localize("FileUploadView.RemoveFile.lbl")">
@*@Html.Localize("FileUploadView.File.lbl")*@
<button type="button" class="js-dropzone _upload" title="upload" data-allowed="@Model.AllowedMediaExtensions" data-remove-text="@Html.Localize("FileUploadView.RemoveFile.lbl")">
</button>
<input type="hidden" class="js-new-media" name="@nameof(Model.NewMedia)" />
</span>
Expand Down
4 changes: 2 additions & 2 deletions src/Compent.uIntra/App_Plugins/Bulletins/style.css
View file
Expand Up @@ -258,7 +258,7 @@
.ql-container.ql-snow {
border:none;
height:70px;
padding:12px 20px;
padding:25px 20px 23px 62px;
cursor:text;

@media (--for-tablet-portrait-down) {
Expand Down Expand Up @@ -316,7 +316,7 @@
overflow:hidden;
left:62px;
top:25px;
right:0;
right:20px;
}
}

Expand Down
82 changes: 53 additions & 29 deletions src/Compent.uIntra/App_Plugins/CentralFeed/centralFeed.css
View file
Expand Up @@ -119,12 +119,16 @@
}

&-heading{
margin:0 0 13px;
font-size:13px;
line-height:16px;
display:flex;
align-items: center;
color:var(--text-color-dark);

.feed__list &{
display:block;
}

.create-bulletin &{
align-items: center;
}
Expand All @@ -134,13 +138,19 @@
}
}

&-title-holder{
display:flex;
align-items: center;
padding:0 0 13px;
}

&-holder{
padding:0;
}

&-title{
font: 18px/22px var(--font-general);
margin:-5px 0 7px;
margin:0 0 5px;
color:#262626;

@media (--for-tablet-portrait-up){
Expand Down Expand Up @@ -182,6 +192,10 @@
}
}

&-name{
font-weight:700;
}

&-location{
padding:0 0 0 23px;

Expand Down Expand Up @@ -245,7 +259,7 @@

&._clamp{
overflow:hidden;
margin:0 0 21px;
margin:0 0 11px;
max-height:66px;
line-height:22px;

Expand Down Expand Up @@ -286,9 +300,10 @@
}

&-images{
margin:0;
padding:10px 0 0;

._details &{
padding:0;
margin:0 0 49px;
}

Expand All @@ -309,6 +324,10 @@
@media(--for-tablet-portrait-down){
max-width:33.3%;
}

a:hover{
text-decoration:none;
}
}

img{
Expand All @@ -318,13 +337,15 @@

&-name{
display:block;
text-align:center;
text-overflow:ellipsis;
white-space:nowrap;
overflow:hidden;
}

&-remove{
position:absolute;
top:2px;
right:2px;
top:1px;
right:1px;
width:25px;
height:25px;
text-align:center;
Expand Down Expand Up @@ -353,7 +374,7 @@

&-divider{
display:inline-block;
vertical-align:inherit;
vertical-align:top;
}

&-feed{
Expand Down Expand Up @@ -405,10 +426,10 @@

&-holder{
align-self:center;
padding-right:130px;
padding:0 130px 0 0;

@media(--for-tablet-portrait-down){
padding-right:0;
padding:0;
}
}
}
Expand Down Expand Up @@ -456,7 +477,7 @@

&-address{
display:inline-block;
vertical-align:inherit;
vertical-align:top;
margin:0 0 0 15px;
@media(--for-tablet-portrait-down){
margin:0 0 0 7px;
Expand Down Expand Up @@ -509,25 +530,28 @@
}

&-subscribed{
border:1px solid var(--color-light-gray);
position:relative;
margin:0 0 10px;
font-size:11px;
line-height:2em;
text-transform:uppercase;
padding:0 10px;
float:left;

@media (--for-tablet-landscape-up){
margin-left:80px;
}
text-align:right;
margin:-8px 0 0;
padding:0 0 11px;

&-label{
border:1px solid var(--color-light-gray);
position:relative;
font-size:11px;
line-height:2em;
text-transform:uppercase;
padding:0 10px;
display:inline-block;
vertical-align:top;
border-radius:15px;

.icon-check{
&:before{
font-size:17px;
position:relative;
top:4px;
left:-1px;
.icon-check{
&:before{
font-size:17px;
position:relative;
top:4px;
left:-1px;
}
}
}
}
Expand Down
22 changes: 3 additions & 19 deletions src/Compent.uIntra/App_Plugins/Comments/comments.css
View file
Expand Up @@ -140,18 +140,6 @@
@media (--for-tablet-portrait-down) {
margin:0 -3px 0 0;
}
._inner &{

&:before{
top:0;
}

&:hover{
&:before{
top:2px;
}
}
}

&:before {
position:absolute;
Expand All @@ -176,7 +164,7 @@
display: none;
position: absolute;
top: 100%;
right: 0;
right: -13px;
min-width: 140px;
margin: 0;
padding: 0;
Expand Down Expand Up @@ -266,7 +254,7 @@
display:inline-block;
vertical-align:top;
font-size: 13px;
margin:0 13px 0 7px;
margin:0 7px;

@media (--for-tablet-portrait-down) {
margin:0 5px 0 0;
Expand All @@ -291,10 +279,6 @@
margin:0 5px;
}

._inner &{
margin:-5px 0 0 10px;
}

&-info{
position:absolute;
top:100%;
Expand Down Expand Up @@ -340,7 +324,7 @@

.icon-comment{
font-size:16px;
margin:1px 9px 1px 0;
margin:0 9px 0 0;
vertical-align:top;
display:inline-block;
color: #b2b2b2;
Expand Down
16 changes: 9 additions & 7 deletions src/Compent.uIntra/App_Plugins/Core/Activity/ActivityDetailsHeader.cshtml
View file
Expand Up @@ -7,21 +7,23 @@
}

<header class="feed__item-heading @inactiveUser">
@Html.Action("Photo", "User", new { user = Model.Owner })
@Html.Action("Photo", "User", new { user = Model.Owner, profilePageUrl = Model.Links.Owner })
<div class="feed__item-title-holder">
<p class="feed__item-meta">
@foreach (var date in Model.Dates)
{
<span class="feed__item-date">@date</span>
<span class="feed__item-divider"> - </span>
}
<span class="feed__item-category">@Html.Localize(Model.Type.ToString())@(Model.Owner != null ? "," : string.Empty)</span>
@if (Model.Owner != null)
{
<a href="@Model.Links.Owner" class="feed__item-name">
<span>@Model.Owner.DisplayedName</span>
</a>
<span class="feed__item-divider"> - </span>
}
@foreach (var date in Model.Dates)
{
<span class="feed__item-date">@date</span>
<span class="feed__item-divider"> - </span>
}
<span class="feed__item-category">@Html.Localize(Model.Type.ToString())</span>

@if (Model.Location?.Address != null && Model.Location.ShortAddress != null)
{
@Html.Action("HeaderLink", "ActivityLocation", new { location = Model.Location })
Expand Down

0 comments on commit 230c326

Please sign in to comment.