Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Merge pull request #23511 from yzen/bug-1014052
Browse files Browse the repository at this point in the history 
Bug 1014052 - making statusbar markup consistent with layout for better ...
  • Loading branch information
@yzen
yzen committed Sep 11, 2014
2 parents 7c5014a + a66e211 commit 944cf2b
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 38 deletions.
58 changes: 29 additions & 29 deletions apps/system/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,42 +493,42 @@
<div id="statusbar-icons" role="group" data-l10n-id="statusbar">
<div id="statusbar-maximized-wrapper">
<div id="statusbar-maximized" class="statusbar">
<!-- General -->
<div id="statusbar-time" class="sb-icon-time" role="listitem"></div>
<div id="statusbar-battery" class="sb-icon sb-icon-battery" role="listitem"></div>
<!-- Carrier & date label -->
<div id="statusbar-label" class="sb-start-upper sb-icon-label" role="listitem"></div>

<!-- Connectivity -->
<div id="statusbar-flight-mode" class="sb-icon sb-icon-flight-mode" hidden role="listitem" data-l10n-id="statusbarFlightMode"></div>
<div id="statusbar-wifi" class="sb-icon sb-icon-wifi" data-level="4" hidden role="listitem"></div>
<div id="statusbar-connections" class="sb-icon-connections" hidden role="presentation"></div>
<!-- HACK: We use images instead of divs to enforce allocation of a
dedicated layer just for this animated icons, remove after
https://bugzil.la/717872 gets fixed -->
<img id="statusbar-network-activity" src="style/statusbar/images/network-activity.png" class="sb-icon-network-activity" hidden role="listitem" data-l10n-id="statusbarNetworkActivity">
<div id="statusbar-tethering" class="sb-icon sb-icon-tethering" hidden role="listitem"></div>
<div id="statusbar-bluetooth" class="sb-icon sb-icon-bluetooth" hidden role="listitem"></div>
<div id="statusbar-bluetooth-transferring" class="sb-icon sb-icon-bluetooth-transferring" role="listitem" hidden data-l10n-id="statusbarBluetoothTransferring"></div>
<div id="statusbar-nfc" class="sb-icon sb-icon-nfc" hidden role="listitem" data-l10n-id="statusbarNfc"></div>
<!-- Unused -->
<div id="statusbar-sms" class="sb-icon sb-icon-sms" hidden role="listitem"></div>

<!-- System -->
<div id="statusbar-emergency-cb-notification" class="sb-icon sb-icon-emergency-cb-notification" hidden role="listitem" data-l10n-id="statusbarEmergencyCBNotification"></div>
<div id="statusbar-alarm" class="sb-icon sb-icon-alarm" hidden role="listitem" data-l10n-id="statusbarAlarm"></div>
<div id="statusbar-playing" class="sb-icon sb-icon-playing" hidden role="listitem" data-l10n-id="statusbarPlaying"></div>
<div id="statusbar-headphones" class="sb-icon sb-icon-headphones" hidden role="listitem" data-l10n-id="statusbarHeadphones"></div>
<div id="statusbar-bluetooth-headphones" class="sb-icon sb-icon-bluetooth-headphones" role="listitem" hidden data-l10n-id="statusbarBluetoothHeadphones"></div>
<div id="statusbar-call-forwardings" class="sb-icon-call-forwardings" hidden role="presentation"></div>
<div id="statusbar-geolocation" class="sb-icon sb-icon-geolocation" hidden role="listitem" data-l10n-id="statusbarGeolocation"></div>
<div id="statusbar-recording" class="sb-icon sb-icon-recording" hidden role="listitem" data-l10n-id="statusbarRecording"></div>
<div id="statusbar-mute" class="sb-icon sb-icon-mute" hidden role="listitem"></div>
<div id="statusbar-usb" class="sb-icon sb-icon-usb" hidden role="listitem" data-l10n-id="statusbarUsb"></div>
<!-- See note on <img> above. -->
<img id="statusbar-system-downloads" src="style/statusbar/images/system-downloads.png" class="sb-icon-system-downloads" hidden role="listitem" data-l10n-id="statusbarDownloads">
<div id="statusbar-usb" class="sb-icon sb-icon-usb" hidden role="listitem" data-l10n-id="statusbarUsb"></div>
<div id="statusbar-mute" class="sb-icon sb-icon-mute" hidden role="listitem"></div>
<div id="statusbar-recording" class="sb-icon sb-icon-recording" hidden role="listitem" data-l10n-id="statusbarRecording"></div>
<div id="statusbar-geolocation" class="sb-icon sb-icon-geolocation" hidden role="listitem" data-l10n-id="statusbarGeolocation"></div>
<div id="statusbar-call-forwardings" class="sb-icon-call-forwardings" hidden role="presentation"></div>
<div id="statusbar-bluetooth-headphones" class="sb-icon sb-icon-bluetooth-headphones" role="listitem" hidden data-l10n-id="statusbarBluetoothHeadphones"></div>
<div id="statusbar-headphones" class="sb-icon sb-icon-headphones" hidden role="listitem" data-l10n-id="statusbarHeadphones"></div>
<div id="statusbar-playing" class="sb-icon sb-icon-playing" hidden role="listitem" data-l10n-id="statusbarPlaying"></div>
<div id="statusbar-alarm" class="sb-icon sb-icon-alarm" hidden role="listitem" data-l10n-id="statusbarAlarm"></div>
<div id="statusbar-emergency-cb-notification" class="sb-icon sb-icon-emergency-cb-notification" hidden role="listitem" data-l10n-id="statusbarEmergencyCBNotification"></div>

<!-- Unused -->
<div id="statusbar-sms" class="sb-icon sb-icon-sms" hidden role="listitem"></div>
<!-- Connectivity -->
<div id="statusbar-nfc" class="sb-icon sb-icon-nfc" hidden role="listitem" data-l10n-id="statusbarNfc"></div>
<div id="statusbar-bluetooth-transferring" class="sb-icon sb-icon-bluetooth-transferring" role="listitem" hidden data-l10n-id="statusbarBluetoothTransferring"></div>
<div id="statusbar-bluetooth" class="sb-icon sb-icon-bluetooth" hidden role="listitem"></div>
<div id="statusbar-tethering" class="sb-icon sb-icon-tethering" hidden role="listitem"></div>
<!-- HACK: We use images instead of divs to enforce allocation of a
dedicated layer just for this animated icons, remove after
https://bugzil.la/717872 gets fixed -->
<img id="statusbar-network-activity" src="style/statusbar/images/network-activity.png" class="sb-icon-network-activity" hidden role="listitem" data-l10n-id="statusbarNetworkActivity">
<div id="statusbar-connections" class="sb-icon-connections" hidden role="presentation"></div>
<div id="statusbar-wifi" class="sb-icon sb-icon-wifi" data-level="4" hidden role="listitem"></div>
<div id="statusbar-flight-mode" class="sb-icon sb-icon-flight-mode" hidden role="listitem" data-l10n-id="statusbarFlightMode"></div>

<!-- Carrier & date label -->
<div id="statusbar-label" class="sb-start-upper sb-icon-label" role="listitem"></div>
<!-- General -->
<div id="statusbar-battery" class="sb-icon sb-icon-battery" role="listitem"></div>
<div id="statusbar-time" class="sb-icon-time" role="listitem"></div>
</div>
</div>
</div>
Expand Down
11 changes: 2 additions & 9 deletions apps/system/style/statusbar/statusbar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ body #statusbar {
}

.statusbar {
display: flex;
justify-content: flex-end;
position: absolute;
width: 100%;
height: 3rem;
Expand All @@ -138,7 +140,6 @@ body #statusbar {
}

.statusbar > * {
float: right;
margin: 0.6rem 0.2rem 0.6rem 0.2rem;
}

Expand All @@ -152,14 +153,6 @@ body #statusbar {
left: 0;
}

*[dir=rtl] .statusbar > * {
float: left;
}

*[dir=rtl] body .statusbar > .sb-start {
float: right;
}

.statusbar > .sb-start-upper {
visibility: hidden;
position: absolute;
Expand Down

0 comments on commit 944cf2b

Please sign in to comment.