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 #28421 from gmarty/Bug-1118861-Sync-button-looks-t…
Browse files Browse the repository at this point in the history
…oo-similar-to-all-day-event-icon

Bug 1118861 - Sync button looks too similar to all day event icon
  • Loading branch information
gmarty committed Mar 4, 2015
2 parents 2b84f08 + 7879397 commit 3f2003f
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 34 deletions.
2 changes: 1 addition & 1 deletion apps/calendar/elements/multi_day.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<element name="multi-day" extends="section">
<template>
<div class="md__sticky">
<span class="md__all-day gaia-icon icon-calendar-allday" aria-hidden="true" data-l10n-id="all-day"></span>
<span class="md__all-day" data-icon="all-day" aria-hidden="true" data-l10n-id="all-day"></span>
<div class="md__alldays-wrapper">
<section class="md__alldays"></section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/calendar/js/views/multi_day.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ MultiDay.prototype = {
},

get allDayIcon() {
return this.element.querySelector('.icon-calendar-allday');
return this.element.querySelector('.md__all-day');
},

onactive: function() {
Expand Down
11 changes: 1 addition & 10 deletions apps/calendar/style/multi_day.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
position: absolute;
border-top: 0.1rem solid #e2e2e2;
width: 3rem;
text-align: center;
}

.day-view .md__all-day {
Expand All @@ -41,11 +42,6 @@
left: 0;
}

.day-view .icon-calendar-allday:before {
position: relative;
left: 2rem;
}

.md__day-name {
color: #707070;
font-size: 1.3rem;
Expand Down Expand Up @@ -487,11 +483,6 @@ html[dir="rtl"] .day-view .md__all-day {
right: 0;
}

html[dir="rtl"] .day-view .icon-calendar-allday:before {
left: unset;
right: 2rem;
}

html[dir="rtl"] .md__allday-events {
border-left: unset;
border-right: 0.1rem solid #e2e2e2;
Expand Down
1 change: 0 additions & 1 deletion apps/calendar/style/ui.css
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ gaia-header > a > span {

/* these icons uses a 32px base grid so we need to adjust the font size
* (shared font uses a 3rem base font-size) */
.icon-calendar-allday:before,
.icon-calendar-alarm:before,
.icon-calendar-bullet:before,
.icon-calendar-dot:before,
Expand Down
8 changes: 4 additions & 4 deletions apps/camera/bower_components/gaia-icons/.bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaia-icons",
"version": "0.7.9",
"version": "0.7.10",
"homepage": "https://github.com/wilsonpage/gaia-icons",
"authors": [
"Wilson Page <wilsonpage@me.com>"
Expand All @@ -22,11 +22,11 @@
"README.md",
"package.json"
],
"_release": "0.7.9",
"_release": "0.7.10",
"_resolution": {
"type": "version",
"tag": "v0.7.9",
"commit": "7ed476e4d55cb9b0e078b78ad198ca71ab067274"
"tag": "v0.7.10",
"commit": "d36aa7e6e16c937cbc3a317685b4785aa65ce010"
},
"_source": "git://github.com/gaia-components/gaia-icons.git",
"_target": "~0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/camera/bower_components/gaia-icons/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaia-icons",
"version": "0.7.9",
"version": "0.7.10",
"homepage": "https://github.com/wilsonpage/gaia-icons",
"authors": [
"Wilson Page <wilsonpage@me.com>"
Expand Down
Binary file modified apps/camera/bower_components/gaia-icons/fonts/gaia-icons.ttf
Binary file not shown.

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions apps/music/bower_components/gaia-icons/.bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaia-icons",
"version": "0.7.9",
"version": "0.7.10",
"homepage": "https://github.com/wilsonpage/gaia-icons",
"authors": [
"Wilson Page <wilsonpage@me.com>"
Expand All @@ -22,11 +22,11 @@
"README.md",
"package.json"
],
"_release": "0.7.9",
"_release": "0.7.10",
"_resolution": {
"type": "version",
"tag": "v0.7.9",
"commit": "7ed476e4d55cb9b0e078b78ad198ca71ab067274"
"tag": "v0.7.10",
"commit": "d36aa7e6e16c937cbc3a317685b4785aa65ce010"
},
"_source": "git://github.com/gaia-components/gaia-icons.git",
"_target": "~0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/music/bower_components/gaia-icons/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaia-icons",
"version": "0.7.9",
"version": "0.7.10",
"homepage": "https://github.com/wilsonpage/gaia-icons",
"authors": [
"Wilson Page <wilsonpage@me.com>"
Expand Down
Binary file modified apps/music/bower_components/gaia-icons/fonts/gaia-icons.ttf
Binary file not shown.

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions shared/elements/gaia-icons/.bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaia-icons",
"version": "0.7.9",
"version": "0.7.10",
"homepage": "https://github.com/wilsonpage/gaia-icons",
"authors": [
"Wilson Page <wilsonpage@me.com>"
Expand All @@ -22,14 +22,13 @@
"README.md",
"package.json"
],
"_release": "0.7.9",
"_release": "0.7.10",
"_resolution": {
"type": "version",
"tag": "v0.7.9",
"commit": "7ed476e4d55cb9b0e078b78ad198ca71ab067274"
"tag": "v0.7.10",
"commit": "d36aa7e6e16c937cbc3a317685b4785aa65ce010"
},
"_source": "git://github.com/gaia-components/gaia-icons.git",
"_target": "~0.7.9",
"_originalSource": "gaia-components/gaia-icons",
"_direct": true
"_target": "~0.7.0",
"_originalSource": "gaia-components/gaia-icons"
}
2 changes: 1 addition & 1 deletion shared/elements/gaia-icons/bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaia-icons",
"version": "0.7.9",
"version": "0.7.10",
"homepage": "https://github.com/wilsonpage/gaia-icons",
"authors": [
"Wilson Page <wilsonpage@me.com>"
Expand Down
Binary file modified shared/elements/gaia-icons/fonts/gaia-icons.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion shared/elements/gaia-icons/gaia-icons-embedded.css

Large diffs are not rendered by default.

0 comments on commit 3f2003f

Please sign in to comment.