LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for latest md changes

pull/217/head
Francis Lachapelle 2016-07-12 11:29:24 -04:00
parent 8f382192ee
commit 7e950896ba
11 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/WebServerResources/angular-material

@ -1 +1 @@
Subproject commit 7f01138e13d6d651d390e1eb6eb85af1f0fada68
Subproject commit 82fdd2c7c1cd2eb3b84608e2245a353b561c1c28

2
UI/WebServerResources/bower.json
View File

@ -10,7 +10,7 @@
"angular-sanitize": "1.4.x",
"angular-ui-router": "latest",
"angular-file-upload": "latest",
"angular-material": "1.1.0-rc.5-master-7f01138",
"angular-material": "1.1.0-rc.5-master-82fdd2c",
"file-saver.js": "latest",
"lodash": "latest",
"ng-sortable": "latest",

4
UI/WebServerResources/js/Common/sgFolderStylesheet.directive.js
View File

@ -59,10 +59,10 @@
' border-color: {{ cssCtrl.contrast(cssCtrl.ngModel.color) }} !important;',
' }',
/* Checkbox color */
' .checkbox-folder{{ cssCtrl.ngModel.id }} ._md-icon {',
' .checkbox-folder{{ cssCtrl.ngModel.id }} .md-icon {',
' background-color: {{ cssCtrl.ngModel.color }} !important;',
' }',
' .checkbox-folder{{ cssCtrl.ngModel.id }}.md-checked ._md-icon:after {',
' .checkbox-folder{{ cssCtrl.ngModel.id }}.md-checked .md-icon:after {',
' border-color: {{ cssCtrl.contrast(cssCtrl.ngModel.color) }} !important;',
' }',
'</style>'

14
UI/WebServerResources/scss/components/list/list.scss
View File

@ -26,7 +26,7 @@ md-list-item {
// Gain some space with secondary action button;
// Impact: list with checkbox in sidevav of Calendar module
&.md-with-secondary ._md-list-item-inner {
&.md-with-secondary .md-list-item-inner {
padding-right: $bl;
}
@ -34,11 +34,11 @@ md-list-item {
&._md-button-wrap > div.md-button:first-child > .md-button:first-child {
z-index: $z-index-sidenav - 2;
}
._md-secondary-container {
.md-secondary-container {
z-index: $z-index-sidenav - 1;
}
._md-list-item-inner {
.md-list-item-inner {
overflow: hidden;
// Gain some space since we want small list items
@ -87,8 +87,8 @@ md-list-item {
md-list-item {
// Gain some space on the right side of the folder icon
._md-list-item-inner > md-icon:first-child,
._md-list-item-inner > md-checkbox:first-child {
.md-list-item-inner > md-icon:first-child,
.md-list-item-inner > md-checkbox:first-child {
margin-right: $bl * 2;
}
@ -151,7 +151,7 @@ div.md-tile-left {
min-width: $sg-md-grid-pitch + $baseline-grid;
}
.sg-section-list md-list-item._md-button-wrap > .md-button:first-child ._md-list-item-inner {
.sg-section-list md-list-item._md-button-wrap > .md-button:first-child .md-list-item-inner {
// Expect the container to include a sg-tile-icons (Mailer module)
padding-right: 0px;
}
@ -286,7 +286,7 @@ div.md-tile-left {
.md-avatar {
display: block;
// From md-list-item ._md-list-item-inner .md-avatar
// From md-list-item .md-list-item-inner .md-avatar
width: $list-item-primary-avatar-width;
height: $list-item-primary-avatar-width;
margin-top: $baseline-grid;

2
UI/WebServerResources/scss/components/sidenav/sidenav.scss
View File

@ -9,7 +9,7 @@ $sidenav-min-space: $pitch;
md-sidenav {
overflow: inherit;
&._md-locked-open {
&.md-locked-open {
@include from(md) {
@include flex-col($breakpoint: md, $nb: 4, $grow: 1, $shrink: 0);
// Custom representation of a closed sidenav where the sidenav is pushed to the left;

6
UI/WebServerResources/scss/components/sticky/sticky.scss
View File

@ -1,8 +1,2 @@
@import "extends";
._md-sticky-clone {
// Increase the z-index of sticky subheaders so it always appear above
// seconday buttons of list items.
// See z-index changes in custom list.scss.
z-index: $z-index-sidenav;
}

13
UI/WebServerResources/scss/components/subheader/subheader.scss
View File

@ -5,15 +5,22 @@ $sg-subheader-padding-top-bottom: ($subheader-padding - ($icon-button-height - $
$sg-subheader-padding-left-right: $baseline-grid;
.md-subheader-wrapper:not(.md-sticky-no-effect).md-sticky-clone {
// Increase the z-index of sticky subheaders so it always appear above
// seconday buttons of list items.
// See z-index changes in custom list.scss.
z-index: $z-index-sidenav;
}
.sg-md-subheader {
&--with-icon ._md-subheader-inner,
&--with-secondary-icon ._md-subheader-inner {
&--with-icon .md-subheader-inner,
&--with-secondary-icon .md-subheader-inner {
line-height: $sg-avatar-width + ($sg-subheader-padding-top-bottom)*2;
padding: ($subheader-padding - ($icon-button-height - $subheader-font-size)/2) $baseline-grid;
padding: 0;
padding-left: $subheader-padding;
}
&--with-icon ._md-subheader-inner {
&--with-icon .md-subheader-inner {
padding-left: 0;
}
&--fixed {

2
UI/WebServerResources/scss/core/print.scss
View File

@ -8,7 +8,7 @@
// Don't print some components
md-sidenav,
md-card-actions,
._md-open-menu-container,
.md-open-menu-container,
.toolbar-main,
.view-list,
.sg-reversible.sg-flip .sg-face,

12
UI/WebServerResources/scss/views/MailerUI.scss
View File

@ -12,7 +12,7 @@
padding-bottom: $baseline-grid;
padding: 0 $baseline-grid*2 $baseline-grid $baseline-grid*2;
text-align: center;
md-progress-linear > ._md-container {
md-progress-linear > .md-container {
height: 2px;
}
}
@ -74,24 +74,24 @@ md-sidenav {
md-checkbox {
&.sg-folder {
// Show checkbox as a "closed" folder when unchecked and "opened" folder when checked
._md-container:after {
.md-container:after {
color: rgba(0,0,0,0.54);
font-family: 'Material Icons';
font-size: 24px;
content: "\e2c7";
top: -4px;
left: -2px;
left: 0px;
width: 1em;
height: 1em;
}
._md-icon {
.md-icon {
border-width: 0;
}
&.md-checked {
._md-container:after {
.md-container:after {
content: "\e2c8";
}
._md-icon {
.md-icon {
background-color: initial;
&:after {
border-style: none;

3
UI/WebServerResources/scss/views/SchedulerUI.scss
View File

@ -72,9 +72,6 @@ $quarter_height: 10px;
min-height: 0;
.day {
padding-left: 1%;
div {
overflow: hidden;
}
}
}
}

4
UI/WebServerResources/scss/views/_view.scss
View File

@ -57,11 +57,11 @@ $listView-width: grid-step(6) !global;
// on the right side of the list item. Since we define the avatar as the secondary button, we must move it to
// the left side of the list item.
.md-with-secondary {
._md-list-item-inner {
.md-list-item-inner {
order: 2;
padding-left: $baseline-grid;
}
._md-secondary-container {
.md-secondary-container {
order: 1; // move secondary container to the left
}
.md-secondary {