LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve conflict

pull/91/head
Benoit Favreault 2015-04-10 16:10:57 -04:00 committed by Francis Lachapelle
parent af57fa84e4
commit f080536b3f
2 changed files with 1 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/WebServerResources/scss/views/SchedulerUI.scss
View File

@ -1,4 +1,4 @@
<<<<<<< HEAD
/// SchedulerUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
$hours_margin: 50px;
.dayLabels {
@ -27,8 +27,6 @@ $hours_margin: 50px;
height: 40px;
border-bottom: 1px solid sg-color($sogoPaper, 300);
}
=======
/// SchedulerUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
#calendarHeader {
position: relative;
@ -46,11 +44,9 @@ $hours_margin: 50px;
position: absolute;
text-align: center;
}
>>>>>>> Cleaning unused scss files
}
}
<<<<<<< HEAD
.daysViewFor1Days {
.day {
width: 100%;
@ -63,11 +59,9 @@ $hours_margin: 50px;
.daysViewFor7Days {
.day {
width: (100% / 7);
=======
.monthView, .daysViewFor7Days {
.day {
width: 14.2857%;
>>>>>>> Cleaning unused scss files
}
$i: 0;
@while $i < 7 {
@ -78,7 +72,6 @@ $hours_margin: 50px;
}
}
<<<<<<< HEAD
.sg-calendar-tile-header {
color: sg-color($sogoPaper, 800);
font-size: $sg-font-size-2;
@ -124,7 +117,6 @@ $hours_margin: 50px;
&.starts#{$i} { top: 10px * $i; }
&.lasts#{$i} { height: 10px * $i; }
$i: $i + 1;
=======
.daysViewFor1Days {
.day {
width: 100%;
@ -181,7 +173,6 @@ $hours_margin: 50px;
@while $i < 96 {
&.starts#{$i} {
top: 10px * $i;
>>>>>>> Cleaning unused scss files
}
&.lasts#{$i} {
height: 10px * $i;
@ -227,13 +218,10 @@ $hours_margin: 50px;
}
.minutes30 {
<<<<<<< HEAD
border-bottom: 1px dotted sg-color($sogoPaper, 300);
}
=======
border-bottom: 1px dotted #ccc;
}
>>>>>>> Cleaning unused scss files
.gradient, .text {
position: absolute;

256
UI/WebServerResources/scss/views/SchedulerUI.scss.orig
View File

@ -1,256 +0,0 @@
<<<<<<< HEAD
$hours_margin: 50px;
.dayLabels {
color: sg-color($sogoBlue, 700);
height: 35px;
left: 0;
overflow: hidden;
position: relative;
.day {
height: 100%;
position: absolute;
text-align: center;
}
}
.days {
left: 0;
right: 0;
top: 0;
margin-left: $hours_margin;
position: relative;
.day {
border-left: 1px solid sg-color($sogoPaper, 300);
position: absolute;
.clickableHourCell {
height: 40px;
border-bottom: 1px solid sg-color($sogoPaper, 300);
}
=======
/// SchedulerUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
#calendarHeader {
position: relative;
top: 0;
height: 38px;
right: 0px;
.dayLabels {
height: 35px;
left: 0;
margin-left: 50px;
overflow: hidden;
position: relative;
.day {
height: 100%;
position: absolute;
text-align: center;
}
>>>>>>> Cleaning unused scss files
}
}
<<<<<<< HEAD
.daysViewFor1Days {
.day {
width: 100%;
}
.days {
margin-left: 0;
}
}
.daysViewFor7Days {
.day {
width: (100% / 7);
=======
.monthView, .daysViewFor7Days {
.day {
width: 14.2857%;
>>>>>>> Cleaning unused scss files
}
$i: 0;
@while $i < 7 {
.day#{$i} {
left: 1% * 100 / 7 * $i;
}
$i: $i + 1;
}
}
<<<<<<< HEAD
.sg-calendar-tile-header {
color: sg-color($sogoPaper, 800);
font-size: $sg-font-size-2;
font-weight: $sg-font-light;
overflow: hidden;
padding: 2px;
}
.daysView {
bottom: 0;
overflow-x: hidden;
overflow: auto;
position: relative;
top: 0;
.hours {
color: sg-color($sogoBlue, 700);
display: inline-block;
float: left;
font-weight: $sg-font-light;
height: auto;
left: 0;
position: relative;
top: 0;
width: $hours_margin;
.hour {
border-bottom: 1px solid sg-color($sogoPaper, 300);
height: 40px;
left: 0;
padding: 2px;
position: relative;
right: 0;
top: 0;
}
}
.event {
cursor: default;
margin-right: 1px;
position: absolute;
left: 0%;
right: 0%;
$i: 0;
@while $i < 96 { // number of 15-minutes blocks in a day
&.starts#{$i} { top: 10px * $i; }
&.lasts#{$i} { height: 10px * $i; }
$i: $i + 1;
=======
.daysViewFor1Days {
.day {
width: 100%;
}
}
#daysView {
position: relative;
top: 0;
bottom: 0;
overflow: auto;
overflow-x: hidden;
.hours {
height: auto;
display: inline-block;
position: relative;
float: left;
top: 0;
left: 0;
width: 50px;
.hour {
border-bottom: 1px solid #ccc;
height: 40px;
left: 0;
padding-right: 2px;
//padding-top: 2px;
position: relative;
right: 0;
top: 0;
}
}
.days {
left: 0;
right: 0;
top: 0;
margin-left: 50px;
position: relative;
.day {
border-left: 1px solid #ccc;
position: absolute;
.clickableHourCell {
height: 40px;
border-bottom: 1px solid #ccc;
}
}
}
.event {
cursor: default;
margin-right: 1px;
position: absolute;
left: 0%;
right: 0%;
$i: 0;
@while $i < 96 {
&.starts#{$i} {
top: 10px * $i;
>>>>>>> Cleaning unused scss files
}
&.lasts#{$i} {
height: 10px * $i;
}
$i: $i + 1;
}
.eventInside {
position: absolute;
overflow: hidden;
top: 0px;
bottom: 0px;
left: 0px;
right: 0px;
-webkit-border-radius: 2px;
border-radius: 2px;
cursor: move;
}
}
}
.monthView {
md-grid-tile {
border: 1px solid sg-color($sogoPaper, 300);
overflow: auto;
}
.sg-event {
border-radius: 1px;
font-size: $sg-font-size-2;
overflow: hidden;
padding: 2px;
margin-bottom: 1px;
text-overflow: ellipsis;
white-space: nowrap;
span {
font-weight: $sg-font-light;
}
}
}
.minutes15, .minutes30, .minutes45 {
display: block;
height: 25%;
}
.minutes30 {
<<<<<<< HEAD
border-bottom: 1px dotted sg-color($sogoPaper, 300);
}
=======
border-bottom: 1px dotted #ccc;
}
>>>>>>> Cleaning unused scss files
.gradient, .text {
position: absolute;
top: 1px;
left: 1px;
right: 1px;
bottom: 1px;
overflow: hidden;
}
.gradient > IMG {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
height: 100%;
min-height: 15px; /* for 15-minute events */
width: 100%;
}