- 
+
diff --git a/apps/calendar/js/views/week_child.js b/apps/calendar/js/views/week_child.js
index a9d766a542ac..e4740010a401 100644
--- a/apps/calendar/js/views/week_child.js
+++ b/apps/calendar/js/views/week_child.js
@@ -52,9 +52,9 @@ Calendar.ns('Views').WeekChild = (function() {
// TODO: This is a magic calculation based on current CSS. Fix this so
// that it can be dynamic based on CSS, or fix CSS to not need this.
- var pxHeight = (hoursDuration * 2) - 5;
+ var remHeight = ((hoursDuration * 2) - 5) / 10;
- element.style.height = 'calc(' + percHeight + '% + ' + pxHeight + 'px)';
+ element.style.height = 'calc(' + percHeight + '% + ' + remHeight + 'rem)';
},
create: function() {
diff --git a/apps/calendar/style/building_blocks.css b/apps/calendar/style/building_blocks.css
index cd671a108f90..69dd4ec842a2 100644
--- a/apps/calendar/style/building_blocks.css
+++ b/apps/calendar/style/building_blocks.css
@@ -14,7 +14,7 @@
-moz-box-sizing: border-box;
padding: 0 0.5rem;
font: 1.4rem/4rem "Open Sans", Sans-serif;
- border: solid 1px #d1d1d1;
+ border: solid 0.1rem #d1d1d1;
border-radius: 0.3rem;
background: #fff url("building_blocks/input_areas/images/ui/shadow.png") repeat-x left top;
}
@@ -54,7 +54,7 @@ body[role="application"] label .clear[data-state="active"] {
body[role="application"] .fieldbox {
background: #fff url("building_blocks/input_areas/images/ui/shadow.png") repeat-x left top;
border-radius: 0.3rem;
- border: 1px solid #C8C8C8;
+ border: 0.1rem solid #C8C8C8;
overflow: hidden;
font: 1.4rem/1em "Open Sans", Sans-serif;
}
@@ -100,14 +100,14 @@ body[role="application"] .fieldbox input {
}
body[role="application"] .fieldbox dd {
- border-left: 1px solid #DDD;
+ border-left: 0.1rem solid #DDD;
border-radius: 0 0.3rem 0.3rem 0;
display: block;
overflow: hidden;
}
body[role="application"] .fieldbox label {
- border-bottom: 1px solid #DDD;
+ border-bottom: 0.1rem solid #DDD;
}
body[role="application"] .fieldbox label:last-child {
@@ -130,7 +130,7 @@ body[role="application"] > nav > header {
z-index: 10;
height: 5rem;
color: #fff;
- background: url("building_blocks/drawer/images/ui/header.png") repeat-x left top;
+ background: url("building_blocks/drawer/images/ui/header.png") repeat-x left top / auto 100%;
}
body[role="application"] > nav > header:after {
@@ -206,9 +206,9 @@ body[role="application"] > nav > header .icon {
width: 3rem;
height: 3rem;
margin: 0 -1rem;
- background: transparent no-repeat center center;
text-indent: 100%;
white-space: nowrap;
+ background: transparent no-repeat center center / 3rem;
overflow: hidden;
position: relative;
height: 4.9rem;
@@ -295,4 +295,4 @@ body[role="application"] > nav .inner > ul > li > a {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
-}
\ No newline at end of file
+}
diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/add@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/add@1.5x.png
new file mode 100755
index 000000000000..e3c28f7cc598
Binary files /dev/null and b/apps/calendar/style/building_blocks/drawer/images/icons/add@1.5x.png differ
diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/close@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/close@1.5x.png
new file mode 100755
index 000000000000..2800a3f85a19
Binary files /dev/null and b/apps/calendar/style/building_blocks/drawer/images/icons/close@1.5x.png differ
diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/edit@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/edit@1.5x.png
new file mode 100755
index 000000000000..cb666b7b8363
Binary files /dev/null and b/apps/calendar/style/building_blocks/drawer/images/icons/edit@1.5x.png differ
diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/menu@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/menu@1.5x.png
new file mode 100755
index 000000000000..d63e735af400
Binary files /dev/null and b/apps/calendar/style/building_blocks/drawer/images/icons/menu@1.5x.png differ
diff --git a/apps/calendar/style/building_blocks/drawer/images/icons/user@1.5x.png b/apps/calendar/style/building_blocks/drawer/images/icons/user@1.5x.png
new file mode 100755
index 000000000000..47792828c7f6
Binary files /dev/null and b/apps/calendar/style/building_blocks/drawer/images/icons/user@1.5x.png differ
diff --git a/apps/calendar/style/calendar.css b/apps/calendar/style/calendar.css
index d42632a4c0ae..84f90245342a 100644
--- a/apps/calendar/style/calendar.css
+++ b/apps/calendar/style/calendar.css
@@ -1,19 +1,18 @@
* {
-moz-box-sizing: border-box;
}
+html {
+ font-size: 10px;
+}
html, body {
margin: 0;
padding: 0;
- font-size: 10px;
height: 100%;
- font-family: 'MozTT';
- background: white;
line-height: 100%;
overflow: hidden;
}
-
h1,
h2,
h3,
@@ -22,8 +21,8 @@ h5,
section {
/* unscrew up heights */
font-size: 100%;
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
section {
@@ -33,22 +32,22 @@ section {
button {
border: none;
background: transparent;
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
ol,
menu li,
ol li {
list-style: none;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
html, body {
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
}
diff --git a/apps/calendar/style/day_views.css b/apps/calendar/style/day_views.css
index bdb851beebfe..d8a30cd30f9d 100644
--- a/apps/calendar/style/day_views.css
+++ b/apps/calendar/style/day_views.css
@@ -15,7 +15,7 @@
height: 6rem;
padding-left: 0.7rem;
position: relative;
- border-bottom: 1px solid #D0D0D0;
+ border-bottom: 0.1rem solid #D0D0D0;
}
.day-events > .hour.hour-allday {
@@ -61,15 +61,15 @@
.day-events .container {
/* turn off calendar color bg */
background: white !important;
- border-width: 1px;
+ border-width: 0.1rem;
border-style: solid;
- border-left-width: 6px;
+ border-left-width: 0.6rem;
height: 100%;
padding: 1rem;
}
.day-events .event.has-alarms .container {
- background: #FFF url(/style/icons/alarm.png) no-repeat top right !important;
+ background: #FFF url(/style/icons/alarm.png) no-repeat top right / 3rem !important;
}
.day-events .hour .display-hour {
@@ -81,18 +81,22 @@
}
.day-events .event h5 {
- width: calc(100% - 1rem - 6px);
- min-height: 2rem;
- padding-top: 0.25rem;
- font-size: 1.6rem;
+ width: calc(100% - 1rem - 0.6rem);
+ min-height: 2.2rem;
+ padding-top: 0.6rem;
+ font-size: 1.9rem;
+ font-weight: 500;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.day-events .event .details {
- width: calc(100% - 1rem - 6px);
- min-height: 2rem;
+ display: block;
+ top: 2.8rem;
+ width: calc(100% - 1rem - 0.6rem);
+ min-height: 2.1rem;
+ padding-top: 0.8rem;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -113,16 +117,16 @@
/* overlap */
-.event[data-overlaps="1"] { padding-left: 6px; z-index: 11; }
-.event[data-overlaps="2"] { padding-left: 12px; z-index: 12; }
-.event[data-overlaps="3"] { padding-left: 18px; z-index: 13; }
-.event[data-overlaps="4"] { padding-left: 24px; z-index: 14; }
-.event[data-overlaps="5"] { padding-left: 30px; z-index: 15; }
-.event[data-overlaps="6"] { padding-left: 36px; z-index: 16; }
-.event[data-overlaps="7"] { padding-left: 42px; z-index: 17; }
-.event[data-overlaps="8"] { padding-left: 48px; z-index: 18; }
-.event[data-overlaps="9"] { padding-left: 54px; z-index: 19; }
-.event[data-overlaps="10"] { padding-left: 60px; z-index: 20; }
+.event[data-overlaps="1"] { padding-left: 0.6rem; z-index: 11; }
+.event[data-overlaps="2"] { padding-left: 1.2rem; z-index: 12; }
+.event[data-overlaps="3"] { padding-left: 1.8rem; z-index: 13; }
+.event[data-overlaps="4"] { padding-left: 2.4rem; z-index: 14; }
+.event[data-overlaps="5"] { padding-left: 3rem; z-index: 15; }
+.event[data-overlaps="6"] { padding-left: 3.6rem; z-index: 16; }
+.event[data-overlaps="7"] { padding-left: 4.2rem; z-index: 17; }
+.event[data-overlaps="8"] { padding-left: 4.8rem; z-index: 18; }
+.event[data-overlaps="9"] { padding-left: 5.4rem; z-index: 19; }
+.event[data-overlaps="10"] { padding-left: 6rem; z-index: 20; }
/* months day view */
@@ -140,8 +144,8 @@
height: calc(100% - 8.33rem);
position: absolute;
width: 100%;
- border-left: 1px solid #AAA;
- border-right: 1px solid #AAA;
+ border-left: 0.1rem solid #AAA;
+ border-right: 0.1rem solid #AAA;
display: none;
}
@@ -156,7 +160,7 @@
#day-view .day-events {
overflow-y: scroll;
overflow-x: hidden;
- height: 80%;
+ height: calc(100% - 6rem);
}
#day-view .day-events.allday {
diff --git a/apps/calendar/style/event_view.css b/apps/calendar/style/event_view.css
index 990fd5e6259e..b27a0075c491 100644
--- a/apps/calendar/style/event_view.css
+++ b/apps/calendar/style/event_view.css
@@ -30,7 +30,7 @@
#event-view .start-date,
#event-view .description {
- border-top: 1px solid #ccc;
+ border-top: 0.1rem solid #ccc;
margin-top: 0.8rem;
padding-top: 0.8rem;
}
diff --git a/apps/calendar/style/icons/60/Calendar@1.5x.png b/apps/calendar/style/icons/60/Calendar@1.5x.png
new file mode 100755
index 000000000000..5df11930acff
Binary files /dev/null and b/apps/calendar/style/icons/60/Calendar@1.5x.png differ
diff --git a/apps/calendar/style/icons/ActionIcons_30x30_back_nav.png b/apps/calendar/style/icons/ActionIcons_30x30_back_nav.png
deleted file mode 100644
index 5383ee24de58..000000000000
Binary files a/apps/calendar/style/icons/ActionIcons_30x30_back_nav.png and /dev/null differ
diff --git a/apps/calendar/style/icons/ActionIcons_30x30_done.png b/apps/calendar/style/icons/ActionIcons_30x30_done.png
deleted file mode 100644
index a724bf43e66b..000000000000
Binary files a/apps/calendar/style/icons/ActionIcons_30x30_done.png and /dev/null differ
diff --git a/apps/calendar/style/icons/ActionIcons_30x30_forward_nav.png b/apps/calendar/style/icons/ActionIcons_30x30_forward_nav.png
deleted file mode 100644
index a71c7c05d8e3..000000000000
Binary files a/apps/calendar/style/icons/ActionIcons_30x30_forward_nav.png and /dev/null differ
diff --git a/apps/calendar/style/icons/ActionIcons_30x30_refresh.png b/apps/calendar/style/icons/ActionIcons_30x30_refresh.png
deleted file mode 100644
index ba75f6053289..000000000000
Binary files a/apps/calendar/style/icons/ActionIcons_30x30_refresh.png and /dev/null differ
diff --git a/apps/calendar/style/icons/ActionIcons_30x30_settings.png b/apps/calendar/style/icons/ActionIcons_30x30_settings.png
deleted file mode 100644
index 04c0b44180dc..000000000000
Binary files a/apps/calendar/style/icons/ActionIcons_30x30_settings.png and /dev/null differ
diff --git a/apps/calendar/style/icons/Calendar@1.5x.png b/apps/calendar/style/icons/Calendar@1.5x.png
new file mode 100755
index 000000000000..5df11930acff
Binary files /dev/null and b/apps/calendar/style/icons/Calendar@1.5x.png differ
diff --git a/apps/calendar/style/icons/accountwarning_30x30.png b/apps/calendar/style/icons/accountwarning.png
similarity index 100%
rename from apps/calendar/style/icons/accountwarning_30x30.png
rename to apps/calendar/style/icons/accountwarning.png
diff --git a/apps/calendar/style/icons/accountwarning@1.5x.png b/apps/calendar/style/icons/accountwarning@1.5x.png
new file mode 100644
index 000000000000..40e332e5d600
Binary files /dev/null and b/apps/calendar/style/icons/accountwarning@1.5x.png differ
diff --git a/apps/calendar/style/icons/alarm@1.5x.png b/apps/calendar/style/icons/alarm@1.5x.png
new file mode 100755
index 000000000000..6cdd382be0fd
Binary files /dev/null and b/apps/calendar/style/icons/alarm@1.5x.png differ
diff --git a/apps/calendar/style/icons/forward_nav.png b/apps/calendar/style/icons/forward_nav.png
new file mode 100644
index 000000000000..f8b50b7e43c8
Binary files /dev/null and b/apps/calendar/style/icons/forward_nav.png differ
diff --git a/apps/calendar/style/icons/forward_nav@1.5x.png b/apps/calendar/style/icons/forward_nav@1.5x.png
new file mode 100755
index 000000000000..fe37b09e958c
Binary files /dev/null and b/apps/calendar/style/icons/forward_nav@1.5x.png differ
diff --git a/apps/calendar/style/icons/settings.png b/apps/calendar/style/icons/settings.png
new file mode 100644
index 000000000000..ce6949729d07
Binary files /dev/null and b/apps/calendar/style/icons/settings.png differ
diff --git a/apps/calendar/style/icons/settings@1.5x.png b/apps/calendar/style/icons/settings@1.5x.png
new file mode 100755
index 000000000000..79c400cdd81a
Binary files /dev/null and b/apps/calendar/style/icons/settings@1.5x.png differ
diff --git a/apps/calendar/style/icons/update@1.5x.png b/apps/calendar/style/icons/update@1.5x.png
new file mode 100755
index 000000000000..fabdbcef964f
Binary files /dev/null and b/apps/calendar/style/icons/update@1.5x.png differ
diff --git a/apps/calendar/style/modify_account_view.css b/apps/calendar/style/modify_account_view.css
index 5362e6cd8a0d..8bd35c348564 100644
--- a/apps/calendar/style/modify_account_view.css
+++ b/apps/calendar/style/modify_account_view.css
@@ -62,7 +62,7 @@
#modify-account-view .sync-errors p {
margin: 0;
height: 3rem;
- background: transparent url('icons/accountwarning_30x30.png') no-repeat left top;
+ background: transparent url('icons/accountwarning.png') no-repeat left top;
padding-left: 3.5rem;
line-height: 3rem;
}
diff --git a/apps/calendar/style/modify_event_view.css b/apps/calendar/style/modify_event_view.css
index caa62b3186a5..2388eb95570c 100755
--- a/apps/calendar/style/modify_event_view.css
+++ b/apps/calendar/style/modify_event_view.css
@@ -37,7 +37,7 @@
#modify-event-view li.end-time,
#modify-event-view li.start-time {
text-align: center;
- width: calc(40% - 1px);
+ width: calc(40% - 0.1rem);
float: left
}
diff --git a/apps/calendar/style/settings.css b/apps/calendar/style/settings.css
index d04d8e57a748..079efdc0f8fa 100644
--- a/apps/calendar/style/settings.css
+++ b/apps/calendar/style/settings.css
@@ -14,7 +14,7 @@ body[data-path^='/create-account'] #time-views,
body[data-path^='/settings'] #time-views {
position: relative;
transform: translateX(80%);
- box-shadow: 1px 1px 5px 5px #222;
+ box-shadow: 0.1rem 0.1rem 0.5rem 0.5rem #222;
transition: transform 0.5s ease-in-out;
}
@@ -37,7 +37,7 @@ body[data-path^='/settings'] #time-views {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- width: -moz-calc(100% - 20px);
+ width: -moz-calc(100% - 2rem);
height: 100%;
}
@@ -47,7 +47,7 @@ body[data-path^='/settings'] #time-views {
}
#settings .calendars .error label {
- background: transparent url('icons/accountwarning_30x30.png') no-repeat 2rem 0.5rem;
+ background: transparent url('icons/accountwarning.png') no-repeat 2rem 0.5rem;
padding-left: 6rem;
}
@@ -82,9 +82,9 @@ body[data-path^='/settings'] #time-views {
#settings > menu {
position: absolute;
- bottom: 0px;
- height: 40px;
- padding: 5px 0px;
+ bottom: 0;
+ height: 4rem;
+ padding: 0.5rem 0;
background-color: rgba(0, 0, 0, 0.3);
}
@@ -95,7 +95,7 @@ body[data-path^='/settings'] #time-views {
#settings .settings {
width: 5.5rem;
height: 4rem;
- background: transparent url('/style/icons/ActionIcons_30x30_settings.png') no-repeat center;
+ background: transparent url('/style/icons/settings.png') no-repeat center / 3rem;
font-size: 0;
display: block;
}
@@ -112,7 +112,7 @@ body[data-path^='/settings'] #time-views {
#settings .calendars input[type="checkbox"]:checked + span {
width: 2.2rem;
height: 1.9rem;
- background: transparent url('/style/icons/checkmark.png') no-repeat;
+ background: transparent url('/style/icons/checkmark.png') no-repeat center / 1.4rem;
}
#settings .calendars input[type="checkbox"] + span {
diff --git a/apps/calendar/style/ui.css b/apps/calendar/style/ui.css
index e281b965282e..38a920fbefad 100644
--- a/apps/calendar/style/ui.css
+++ b/apps/calendar/style/ui.css
@@ -1,8 +1,3 @@
-/* Device Layouts */
-
-@media screen and (max-width: 480px) {
-}
-
/* loading */
body.loading {
@@ -31,7 +26,7 @@ ol.link-list a {
line-height: 150%;
font-size: 1.8rem;
padding: 1.5rem 1rem;
- border-bottom: 1px solid #C5C5C5;
+ border-bottom: 0.1rem solid #C5C5C5;
text-decoration: none;
color: #333;
margin: 0 1.5rem 1rem;
@@ -42,7 +37,7 @@ ol.link-list li:last-child label {
}
ol.link-list a {
- background: transparent url('icons/ActionIcons_30x30_forward_nav.png') no-repeat right;
+ background: url("icons/forward_nav.png") no-repeat scroll right center / 3rem transparent;
}
/* view management */
@@ -93,10 +88,10 @@ ol.link-list a {
#progress-indicator {
position: absolute;
- top: 10%;
- left: 0px;
+ top: 6.9rem;
+ left: 0;
width: 100%;
- height: 3px;
+ height: 0.3rem;
border: none;
overflow: hidden;
z-index: 1000;
@@ -108,15 +103,17 @@ ol.link-list a {
}
#throbber {
+ height: 5.2rem;
+ background: url('ui/progress.png') repeat-x left bottom / 32rem !important;
animation: .5s throb infinite steps(12);
}
@keyframes throb {
from {
- transform: translate(0px, 0px);
+ transform: translate(0, 0);
}
to {
- transform: translate(0px, -48px);
+ transform: translate(0, -4.8rem);
}
}
@@ -160,7 +157,7 @@ ol.link-list a {
}
#advanced-settings-view .account-list .error a {
- background: transparent url('icons/accountwarning_30x30.png') no-repeat left;
+ background: transparent url('icons/accountwarning.png') no-repeat left;
padding-left: 3.5rem;
}
@@ -190,7 +187,7 @@ ol.link-list a {
/* completely override other views */
background: #E6E6E0;
position: absolute;
- top: 0px;
+ top: 0;
width: 100%;
height: 100%
}
@@ -233,8 +230,8 @@ ol.link-list a {
text-transform: uppercase;
font-size: 1.3rem;
padding: 0.185rem 0;
- border-right: 1px solid #131314;
- border-left: 1px solid #515051;
+ border-right: 0.1rem solid #131314;
+ border-left: 0.1rem solid #515051;
}
#month-days li:first-child {
@@ -257,8 +254,8 @@ section.month {
position: absolute;
color: #484848;
width: 100%;
- border-left: 1px solid #AAA;
- border-right: 1px solid #AAA;
+ border-left: 0.1rem solid #AAA;
+ border-right: 0.1rem solid #AAA;
display: none;
}
@@ -312,10 +309,10 @@ section.month li:last-child {
section.month li {
padding-top: 0.3%;
- border-right: 1px solid #A4A4A4;
- border-left: 1px solid #FDFDFD;
- border-top: 1px solid white;
- border-bottom: 1px solid #9D9D9D;
+ border-right: 0.1rem solid #A4A4A4;
+ border-left: 0.1rem solid #FDFDFD;
+ border-top: 0.1rem solid white;
+ border-bottom: 0.1rem solid #9D9D9D;
height: 100%;
position: relative;
background-color: white;
@@ -332,7 +329,7 @@ section.month li.past {
section.month li.present {
background-color: #525963;
- box-shadow: inset 1px 2px 3px 0px #333;
+ box-shadow: inset 0.1rem 0.2rem 0.3rem 0 #333;
color: white;
border-left: none;
border-top: none;
@@ -368,7 +365,7 @@ section.month li .busy-indicator > span{
section.month li .busy-indicator {
overflow: hidden;
clear: both;
- bottom: 0px;
+ bottom: 0;
position: absolute;
width: 100%;
}
@@ -379,7 +376,7 @@ section.month li .busy-indicator:before {
}
section.month li .busy-indicator > span {
- top: 0px;
+ top: 0;
position: absolute;
text-indent: -1000em;
}
@@ -437,8 +434,8 @@ Indicators are in units of 12
padding: 1.2rem 1.2rem 0.7rem;
text-transform: uppercase;
color: #F93700;
- border-bottom: 1px solid #F93700;
- box-shadow: 0px 4px 5px -1px #888 inset;
+ border-bottom: 0.1rem solid #F93700;
+ box-shadow: 0 0.4rem 0.5rem -0.1rem #888 inset;
}
/** sub: view selector **/
@@ -449,13 +446,13 @@ Indicators are in units of 12
}
#view-selector {
- padding: 0px;
- margin: 0px;
+ padding: 0;
+ margin: 0;
width: 100%;
background: #949494;
line-height: 2.1rem;
overflow: hidden;
- box-shadow: 0px 0 0.5px 0.5px #6F7070;
+ box-shadow: 0 0 0.05rem 0.05rem #6F7070;
}
#view-selector a {
@@ -475,16 +472,16 @@ Indicators are in units of 12
width: 25%;
height: 3.33rem;
background-image: -moz-linear-gradient(#D9D9D9, #969696);
- border-right: 1px solid black;
+ border-right: 0.1rem solid black;
}
.rtl #view-selector > li.today {
- border-left: 1px solid #666;
+ border-left: 0.1rem solid #666;
}
.ltr #view-selector > li.today {
- border-right: 1px solid #666;
+ border-right: 0.1rem solid #666;
}
#view-selector > li.time-selection {
@@ -547,18 +544,6 @@ section[role="status"].active {
animation-duration: 1.5s;
}
-@media screen and (min-width: 481px) {
- html, body {
- font-size: 12px;
- }
-}
-
-@media screen and (max-width: 480px) {
- html, body {
- font-size: 10px;
- }
-}
-
/* Hide on initial render to prevent flashing */
#settings {
visibility: hidden;
diff --git a/apps/calendar/style/week_view.css b/apps/calendar/style/week_view.css
index 2592e8f35c57..4fb1b20b3a94 100644
--- a/apps/calendar/style/week_view.css
+++ b/apps/calendar/style/week_view.css
@@ -10,8 +10,8 @@
font-size: 1.3rem;
height: 2rem;
padding: 0.5rem 0.5rem;
- border-right: 1px solid #131314;
- border-left: 1px solid #515051;
+ border-right: 0.1rem solid #131314;
+ border-left: 0.1rem solid #515051;
font-weight: normal;
white-space: nowrap;
overflow: hidden;
@@ -42,8 +42,8 @@
#week-view .week-events > ol,
#week-view .sticky .week-events {
- border-bottom: 1px solid #ccc;
- border-left: 1px solid #ccc;
+ border-bottom: 0.1rem solid #ccc;
+ border-left: 0.1rem solid #ccc;
text-align: center;
color: white;
font-size: 120%;
@@ -78,10 +78,10 @@
}
#week-view .sticky {
- border-bottom: 1px solid #2A2A2A;
+ border-bottom: 0.1rem solid #2A2A2A;
height: 8rem;
overflow: hidden;
- box-shadow: 0px 5px 5px 0px rgba(1, 1, 1, 0.2);
+ box-shadow: 0 0.5rem 0.5rem 0 rgba(1, 1, 1, 0.2);
position: relative;
z-index: 11;
}
@@ -136,7 +136,7 @@
}
#week-view .scroll {
- height: calc(100% - 7.9rem);
+ height: calc(100% - 8.1rem);
overflow-y: scroll;
}
diff --git a/apps/calendar/test/unit/views/week_child_test.js b/apps/calendar/test/unit/views/week_child_test.js
index 5ed60350f4be..2ceccc81e961 100644
--- a/apps/calendar/test/unit/views/week_child_test.js
+++ b/apps/calendar/test/unit/views/week_child_test.js
@@ -64,7 +64,7 @@ suiteGroup('Views.WeekChild', function() {
subject.date = new Date(2012, 0, 1);
subject._assignPosition(busy, el);
- assert.equal(el.style.height, 'calc(325% + 1.5px)', 'height');
+ assert.equal(el.style.height, 'calc(325% + 0.15rem)', 'height');
});
test('#create', function() {
+