Bug 1008121 - [VDR][Calendarl] Apply Buttons [BB]

mozilla-b2g · May 20, 2014 · b1906f6 · b1906f6
1 parent c462d91
commit b1906f6
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 66 deletions.
diff --git a/apps/bookmark/locales/bookmark.en-US.properties b/apps/bookmark/locales/bookmark.en-US.properties
@@ -16,4 +16,5 @@ done-action=Done
 
 remove-title=Remove {{name}}
 remove-message=Remove {{name}} from system?
+cancel-action=Cancel
 remove-action=Remove
diff --git a/apps/calendar/elements/lazy_styles.html b/apps/calendar/elements/lazy_styles.html
@@ -2,7 +2,7 @@
   <template>
 	<link rel="stylesheet" type="text/css" href="/style/forms.css">
 	<link rel="stylesheet" type="text/css" href="/style/overlay.css">
-	<link rel="stylesheet" type="text/css" href="/shared/style/buttons.css">
+	<link rel="stylesheet" type="text/css" href="/shared/style_unstable/buttons.css">
 	<link rel="stylesheet" type="text/css" href="/shared/style/confirm.css">
 	<link rel="stylesheet" type="text/css" href="/shared/style/switches.css">
 	<link rel="stylesheet" type="text/css" href="/shared/style/status.css">

diff --git a/apps/calendar/elements/modify_event.html b/apps/calendar/elements/modify_event.html
@@ -36,36 +36,28 @@ <h1 data-l10n-id="add-event-header">
 
         <li class="start-date">
           <span class="button icon icon-dialog">
-            <label>
-              <input name="startDate" data-l10n-id="event-start-date" placeholder="Date" type="date" class="hidden-input" />
-            </label>
+            <input name="startDate" data-l10n-id="event-start-date" placeholder="Date" type="date" class="hidden-input" />
             <span class="datetime" id="start-date-locale"></span>
           </span>
         </li>
 
         <li class="start-time">
           <span class="button icon icon-dialog">
-            <label>
-              <input type="time" data-l10n-id="event-start-time" placeholder="Start Time" name="startTime" class="hidden-input" />
-            </label>
+            <input type="time" data-l10n-id="event-start-time" placeholder="Start Time" name="startTime" class="hidden-input" />
             <span class="datetime" id="start-time-locale"></span>
           </span>
         </li>
 
         <li class="end-date">
           <span class="button icon icon-dialog">
-            <label>
-              <input name="endDate" data-l10n-id="event-end-date" placeholder="Date" type="date" class="hidden-input" />
-            </label>
+            <input name="endDate" data-l10n-id="event-end-date" placeholder="Date" type="date" class="hidden-input" />
             <span class="datetime" id="end-date-locale"></span>
           </span>
         </li>
 
         <li class="end-time">
           <span class="button icon icon-dialog">
-            <label>
-              <input type="time" data-l10n-id="event-end-time" placeholder="End Time" name="endTime" class="hidden-input" />
-            </label>
+            <input type="time" data-l10n-id="event-end-time" placeholder="End Time" name="endTime" class="hidden-input" />
             <span class="datetime" id="end-time-locale"></span>
           </span>
         </li>
@@ -93,13 +85,12 @@ <h3 data-l10n-id="remind-me">Remind me</h3>
           <textarea name="description" data-l10n-id="event-description" x-inputmode="latin-prose" placeholder="Notes"></textarea>
         </li>
 
-        <li class="delete">
-          <a role="button" data-l10n-id="event-delete" class="danger delete-record">
-            Delete Event
-          </a>
-        </li>
-
       </ol>
+      <div class="delete">
+        <a role="button" data-l10n-id="event-delete" class="danger delete-record">
+          Delete Event
+        </a>
+      </div>
 
       <section role="status">
         <p class="errors"></p>

diff --git a/apps/calendar/style/building_blocks.css b/apps/calendar/style/building_blocks.css
@@ -2,13 +2,6 @@
 * web asset generated css file.
 * Do not directly the contents.
 */
-/* ----------------------------------
- * INPUT AREAS
- * ---------------------------------- */
- body[role="application"] label {
-   display: block;
-   position: relative;
- }
 
 #settings {
   position: absolute;

diff --git a/apps/calendar/style/calendar.css b/apps/calendar/style/calendar.css
@@ -30,13 +30,6 @@ section {
   width: 100%;
 }
 
-button {
-  border: none;
-  background: transparent;
-  padding: 0;
-  margin: 0;
-}
-
 ol,
 menu li,
 ol li {

diff --git a/apps/calendar/style/modify_event_view.css b/apps/calendar/style/modify_event_view.css
@@ -20,10 +20,6 @@
   margin-bottom: 0;
 }
 
-#modify-event-view .button input {
-  font-size: 1.6rem;
-}
-
 #modify-event-view form ol li {
   margin: 0 0 0.5rem;
 }
@@ -96,13 +92,9 @@
   margin: 0.25rem 0;
 }
 
-#modify-event-view .calendar-id select,
-#modify-event-view .alarms select {
-  margin-left: -0.5rem;
-}
-
-#modify-event-view .delete-record {
-  text-align: center;
+#modify-event-view .delete {
+  width: calc(100% - 3rem);
+  margin: 0 auto;
 }
 
 #modify-event-view.readonly menu,

diff --git a/apps/calendar/style/ui.css b/apps/calendar/style/ui.css
@@ -181,7 +181,6 @@ body[data-path="/day/"] #view-selector > .day > a:active {
 #advanced-settings-view button {
   margin: 1.1rem auto;
   width: calc(100% - 3rem);
-  text-align: center;
 }
 
 #advanced-settings-view .settings-list label {
@@ -193,28 +192,11 @@ body[data-path="/day/"] #view-selector > .day > a:active {
 
 #advanced-settings-view .settings-list label span {
   display: block;
-  position: relative;
   margin-bottom: 0;
   font-size: 1.9rem;
   line-height: 3.3rem;
 }
 
-#advanced-settings-view .settings-list label .button {
-  height: 4rem;
-}
-
-#advanced-settings-view .settings-list label select {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  width: calc(100% + 3rem);
-  padding: 0.8rem 1rem 0;
-  font-size: 1.7rem;
-  font-weight: 500;
-}
-
 #advanced-settings-view .settings-list label span:first-child {
   padding-left: 1.5rem;
 }

diff --git a/build/csslint/xfail.list b/build/csslint/xfail.list
@@ -29,8 +29,7 @@ apps/communications/contacts/style/matching_contacts.css 0 3
 apps/communications/contacts/style/search.css 0 3
 apps/communications/contacts/style/app.css 1 7
 apps/communications/contacts/style/import.css 0 4
-apps/calendar/style/ui.css 0 6
-apps/calendar/style/building_blocks.css 2 0
+apps/calendar/style/ui.css 0 2
 apps/browser/style/modal_dialog/modal_dialog.css 0 1
 apps/browser/style/browser.css 0 2
 apps/gallery/style/gallery_tablet.css 0 2

diff --git a/shared/style_unstable/buttons.css b/shared/style_unstable/buttons.css
@@ -174,7 +174,7 @@ li [role="button"].icon-view:active {
 li button.icon-view:before,
 li [role="button"].icon-view:before {
   background-image: url(buttons/images/next.png);
-  right: 0rem;
+  right: 0;
 }
 
 li button.icon-dialog:before,
@@ -332,7 +332,7 @@ html[dir="rtl"] li .icon-view[role="button"] {
 
 html[dir="rtl"] li button.icon-view:before,
 html[dir="rtl"] li .icon-view[role="button"]:before {
-  left: 0rem;
+  left: 0;
   right: auto;
   transform: rotate(180deg);
 }

diff --git a/shared/style_unstable/input_areas.css b/shared/style_unstable/input_areas.css
@@ -26,6 +26,10 @@ textarea {
   margin: 0 0 1rem 0;
 }
 
+label:active {
+  background-color: transparent;
+}
+
 textarea {
   height: 10rem;
   max-height: 10rem;