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 #11408 from pivanov/bug-892086
Browse files Browse the repository at this point in the history 
Bug 892086 - [B2G][l10n][Spanish][Cost Control] Reset button on Settings has ellipses
  • Loading branch information
Pavel Ivanov committed Aug 19, 2013
2 parents 2d482a0 + 016ff9e commit f1674bf
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 46 deletions.
84 changes: 39 additions & 45 deletions apps/costcontrol/settings.html
View file
Expand Up @@ -111,16 +111,14 @@ <h2 data-l10n-id="data-usage">Data Usage</h2>
</header>
<ul class="settings">
<li>
<div class="end buttons-list">
<button data-l10n-id="reset" id="reset-data-usage">Reset</button>
</div>
<p id="mobile-data-usage">
<span class="usage"></span> <span data-l10n-id="mobile-usage">Mobile usage</span>
</p>
<p id="wifi-data-usage">
<span class="usage"></span> <span data-l10n-id="wifi-usage">Wi-Fi usage</span>
</p>
<p class="meta"></p>
<button data-l10n-id="reset" id="reset-data-usage">Reset</button>
</li>
<li>
<label class="pack-switch end">
Expand All @@ -130,12 +128,10 @@ <h2 data-l10n-id="data-usage">Data Usage</h2>
<p data-l10n-id="data-limit-alert">Data use alert</p>
</li>
<li>
<div class="end buttons-list">
<button class="settings-option icon icon-dialog" data-widget-type="data-limit" data-disable-on="dataLimit=false">
<span class="tag"></span>
</button>
</div>
<p data-l10n-id="data-limit-value2">When use is above</p>
<button class="settings-option icon icon-dialog" data-widget-type="data-limit" data-disable-on="dataLimit=false">
<span class="tag"></span>
</button>
</li>
</ul>

Expand Down Expand Up @@ -169,44 +165,42 @@ <h2 data-l10n-id="phone-and-internet-data-report">Phone and Internet data report
</span>
</li>
<li class="reset-entry">
<div class="end buttons-list">
<span class="button icon icon-dialog fake-select">
<select class="settings-option icon icon-dialog" data-option="resetTime" data-hide-on="trackingPeriod!=monthly" data-disable-on="trackingPeriod!=monthly">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
</select>
</span>
</div>
<p data-l10n-id="starting-on">Starting on</p>
<span class="button icon icon-dialog fake-select">
<select class="settings-option icon icon-dialog" data-option="resetTime" data-hide-on="trackingPeriod!=monthly" data-disable-on="trackingPeriod!=monthly">
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
</select>
</span>
</li>
</ul>
</section>
Expand Down
13 changes: 13 additions & 0 deletions apps/costcontrol/style/app.css
View file
Expand Up @@ -156,6 +156,14 @@ body[role="application"] section[role="region"] > header button {
list-style: none;
}

li button {
text-align: center;
}

li button.icon {
text-align: left;
}

li button:after {
top: calc(100% + 0.1rem);
}
Expand Down Expand Up @@ -196,3 +204,8 @@ section.content {
#settings-view {
z-index: 20;
}

#reset-data-usage {
margin-top: 1rem;
}

Binary file added apps/costcontrol/style/bb/buttons/images/ui/default.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion apps/costcontrol/style/views/settings.css
View file
Expand Up @@ -35,7 +35,7 @@
.settings li {
border-bottom: solid 0.1rem #e0e0dd;
font-size: 1.6rem;
padding: 1.2rem 0 1.2rem 1.5rem;
padding: 1.2rem 0;
margin-left: 1.5rem;
margin-right: 1.5rem;
position: relative;
Expand All @@ -44,9 +44,14 @@
}

.settings li p {
margin: 0 1.5rem;
overflow: hidden;
}

.settings li button {
background: #fafafa url(../bb/buttons/images/ui/default.png) repeat-x left bottom / auto 100%;
}

.settings li p:only-of-type {
padding-top: 0.8rem;
padding-bottom: 0.8rem;
Expand Down

0 comments on commit f1674bf

Please sign in to comment.