Fix bug 465317 - Today and Navigation Buttons need to be polished. r=philipp
authorDecathlon <bv1578@gmail.com>
Thu, 18 Feb 2010 11:18:00 +0100
changeset 4954 6ed701e2db348c34a511f272fdc9ce5dc9bfdf61
parent 4953 24b02948c31925f3022ddae81f28f2d5e428873c
child 4955 cde3da0606bd6281e0c6a4b0aa434aa46e4af7df
push idunknown
push userunknown
push dateunknown
reviewersphilipp
bugs465317
Fix bug 465317 - Today and Navigation Buttons need to be polished. r=philipp
calendar/base/content/calendar-views.xul
calendar/base/themes/winstripe/calendar-views.css
--- a/calendar/base/content/calendar-views.xul
+++ b/calendar/base/content/calendar-views.xul
@@ -47,56 +47,58 @@
 
 
 <overlay id="calendar-views-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <vbox id="calendar-view-box" context="calendar-view-context-menu">
         <hbox id="calendar-nav-control">
             <vbox flex="1">
-               <hbox flex="1" class="navigation-inner-box" align="end">
+               <hbox flex="1" class="navigation-inner-box" align="center">
                   <!-- If you are extending a view, add attributes to these
                        nodes for your view. i.e if your view has the id
                        "foobar-view", then you need to add the attribute
                        tooltiptext-foobar="..." -->
-                  <toolbarbutton id="previous-view-button"
-                                 class="view-navigation-button"
-                                 chromedir="&locale.dir;"
-                                 type="prev"
-                                 tooltiptext-day="&calendar.navigation.prevday.tooltip;"
-                                 tooltiptext-week="&calendar.navigation.prevweek.tooltip;"
-                                 tooltiptext-multiweek="&calendar.navigation.prevweek.tooltip;"
-                                 tooltiptext-month="&calendar.navigation.prevmonth.tooltip;"
-                                 command="calendar_view_prev_command"/>
-                  <toolbarbutton id="today-view-button"
-                                 class="today-navigation-button"
-                                 label="&calendar.today.button.label;"
-                                 tooltiptext-all="&calendar.today.button.tooltip;"
-                                 command="calendar_view_today_command"/>
-                  <toolbarbutton id="next-view-button"
-                                 class="view-navigation-button"
-                                 chromedir="&locale.dir;"
-                                 type="next"
-                                 tooltiptext-day="&calendar.navigation.nextday.tooltip;"
-                                 tooltiptext-week="&calendar.navigation.nextweek.tooltip;"
-                                 tooltiptext-multiweek="&calendar.navigation.nextweek.tooltip;"
-                                 tooltiptext-month="&calendar.navigation.nextmonth.tooltip;"
-                                 command="calendar_view_next_command"/>
+                  <hbox pack="center">
+                     <toolbarbutton id="previous-view-button"
+                                    class="view-navigation-button"
+                                    chromedir="&locale.dir;"
+                                    type="prev"
+                                    tooltiptext-day="&calendar.navigation.prevday.tooltip;"
+                                    tooltiptext-week="&calendar.navigation.prevweek.tooltip;"
+                                    tooltiptext-multiweek="&calendar.navigation.prevweek.tooltip;"
+                                    tooltiptext-month="&calendar.navigation.prevmonth.tooltip;"
+                                    command="calendar_view_prev_command"/>
+                     <toolbarbutton id="today-view-button"
+                                    class="today-navigation-button"
+                                    label="&calendar.today.button.label;"
+                                    tooltiptext-all="&calendar.today.button.tooltip;"
+                                    command="calendar_view_today_command"/>
+                     <toolbarbutton id="next-view-button"
+                                    class="view-navigation-button"
+                                    chromedir="&locale.dir;"
+                                    type="next"
+                                    tooltiptext-day="&calendar.navigation.nextday.tooltip;"
+                                    tooltiptext-week="&calendar.navigation.nextweek.tooltip;"
+                                    tooltiptext-multiweek="&calendar.navigation.nextweek.tooltip;"
+                                    tooltiptext-month="&calendar.navigation.nextmonth.tooltip;"
+                                    command="calendar_view_next_command"/>
+                  </hbox>
                   <label id="intervalDescription"
                                  class="view-header"
                                  crop="end"
                                  flex="1"
                                  pack="start"/>
                   <spacer flex="1"/>
                   <label id="calendarWeek"
                          class="view-header"
                          type="end"
                          crop="start"/>
-             </hbox>
-             <hbox flex="1" class="navigation-bottombox"/>
+               </hbox>
+            <hbox flex="1" class="navigation-bottombox"/>
          </vbox>
          <vbox pack="end">
              <tabs id="view-tabs"
                    class="calview-tabs"
                    setfocus="true">
                <tab id="calendar-day-view-button"
                     label="&calendar.day.button.label;"
                     tooltiptext="&calendar.day.button.tooltip;"
--- a/calendar/base/themes/winstripe/calendar-views.css
+++ b/calendar/base/themes/winstripe/calendar-views.css
@@ -652,18 +652,17 @@ tab[calview]:hover {
 tab[calview] > .tab-middle {
     text-align: center;
 }
 
 .view-header {
     font-weight: normal;
     font-size: 14px;
     color: #2E4E73;
-    padding-top: 5px;
-    margin-top: 5px;
+    margin-bottom: -1px;
 }
 
 .view-header[type="end"] {
     text-align: right;
     -moz-margin-end: 6px;
 }
 
 .navigation-inner-box {
@@ -689,21 +688,21 @@ tab[calview] > .tab-middle {
     -moz-margin-end: 2px;
     margin-bottom: 0px;
     padding: 4px;
 }
 
 .today-navigation-button {
     -moz-user-focus: normal;
     -moz-appearance: toolbarbutton;
-    margin-top: 2px;
+    margin-top: 3px;
     -moz-margin-start: 2px;
     -moz-margin-end: 2px;
     margin-bottom: 0px;
-    padding: 4px;
+    padding: 3px;
     padding-bottom: 5px;
     color: #2E4E73;
 }
 
 .view-navigation-button > .toolbarbutton-text {
     display: none;
 }