From dcbd460331a61fd9a3a25bc72f0141127279b679 Mon Sep 17 00:00:00 2001 From: Adrien Lemaire Date: Sat, 9 Aug 2014 16:58:49 +0900 Subject: [PATCH] fix audio menu style --- public/css/menu.styl | 4 ++-- views/shared/header/menu.jade | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/css/menu.styl b/public/css/menu.styl index 5abfe4dc8c..700d763909 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -123,7 +123,7 @@ padding-left:0em margin-left:0em margin-right: 0.618em -.toolbar-sync, .toolbar-settings +.toolbar-sync, .toolbar-settings, .toolbar-audio @extend $hrpg-button hrpg-button-color-mixin($color-toolbar) // Notifications icon and dropdown @@ -186,4 +186,4 @@ 0% transform: rotate(45deg) 100% - transform: rotate(0deg) \ No newline at end of file + transform: rotate(0deg) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 2df7508ccb..22e3e18412 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -136,9 +136,6 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') //-a(ng-click='') Clear all li.toolbar-controls-button a(ng-click='expandMenu(null)')=env.t('close') - li.toolbar-sync - a(ng-click='User.sync()', popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') - span.glyphicon.glyphicon-refresh li.toolbar-audio a(ng-click='expandMenu("music")') span.glyphicon.glyphicon-music @@ -160,6 +157,9 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') ng-options='k as v for (k , v) in soundThemes', ng-change='set("preferences.soundTheme", user.preferences.soundTheme)' ) + li.toolbar-sync + a(ng-click='User.sync()', popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter') + span.glyphicon.glyphicon-refresh li.toolbar-settings a(ng-click='expandMenu("settings")') span.glyphicon.glyphicon-cog