Skip to content

Commit

Permalink
Remove CSS isolation from Common Library : Fix #344 (#346)
Browse files Browse the repository at this point in the history
* Remove CSS isolation from Common Library : Fix #344

* Fix test fail

* dockerignore update
  • Loading branch information
antoineatstariongroup authored Apr 20, 2023
1 parent e57ac1c commit 5fc9744
Show file tree
Hide file tree
Showing 25 changed files with 329 additions and 309 deletions.
16 changes: 16 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/bin
**/docker-compose*
**/Dockerfile*
**/obj
2 changes: 1 addition & 1 deletion COMET.Web.Common.Tests/Components/TooltipTestFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void VerifyTooltipComponent()

Assert.Multiple(() =>
{
Assert.That(span.ClassName, Is.EqualTo(cssClass));
Assert.That(span.ClassName,Does.Contain(cssClass));
Assert.That(span.TextContent, Is.EqualTo(text));
});

Expand Down
2 changes: 1 addition & 1 deletion COMET.Web.Common/COMET.Web.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>Latest</LangVersion>
<Version>1.0.1</Version>
<Version>1.0.3</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<Title>CDP4 WEB Common</Title>
Expand Down
2 changes: 1 addition & 1 deletion COMET.Web.Common/Components/ApplicationCard.razor
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
------------------------------------------------------------------------------->
<div id="@this.cardId" class="card">
<div id="@this.cardId" class="application__card card">
<a class="card-btn card__link" href="@this.CurrentApplication.Url" >
<span class="oi [email protected] display-flex justify-content-center card__icon" title="@this.CurrentApplication.Icon" aria-hidden="true"></span>
<div class="card-body display-flex flex-column align-items-center card__content">
Expand Down
33 changes: 0 additions & 33 deletions COMET.Web.Common/Components/ApplicationCard.razor.css

This file was deleted.

7 changes: 0 additions & 7 deletions COMET.Web.Common/Components/Dashboard.razor.css

This file was deleted.

36 changes: 0 additions & 36 deletions COMET.Web.Common/Components/LoadingComponent.razor.css

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
ValueChanged="@((AngleFormat value)=>this.ViewModel.OnAngleFormatChanged(value))" />
</div>
<div class="euler-parameter-row">
<p>Rx:</p>
<p class="orientation_p">Rx:</p>
<DxTextBox Text="@this.ViewModel.Orientation.X.ToString(CultureInfo.InvariantCulture)" BindValueMode="BindValueMode.OnInput" CssClass="parameter-input" @oninput="@((e) => this.ViewModel.OnEulerAnglesChanged("Rx",e))"></DxTextBox>
</div>
<div class="euler-parameter-row">
<p>Ry:</p>
<p class ="orientation_p">Ry:</p>
<DxTextBox Text="@this.ViewModel.Orientation.Y.ToString(CultureInfo.InvariantCulture)" BindValueMode="BindValueMode.OnInput" CssClass="parameter-input" @oninput="@((e) => this.ViewModel.OnEulerAnglesChanged("Ry",e))"></DxTextBox>
</div>
<div class="euler-parameter-row">
<p>Rz:</p>
<p class="orientation_p">Rz:</p>
<DxTextBox Text="@this.ViewModel.Orientation.Z.ToString(CultureInfo.InvariantCulture)" BindValueMode="BindValueMode.OnInput" CssClass="parameter-input" @oninput="@((e) => this.ViewModel.OnEulerAnglesChanged("Rz",e))"></DxTextBox>
</div>
}
Expand All @@ -57,7 +57,7 @@
{
var index = i;
<div class="matrix-parameter-row">
<p>@names[index]</p>
<p class="orientation_p">@names[index]</p>
<DxTextBox Text="@this.ViewModel.Orientation.Matrix[index].ToString(CultureInfo.InvariantCulture)" BindValueMode="BindValueMode.OnInput" CssClass="parameter-input" @oninput="(e) => this.ViewModel.OnMatrixValuesChanged(index, e)"></DxTextBox>
</div>
}
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{
var colorValue = this.ViewModel.ValueArray[this.ViewModel.ValueArrayIndex].ParseToHexColor();
<div class="parameter-row" id="color-section">
<input type="color"
<input class="margin-2" type="color"
id="color-picker"
name="color"
value="@colorValue"
Expand All @@ -40,7 +40,7 @@
else
{
<div class="parameter-row">
<p>@this.ViewModel.ParameterType.Name</p>
<p class="orientation_p">@this.ViewModel.ParameterType.Name</p>
<DxTextBox InputCssClass="text-parameter-type"
Text="@this.ViewModel.ValueArray.First()"
CssClass="parameter-input"
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion COMET.Web.Common/Components/Tooltip.razor
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
------------------------------------------------------------------------------->

<div class="tooltip-wrapper">
<span class="@(this.MarginBottom)">@(this.Text)</span>
<span class="@(this.MarginBottom) tooltip-content">@(this.Text)</span>
@(this.ChildContent)
</div>
50 changes: 0 additions & 50 deletions COMET.Web.Common/Components/Tooltip.razor.css

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions COMET.Web.Common/Pages/Index.razor.css

This file was deleted.

23 changes: 0 additions & 23 deletions COMET.Web.Common/Shared/MainLayout.razor.css

This file was deleted.

7 changes: 0 additions & 7 deletions COMET.Web.Common/Shared/TopMenu.razor.css

This file was deleted.

Loading

0 comments on commit 5fc9744

Please sign in to comment.