yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes: U4-7581 Why so curvy?

Browse Source
This commit is contained in:
Mads Rasmussen
2016-01-14 09:52:55 +01:00
parent b9cafa2016
commit b116a96058
7 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/less/belle.less
View File

@@ -88,7 +88,7 @@
@import "components/umb-grid-selector.less";
@import "components/umb-child-selector.less";
@import "components/umb-group-builder.less";
@import "components/umb-list-view.less";
@import "components/umb-list-view-settings.less";
@import "components/umb-table.less";
@import "components/umb-confirm-action.less";
@import "components/umb-keyboard-shortcuts-overview.less";

4
src/Umbraco.Web.UI.Client/src/less/components/umb-child-selector.less
View File

@@ -4,7 +4,6 @@
margin-bottom: 5px;
min-width: 300px;
display: flex;
border-radius: 5px;
animation: fadeIn 0.5s;
}
@@ -17,7 +16,6 @@
.umb-child-selector__child.-placeholder {
border: 1px dashed @grayLight;
background: none;
border-radius: 5px;
cursor: pointer;
text-align: center;
justify-content: center;
@@ -58,4 +56,4 @@
.umb-child-selector__child-remove {
cursor: pointer;
}
}

1
src/Umbraco.Web.UI.Client/src/less/components/umb-grid-selector.less
View File

@@ -15,7 +15,6 @@
display: flex;
align-items: center;
justify-content: center;
border-radius: 5px;
animation: fadeIn 0.5s;
position: relative;
}

21
src/Umbraco.Web.UI.Client/src/less/components/umb-list-view.less → src/Umbraco.Web.UI.Client/src/less/components/umb-list-view-settings.less
View File

@@ -1,52 +1,49 @@
.umb-list-view__box {
.umb-list-view-settings__box {
background: #f8f8f8;
border: 1px solid #CCCCCC;
display: flex;
border-radius: 5px;
animation: fadeIn 0.5s;
padding: 15px;
position: relative;
}
.umb-list-view__trigger {
.umb-list-view-settings__trigger {
margin-bottom: 20px;
}
.umb-list-view__box.-open {
.umb-list-view-settings__box.-open {
border-bottom: transparent;
border-radius: 5px 5px 0 0;
}
.umb-list-view__content {
.umb-list-view-settings__content {
display: flex;
}
.umb-list-view__list-view-icon {
.umb-list-view-settings__list-view-icon {
font-size: 20px;
color: #d9d9d9;
margin-right: 10px;
}
.umb-list-view__name {
.umb-list-view-settings__name {
margin-right: 5px;
font-size: 14px;
font-weight: bold;
float: left;
}
.umb-list-view__create-new {
.umb-list-view-settings__create-new {
font-size: 12px;
color: @blue;
}
.umb-list-view__remove-new {
.umb-list-view-settings__remove-new {
font-size: 12px;
color: @red;
}
.umb-list-view__settings {
.umb-list-view-settings__settings {
border: 1px dashed #d9d9d9;
border-top: none;
border-radius: 0 0 5px 5px;
padding: 20px;
}

3
src/Umbraco.Web.UI.Client/src/less/listview.less
View File

@@ -258,7 +258,6 @@
align-items: center;
padding: 10px 15px;
background: @grayLighter;
border-radius: 5px;
margin-bottom: 1px;
}
@@ -297,7 +296,6 @@
margin-right: 10px;
vertical-align: middle;
border: 1px solid @grayLight;
border-radius: 5px;
background: #ffffff;
padding: 6px 8px;
display: block;
@@ -318,7 +316,6 @@
margin-top: 10px;
color: @blue;
border: 1px dashed #d9d9d9;
border-radius: 5px;
display: flex;
align-items: center;
justify-content: center;

1
src/Umbraco.Web.UI.Client/src/less/panel.less
View File

@@ -386,7 +386,6 @@
align-items: center;
background: #ffffff;
border: 1px solid #ECECEC;
border-radius: 5px;
animation: fadeIn 0.5s;
flex: 0 0 55px;
}

20
src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
View File

@@ -1,6 +1,6 @@
<div class="umb-list-view">
<div class="umb-list-view-settings">
<div class="umb-list-view__trigger">
<div class="umb-list-view-settings__trigger">
<label class="checkbox no-indent">
<input type="checkbox" ng-model="enableListView" hotkey="alt+shift+l" /> Yes - enable list view
</label>
@@ -8,24 +8,24 @@
<!-- list view enabled -->
<div ng-if="enableListView">
<div class="umb-list-view__box" ng-class="{'-open': editDataTypeSettings}">
<div class="umb-list-view-settings__box" ng-class="{'-open': editDataTypeSettings}">
<div class="umb-list-view__content">
<i class="umb-list-view__list-view-icon icon-list"></i>
<div class="umb-list-view-settings__content">
<i class="umb-list-view-settings__list-view-icon icon-list"></i>
<div>
<div>
<div class="umb-list-view__name">{{ dataType.name }} <em ng-if="!customListViewCreated">(default)</em></div>
<a href="" ng-click="toggleEditListViewDataTypeSettings()"><i class="umb-list-view__settings-icon icon-settings"></i></a>
<div class="umb-list-view-settings__name">{{ dataType.name }} <em ng-if="!customListViewCreated">(default)</em></div>
<a href="" ng-click="toggleEditListViewDataTypeSettings()"><i class="umb-list-view-settings__settings-icon icon-settings"></i></a>
</div>
<a href="" class="umb-list-view__create-new" ng-if="!customListViewCreated" ng-click="createCustomListViewDataType()">Create custom list view</a>
<a href="" class="umb-list-view__remove-new" ng-if="customListViewCreated" ng-click="removeCustomListDataType()">Remove custom list view</a>
<a href="" class="umb-list-view-settings__create-new" ng-if="!customListViewCreated" ng-click="createCustomListViewDataType()">Create custom list view</a>
<a href="" class="umb-list-view-settings__remove-new" ng-if="customListViewCreated" ng-click="removeCustomListDataType()">Remove custom list view</a>
</div>
</div>
</div>
<!-- list view settings -->
<div class="umb-list-view__settings form-horizontal" ng-if="editDataTypeSettings" ng-class="{'-open': editDataTypeSettings}">
<div class="umb-list-view-settings__settings form-horizontal" ng-if="editDataTypeSettings" ng-class="{'-open': editDataTypeSettings}">
<umb-property property="preValue" ng-repeat="preValue in dataType.preValues">
<umb-editor model="preValue" is-pre-value="true"></umb-editor>