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

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

Browse Source
This commit is contained in:
Shannon
2013-11-04 22:12:27 +11:00
parent 8d7456dfe7 9c25131958
commit eb181b220f
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,8 @@ body {
position: absolute;
z-index: 100;
background: @white;
height: 100%;
height: 100%;
border-right: 1px solid @grayLight;
}
.navigation-inner-container{

5
src/Umbraco.Web.UI.Client/src/less/modals.less
View File

@@ -4,7 +4,6 @@
/* Modalcolumn is used for menu panels */
.umb-modalcolumn {
background: white;
border-left: #f6f6f6 1px solid;
}
.umb-modalcolumn-header {
@@ -26,8 +25,8 @@
.umb-modalcolumn-body {
padding: 0px;
background: white;
top: 101px;
background: @white;
top: 100px;
position: absolute;
left: 0px;
right: 0px;

22
src/Umbraco.Web.UI.Client/src/less/tree.less
View File

@@ -104,7 +104,7 @@
.umb-tree ins {
vertical-align: middle;
margin-left: -16px;
margin: -4px 0 0 -16px;
width: 16px;
height: 16px;
display: inline-block;
@@ -149,24 +149,26 @@ a.umb-options {
cursor: pointer;
display: inline-block;
text-align: center;
width: 45px;
position: absolute;
right: 0px;
top: 0px;
background: @grayLighter;
right: 10px;
top: 3px;
padding: 0 3px 3px 5px;
border: 1px solid @grayLight;
.border-radius(@baseBorderRadius);
background: @btnBackground;
}
a.umb-options i {
height: 6px !important;
width: 6px !important;
height: 5px !important;
width: 5px !important;
border-radius: 20px;
background: #333;
background: @black;
display: inline-block;
margin: 10px 2px 0 0;
margin: 0 2px 0 0;
}
li.root > div > a.umb-options {
top: 10px;
top: 13px;
}
.hide-options a.umb-options{display: none !important}

2
src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
View File

@@ -5,7 +5,7 @@
</umb-sections>
<!-- navigation container -->
<div id="navigation" ng-show="nav.ui.showNavigation" class="fill shadow umb-modalcolumn" ng-animate="'slide'">
<div id="navigation" ng-show="nav.ui.showNavigation" class="fill umb-modalcolumn" ng-animate="'slide'">
<div ng-swipe-left="nav.hideNavigation()" class="navigation-inner-container span6" style="z-index: 100">

4
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberTypes.cs
View File

@@ -96,8 +96,8 @@ function openMemberType(id) {
treeElement.SetAttribute("text", MemberTypes[i].Text);
treeElement.SetAttribute("action", "javascript:openMemberType(" + MemberTypes[i].Id + ");");
treeElement.SetAttribute("src", "");
treeElement.SetAttribute("icon", "membertype.gif");
treeElement.SetAttribute("openIcon", "membertype.gif");
treeElement.SetAttribute("icon", "icon-users");
treeElement.SetAttribute("openIcon", "icon-users");
treeElement.SetAttribute("nodeType", "memberType");
root.AppendChild(treeElement);
}