Mathijs den Burger pushed to branch master at cms-community / hippo-addon-channel-manager
Commits: 446127f3 by Joeri de Gooijer at 2016-06-13T16:58:40+02:00 CHANNELMGR-740 adjust changes button attention icon - - - - - fc85420c by Mathijs den Burger at 2016-06-14T14:20:30+02:00 CHANNELMGR-740 Add copyright to SVG icon - - - - - 1d628184 by Mathijs den Burger at 2016-06-14T14:34:11+02:00 CHANNELMGR-740 Tweak width of changes button The button was not wide enough to accomodate all text, so the selected version looked a bit unbalanced. - - - - - 51276664 by Mathijs den Burger at 2016-06-14T14:34:29+02:00 CHANNELMGR-740 Reintegrate bugfix/CHANNELMGR-740 - - - - - 3 changed files: - frontend-ng/src/angularjs/channel/changes/changesMenu.html - frontend-ng/src/images/attention.svg - frontend-ng/src/styles/_toolbar.scss Changes: ===================================== frontend-ng/src/angularjs/channel/changes/changesMenu.html ===================================== --- a/frontend-ng/src/angularjs/channel/changes/changesMenu.html +++ b/frontend-ng/src/angularjs/channel/changes/changesMenu.html @@ -16,10 +16,9 @@ <md-menu ng-if="changes.isShowChangesMenu()"> <md-button aria-label="{{ 'TOOLBAR_BUTTON_CHANGES' | translate }}" - class="qa-button-changes" + class="qa-button-changes changes-button" ng-click="$mdOpenMenu($event)"> - <md-icon md-colors="::{ color: 'accent-300' }" - md-svg-src="images/attention.svg"> + <md-icon md-svg-src="images/attention.svg"> </md-icon> {{ 'TOOLBAR_BUTTON_CHANGES' | translate }} </md-button> ===================================== frontend-ng/src/images/attention.svg ===================================== --- a/frontend-ng/src/images/attention.svg +++ b/frontend-ng/src/images/attention.svg @@ -17,7 +17,5 @@ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<circle fill="currentColor" cx="12" cy="12" r="8"/> -<rect x="11" y="15" width="2" height="2"/> -<rect x="11" y="7" width="2" height="7"/> +<circle fill="currentColor" cx="12" cy="12.2" r="4"/> </svg> ===================================== frontend-ng/src/styles/_toolbar.scss ===================================== --- a/frontend-ng/src/styles/_toolbar.scss +++ b/frontend-ng/src/styles/_toolbar.scss @@ -98,6 +98,18 @@ md-toolbar.hippo-toolbar { md-switch { margin: 0; } + + .changes-button { + margin-left: 0; + margin-right: 4px; + padding-right: 20px; + md-icon { + color: $orange-a400; + position: relative; + left: 6px; + bottom: 1px; + } + } } .viewport-name { View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/a29e3f7e45533f388679352c9469f7a7207cb108...51276664b283600a1f3cb34512202a81ae919630
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn