Skip to content

Commit

Permalink
(css,js) Update md to v1.1.1-master-d774b76
Browse files Browse the repository at this point in the history
  • Loading branch information
cgx committed Nov 17, 2016
1 parent de209f5 commit 2f69c01
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
6 changes: 4 additions & 2 deletions UI/Templates/SchedulerUI/UIxCalMainView.wox
Expand Up @@ -696,8 +696,10 @@
</md-fab-actions>
</md-fab-speed-dial>
</div>
<div id="detailView" class="view-detail hide show-gt-xs md-default-theme md-background md-bg md-hue-2"
layout="column" ui-view="calendarView">
<div id="detailView" class="view-detail hide show-gt-xs"
layout="column"
md-colors="::{backgroundColor: 'default-background-200'}"
ui-view="calendarView">
<!-- calendar view -->
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/angular-material
Submodule angular-material updated 61 files
+16 −29 docs/app/css/style.css
+3 −2 docs/app/js/app.js
+51 −0 docs/app/js/css-api-table.js
+1 −0 docs/app/js/demo.js
+52 −1 src/components/autocomplete/autocomplete.spec.js
+2 −2 src/components/autocomplete/demoCustomTemplate/index.html
+1 −1 src/components/autocomplete/demoCustomTemplate/style.global.css
+18 −3 src/components/autocomplete/js/autocompleteController.js
+1 −0 src/components/bottomSheet/bottom-sheet.js
+11 −4 src/components/button/button.scss
+13 −0 src/components/chips/chips.spec.js
+7 −4 src/components/chips/js/chipsController.js
+8 −8 src/components/datepicker/datePicker.scss
+16 −2 src/components/datepicker/js/calendar.js
+2 −1 src/components/datepicker/js/calendar.spec.js
+16 −7 src/components/datepicker/js/datepickerDirective.js
+1 −1 src/components/datepicker/js/datepickerDirective.spec.js
+1 −1 src/components/dialog/demoThemeInheritance/script.js
+20 −1 src/components/dialog/dialog.js
+90 −2 src/components/input/input-animations.spec.js
+46 −12 src/components/input/input.js
+2 −1 src/components/list/list.js
+60 −17 src/components/list/list.spec.js
+1 −1 src/components/menu/js/menuDirective.js
+11 −18 src/components/navBar/navBar.js
+5 −2 src/components/navBar/navBar.spec.js
+14 −13 src/components/panel/panel.js
+27 −42 src/components/radioButton/radio-button.js
+22 −1 src/components/radioButton/radio-button.spec.js
+8 −0 src/components/select/select-theme.scss
+248 −264 src/components/select/select.spec.js
+8 −2 src/components/subheader/subheader.js
+25 −1 src/components/subheader/subheader.spec.js
+4 −0 src/components/switch/demoBasicUsage/index.html
+11 −0 src/components/switch/switch.js
+5 −0 src/components/switch/switch.scss
+16 −0 src/components/switch/switch.spec.js
+14 −0 src/components/tabs/demoStaticTabs/index.html
+1 −1 src/components/tabs/demoStaticTabs/readme.html
+6 −1 src/components/tabs/demoStaticTabs/script.js
+21 −10 src/components/tabs/demoStaticTabs/style.scss
+5 −6 src/components/tabs/js/tabsController.js
+9 −3 src/components/tabs/tabs-theme.scss
+7 −5 src/components/tabs/tabs.scss
+7 −7 src/components/toolbar/demoBasicUsage/index.html
+26 −4 src/components/toolbar/toolbar.js
+76 −52 src/components/tooltip/demoBasicUsage/index.html
+8 −12 src/components/tooltip/demoBasicUsage/script.js
+0 −8 src/components/tooltip/demoBasicUsage/style.css
+2 −2 src/components/tooltip/tooltip-theme.scss
+298 −294 src/components/tooltip/tooltip.js
+52 −56 src/components/tooltip/tooltip.scss
+234 −241 src/components/tooltip/tooltip.spec.js
+70 −0 src/components/truncate/demoBasicUsage/index.html
+48 −0 src/components/truncate/demoBasicUsage/style.scss
+86 −0 src/components/truncate/truncate.js
+17 −0 src/components/truncate/truncate.scss
+29 −0 src/components/truncate/truncate.spec.js
+1 −7 src/components/virtualRepeat/virtual-repeater.js
+16 −0 src/core/style/mixins.scss
+6 −0 test/angular-material-mocks.js
2 changes: 1 addition & 1 deletion UI/WebServerResources/bower.json
Expand Up @@ -10,7 +10,7 @@
"angular-sanitize": "1.5.x",
"angular-ui-router": "latest",
"angular-file-upload": "latest",
"angular-material": "1.1.1-master-70cecda",
"angular-material": "1.1.1-master-d774b76",
"file-saver.js": "latest",
"lodash": "latest",
"ng-sortable": "latest",
Expand Down
10 changes: 2 additions & 8 deletions UI/WebServerResources/js/Common/Common.app.js
Expand Up @@ -154,7 +154,7 @@
'800': '367d2e',
'900': '225e1b',
// 'A100': 'b9f6ca',
'A100': 'fafafa', // assigned to md-hue-1
'A100': 'fafafa', // assigned to md-hue-1, equivalent to grey-50 (default background palette)
'A200': '69f0ae',
'A400': '00e676',
'A700': '00c853',
Expand Down Expand Up @@ -213,15 +213,9 @@
.accentPalette('sogo-green', {
'default': '500',
// 'hue-1': '200',
'hue-1': 'A100', // background-50
'hue-1': 'A100', // grey-50
'hue-2': '300',
'hue-3': 'A700'
})
.backgroundPalette('grey', {
'default': '50',
'hue-1': '200',
'hue-2': '300',
'hue-3': '500'
});

if (!DebugEnabled) {
Expand Down
2 changes: 1 addition & 1 deletion UI/WebServerResources/scss/components/chips/chips.scss
Expand Up @@ -10,7 +10,7 @@ md-chips {
box-shadow: none;
}
.md-chip-content {
max-width: initial; // fix bug in ng-material
//max-width: initial; // fix bug in ng-material
}
// Custom 'chip remove' button used with chips in readonly mode
.sg-chip-remove {
Expand Down
6 changes: 3 additions & 3 deletions UI/WebServerResources/scss/components/list/list.scss
Expand Up @@ -31,9 +31,9 @@ md-list-item {
}

// Fix for md-menu visibility when set as a secondary action in a list item
&._md-button-wrap > div.md-button:first-child > .md-button:first-child {
z-index: $z-index-sidenav - 2;
}
// &._md-button-wrap > div.md-button:first-child > .md-button:first-child {
// z-index: $z-index-sidenav - 2;
// }
.md-secondary-container {
z-index: $z-index-sidenav - 1;
}
Expand Down
2 changes: 2 additions & 0 deletions UI/WebServerResources/scss/components/panel/_extends.scss
@@ -0,0 +1,2 @@
/*! panel/_extends.scss - */
@import '../../../angular-material/src/components/panel/panel.scss';
1 change: 1 addition & 0 deletions UI/WebServerResources/scss/components/panel/panel.scss
@@ -0,0 +1 @@
@import 'extends';
@@ -1,11 +1,11 @@
/// virtualRepeater.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-
@import 'extends';

md-virtual-repeat-container {
md-list {
// Fix weird scroll behavior when reaching bottom of list
// See https://github.com/angular/material/issues/4169
padding-top: 0;
padding-bottom: 0;
}
}
//.md-virtual-repeat-container {
// md-list {
// // Fix weird scroll behavior when reaching bottom of list
// // See https://github.com/angular/material/issues/4169
// padding-top: 0;
// padding-bottom: 0;
// }
//}
18 changes: 9 additions & 9 deletions UI/WebServerResources/scss/core/variables.scss
@@ -1,12 +1,5 @@
/// variables.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-

// Include rem function from angular-material/src/core/style/variables.scss
// ------------------------------------------------------------------------
@function rem($multiplier) {
$font-size: 10px;
@return $multiplier * $font-size;
}

// palettes import -
// ------------------------------------------------------------------------------
// fixme : consolidate all settings and imports in a decent 'settings' file
Expand All @@ -23,6 +16,11 @@
$font-family: 'Fira sans', 'Helvetica Neue', sans-serif !default;
$font-size: 10px;

//-- Must be defined before $font-size.
@function rem($multiplier) {
@return $multiplier * $font-size;
}

$display-4-font-size-base: rem(11.20) !default;
$display-3-font-size-base: rem(5.600) !default;
$display-2-font-size-base: rem(4.500) !default;
Expand Down Expand Up @@ -168,14 +166,15 @@ $z-index-toast: 105 !default;
$z-index-tooltip: 100 !default;
$z-index-menu: 100 !default;
$z-index-calendar-pane: 100 !default;
$z-index-select: 90 !default;
//$z-index-select: 90 !default;
$z-index-select: 106 !default;
$z-index-dialog: 80 !default;
$z-index-bottom-sheet: 70 !default;
$z-index-scroll-mask: 65 !default;
$z-index-scroll-mask-bar: 65 !default;
$z-index-sidenav: 60 !default;
$z-index-backdrop: 50 !default;
$z-index-fab: 60 !default;
$z-index-fab: 20 !default;
$z-index-progress-circular: 2 !default; // Used to fix animation bug in Chrome
$z-index-toolbar: 10 !default;
$z-index-view: 9;
Expand Down Expand Up @@ -213,6 +212,7 @@ $button-fab-width: rem(5.600) !default;
$button-fab-height: rem(5.600) !default;
$button-fab-padding: rem(1.60) !default;


// Shared Checkbox variables
$checkbox-width: 20px !default;
$checkbox-height: $checkbox-width !default;
Expand Down
1 change: 1 addition & 0 deletions UI/WebServerResources/scss/styles.scss
Expand Up @@ -45,6 +45,7 @@
@import 'components/input/input';
@import 'components/list/list';
@import 'components/menu/menu';
@import 'components/panel/panel';
@import 'components/progressCircular/progress-circular';
@import 'components/progressLinear/progress-linear';
@import 'components/radioButton/radio-button';
Expand Down

0 comments on commit 2f69c01

Please sign in to comment.