Cleaning unused scss files

This commit is contained in:
Benoit Favreault
2015-06-12 11:45:38 -04:00
committed by Francis Lachapelle
parent a276ac366e
commit 46a262acfa
155 changed files with 457 additions and 6767 deletions
@@ -1,4 +1,4 @@
/*! ContactUI.scss */
/// ContactsUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
[id = "contactsList"] .sg-md-subheader {
transform: translateY(-100%); // Compensate the container top-margin
@@ -1,4 +1,5 @@
/*! loginUI.scss */
/// LoginUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
[ui-view="login"] > md-content {
@@ -1,3 +1,4 @@
/// MailerUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
// Message view header
// Could be made into a more generic component
@@ -1,9 +1,4 @@
////
/// SOGo
/// Version: #{}
/// Module:
/// Main definitions for
////
/// MessageEditorUI.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
[id=messageEditor] {
//width: (13 * $pitch + $mg); // 13 cols + 1margin for scrollbar
@@ -38,4 +33,4 @@ textarea.ck-editor{
width: 100%;
min-height: grid-step(3);
margin-top: $mg;
}
}
+137 -39
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
$hours_margin: 50px;
.dayLabels {
@@ -26,9 +27,30 @@ $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;
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%;
@@ -41,14 +63,22 @@ $hours_margin: 50px;
.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;
$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;
@@ -94,20 +124,83 @@ $hours_margin: 50px;
&.starts#{$i} { top: 10px * $i; }
&.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;
}
=======
.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 {
@@ -129,30 +222,35 @@ $hours_margin: 50px;
}
.minutes15, .minutes30, .minutes45 {
display: block;
height: 25%;
}
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;
}
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%;
}
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
height: 100%;
min-height: 15px; /* for 15-minute events */
width: 100%;
}
@@ -0,0 +1,256 @@
<<<<<<< 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%;
}
+3 -8
View File
@@ -1,10 +1,5 @@
///
/// @filename _views.scss
/// @project SOGo
/// @version 3.alpha
/// @module views
///
///
/// _view.scss -*- Mode: text; indent-tabs-mode: nil; basic-offset: 2 -*-
@import 'LoginUI.scss';
@import 'MailerUI.scss';
@import 'ContactsUI.scss';
@@ -163,4 +158,4 @@ $detailView-width: grid-step(8) !global;
// to create a false padding for the fab button
border-bottom: ($button-fab-height + ($mg * 2)) solid transparent; // buton height + mg top and bottom
}
}
}