Produced by Araxis Merge on 2/1/2017 2:57:42 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM Portal\trunk\BTSSSPortal\Areas\EntityList\css | calendar.min.css | Tue Dec 20 19:50:57 2016 UTC |
| 2 | Wed Feb 1 19:57:42 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 11 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /* | |||||
| 2 | Bootstrap Calendar | |||||
| 3 | Copyright (c) 2013 S ergey Roma nov | |||||
| 4 | ||||||
| 5 | Permission is hereby granted, free of ch arge, to a ny person obtaining a copy of this softw are and as sociated d ocumentati on files ( the "Softw are"), to deal in th e Software without r estriction , includin g without limitation the right s to use, copy, modi fy, merge, publish, distribute , sublicen se, and/or sell copi es of the Software, and to per mit person s to whom the Softwa re is furn ished to d o so, subj ect to the following condition s: | |||||
| 6 | ||||||
| 7 | The above copyright notice and this perm ission not ice shall be include d in all c opies or s ubstantial portions of the Sof tware. | |||||
| 8 | ||||||
| 9 | THE SOFTWA RE IS PROV IDED "AS I S", WITHOU T WARRANTY OF ANY KI ND, EXPRES S OR IMPLI ED, INCLUD ING BUT NO T LIMITED TO THE WAR RANTIES OF MERCHANTA BILITY, FI TNESS FOR A PARTICUL AR PURPOSE AND NONIN FRINGEMENT . IN NO EV ENT SHALL THE AUTHOR S OR COPYR IGHT HOLDE RS BE LIAB LE FOR ANY CLAIM, DA MAGES OR O THER LIABI LITY, WHET HER IN AN ACTION OF CONTRACT, TORT OR OT HERWISE, A RISING FRO M, OUT OF OR IN CONN ECTION WIT H THE SOFT WARE OR TH E USE OR O THER DEALI NGS IN THE SOFTWARE. | |||||
| 10 | */ | |||||
| 11 | [class*=ca l-cell]{fl oat:left;m argin-left :0;min-hei ght:1px}.c al-row-flu id{width:1 00%}.cal-r ow-fluid:a fter,.cal- row-fluid: before{dis play:table ;content:" ";line-hei ght:0}.cal -row-fluid :after{cle ar:both}.c al-row-flu id [class* =cal-cell] {display:b lock;width :100%;-web kit-box-si zing:borde r-box;-moz -box-sizin g:border-b ox;box-siz ing:border -box;float :left;marg in-left:0} .cal-row-f luid .cont rols-row [ class*=cal -cell]+[cl ass*=cal-c ell],.cal- row-fluid [class*=ca l-cell]:fi rst-child{ margin-lef t:0}.cal-r ow-fluid . cal-cell7{ width:100% }.cal-row- fluid .cal -cell6{wid th:85.7142 8571428571 %}.cal-row -fluid .ca l-cell5{wi dth:71.428 5714285714 2%}.cal-ro w-fluid .c al-cell4{w idth:57.14 2857142857 14%}.cal-r ow-fluid . cal-cell3{ width:42.8 5714285714 2854%}.cal -row-fluid .cal-cell 2{width:28 .571428571 42857%}.ca l-row-flui d .cal-off set7,.cal- row-fluid .cal-offse t7:first-c hild,.cal- week-box . cal-offset 7{margin-l eft:100%}. cal-row-fl uid .cal-o ffset6,.ca l-row-flui d .cal-off set6:first -child,.ca l-week-box .cal-offs et6{margin -left:85.7 1428571428 571%}.cal- row-fluid .cal-offse t5,.cal-ro w-fluid .c al-offset5 :first-chi ld,.cal-we ek-box .ca l-offset5{ margin-lef t:71.42857 142857142% }.cal-row- fluid .cal -offset4,. cal-row-fl uid .cal-o ffset4:fir st-child,. cal-week-b ox .cal-of fset4{marg in-left:57 .142857142 85714%}.ca l-row-flui d .cal-off set3,.cal- row-fluid .cal-offse t3:first-c hild,.cal- week-box . cal-offset 3{margin-l eft:42.857 1428571428 54%}.cal-r ow-fluid . cal-offset 2,.cal-row -fluid .ca l-offset2: first-chil d,.cal-wee k-box .cal -offset2{m argin-left :28.571428 57142857%} .cal-row-f luid .cal- offset1,.c al-row-flu id .cal-of fset1:firs t-child,.c al-week-bo x .cal-off set1{margi n-left:14. 2857142857 14285%}.ca l-row-flui d .cal-cel l1{width:1 4.28571428 5714285%}. cal-row-fl uid [class *=cal-cell ].hide,[cl ass*=cal-c ell].hide{ display:no ne}.cal-ro w-fluid [c lass*=cal- cell].pull -right,[cl ass*=cal-c ell].pull- right{floa t:right}.c al-row-hea d [class*= cal-cell], .cal-row-h ead [class *=cal-cell ]:first-ch ild{min-he ight:auto; overflow:h idden;text -overflow: ellipsis}. cal-events -num{margi n-top:20px }.cal-mont h-day{posi tion:relat ive;displa y:block;wi dth:100%}# cal-week-b ox{positio n:absolute ;width:70p x;left:-71 px;top:-1p x;padding: 8px 5px;cu rsor:point er}#cal-da y-tick{pos ition:abso lute;right :50%;botto m:-21px;pa dding:0 5p x;cursor:p ointer;z-i ndex:5;wid th:26px;ma rgin-right :-17px}.ca l-year-box #cal-day- tick{margi n-right:-7 px}#cal-sl ide-box{po sition:rel ative}#cal -slide-tic k{position :absolute; width:16px ;margin-le ft:-7px;he ight:9px;t op:-1px;z- index:1}#c al-slide-t ick.tick-m onth1{left :12.5%}#ca l-slide-ti ck.tick-mo nth2{left: 37.5%}#cal -slide-tic k.tick-mon th3{left:6 2.5%}#cal- slide-tick .tick-mont h4{left:87 .5%}#cal-s lide-tick. tick-day1{ left:7.142 8571428571 5%}#cal-sl ide-tick.t ick-day2{l eft:21.428 5714285714 3%}#cal-sl ide-tick.t ick-day3{l eft:35.714 2857142857 2%}#cal-sl ide-tick.t ick-day4{l eft:50%}#c al-slide-t ick.tick-d ay5{left:6 4.28571428 57143%}#ca l-slide-ti ck.tick-da y6{left:78 .571428571 42859%}#ca l-slide-ti ck.tick-da y7{left:92 .857142857 14285%}.ev ents-list{ position:a bsolute;bo ttom:0;lef t:0;overfl ow:hidden} #cal-slide -content u l.unstyled {margin-bo ttom:0}.ca l-week-box {position: relative}. cal-week-b ox [data-e vent-class ]{white-sp ace:nowrap ;height:30 px;margin: 1px;line-h eight:30px ;text-over flow:ellip sis;overfl ow:hidden; padding-le ft:10px}.c al-week-bo x .cal-col umn{positi on:absolut e;height:1 00%;z-inde x:-1}.cal- week-box . arrow-afte r,.cal-wee k-box .arr ow-before{ position:r elative}.c al-week-bo x .arrow-a fter:after {content:" ";position :absolute; top:0;widt h:0;height :0;right:0 ;border-to p:15px sol id #fff;bo rder-left: 8px solid; border-bot tom:15px s olid #FFF} .cal-week- box .arrow -before:be fore{conte nt:"";posi tion:absol ute;top:0; width:0;he ight:0;lef t:1px;bord er-top:15p x solid tr ansparent; border-lef t:8px soli d #FFF;bor der-bottom :15px soli d transpar ent}#cal-d ay-box{tex t-wrap:non e}#cal-day -box .cal- day-hour-p art{height :30px;box- sizing:bor der-box;-m oz-box-siz ing:border -box;-webk it-box-siz ing:border -box;borde r-bottom:t hin dashed #e1e1e1}# cal-day-bo x .cal-day -hour .day -highlight {height:30 px}#cal-da y-box .cal -hours{fon t-weight:b older}#cal -day-box . cal-day-ho ur:nth-chi ld(odd){ba ckground-c olor:#fafa fa}#cal-da y-box #cal -day-panel {position: relative;p adding-lef t:60px}#ca l-day-box #cal-day-p anel-hour{ position:a bsolute;wi dth:100%;m argin-left :-60px}#ca l-day-box .day-event {position: relative;m ax-width:2 00px;overf low:hidden }#cal-day- box .day-h ighlight{l ine-height :30px;padd ing-left:8 px;padding -right:8px ;box-sizin g:border-b ox;-moz-bo x-sizing:b order-box; -webkit-bo x-sizing:b order-box; border:1px solid #c3 c3c3;margi n:1px;over flow:hidde n;text-ove rflow:elli psis}#cal- day-box .d ay-highlig ht.dh-even t-importan t{border:1 px solid # ad2121}#ca l-day-box .day-highl ight.dh-ev ent-warnin g{border:1 px solid # e3bc08}#ca l-day-box .day-highl ight.dh-ev ent-info{b order:1px solid #1e9 0ff}#cal-d ay-box .da y-highligh t.dh-event -inverse{b order:1px solid #1b1 b1b}#cal-d ay-box .da y-highligh t.dh-event -success{b order:1px solid #006 400}#cal-d ay-box .da y-highligh t.dh-event -special{b ackground- color:#ffe 6ff;border :1px solid purple}.e vent{displ ay:block;b ackground- color:#c3c 3c3;width: 12px;heigh t:12px;mar gin-right: 2px;margin -bottom:2p x;-webkit- box-shadow :inset 0 0 5px 0 rgb a(0,0,0,.4 );box-shad ow:inset 0 0 5px 0 r gba(0,0,0, .4);border -radius:8p x;border:1 px solid # fff}.event -block{dis play:block ;backgroun d-color:#c 3c3c3;widt h:20px;hei ght:100%}. cal-event- list .even t.pull-lef t{margin-t op:3px}.ev ent-import ant{backgr ound-color :#ad2121}. event-info {backgroun d-color:#1 e90ff}.eve nt-warning {backgroun d-color:#e 3bc08}.eve nt-inverse {backgroun d-color:#1 b1b1b}.eve nt-success {backgroun d-color:#0 06400}.eve nt-special {backgroun d-color:pu rple}.day- highlight, .day-highl ight:hover {backgroun d-color:#d dd}.day-hi ghlight.dh -event-imp ortant,.da y-highligh t.dh-event -important :hover{bac kground-co lor:#fae3e 3}.day-hig hlight.dh- event-warn ing,.day-h ighlight.d h-event-wa rning:hove r{backgrou nd-color:# fdf1ba}.da y-highligh t.dh-event -info,.day -highlight .dh-event- info:hover {backgroun d-color:#d 1e8ff}.day -highlight .dh-event- inverse,.d ay-highlig ht.dh-even t-inverse: hover{back ground-col or:#c1c1c1 }.day-high light.dh-e vent-succe ss,.day-hi ghlight.dh -event-suc cess:hover {backgroun d-color:#c affca}.day -highlight .dh-event- special,.d ay-highlig ht.dh-even t-special: hover{back ground-col or:#ffe6ff }.cal-row- head [clas s*=cal-cel l],.cal-ro w-head [cl ass*=cal-c ell]:first -child{fon t-weight:b older;text -align:cen ter;border :0 solid;p adding:5px 0}.cal-ro w-head [cl ass*=cal-c ell] small {font-weig ht:400}.ca l-row-flui d:hover,.c al-year-bo x .row-flu id:hover{b ackground- color:#faf afa}.cal-m onth-day{h eight:100p x}[class*= cal-cell]: hover{back ground-col or:#ededed }.cal-mont h-box [cla ss*=cal-ce ll],.cal-y ear-box [c lass*=span ]{min-heig ht:100px;b order-righ t:1px soli d #e1e1e1; position:r elative}.c al-year-bo x [class*= span]{min- height:60p x}.cal-mon th-box .ca l-row-flui d [class*= cal-cell]: last-child ,.cal-year -box .row- fluid [cla ss*=span]: last-child {border-ri ght:0}.cal -month-box .cal-row- fluid,.cal -year-box .row-fluid {border-bo ttom:1px s olid #e1e1 e1;margin- left:0;mar gin-right: 0}.cal-mon th-box .ca l-row-flui d:last-chi ld,.cal-ye ar-box .ro w-fluid:la st-child{b order-bott om:0}.cal- month-box, .cal-week- box,.cal-y ear-box{bo rder-top:1 px solid # e1e1e1;bor der-bottom :1px solid #e1e1e1;b order-righ t:1px soli d #e1e1e1; border-lef t:1px soli d #e1e1e1; border-rad ius:2px}sp an[data-ca l-date]{fo nt-size:1. 2em;font-w eight:400; opacity:.5 ;cursor:po inter;tran sition:all .3s ease- in-out;-we bkit-trans ition:all .1s ease-i n-out;-moz -transitio n:all .1s ease-in-ou t;-ms-tran sition:all .1s ease- in-out;-o- transition :all .1s e ase-in-out ;margin-to p:15px;mar gin-right: 15px}span[ data-cal-d ate]:hover {opacity:1 }.cal-day- outmonth s pan[data-c al-date]{o pacity:.1; cursor:def ault}.cal- day-today{ background -color:#e8 fde7}.cal- day-today span[data- cal-date]{ color:#006 400}.cal-m onth-box . cal-day-to day span[d ata-cal-da te]{font-s ize:1.9em} .cal-day-h oliday spa n[data-cal -date]{col or:purple} .cal-day-w eekend spa n[data-cal -date]{col or:#8b0000 }#cal-week -box{borde r:1px soli d #e1e1e1; border-rig ht:0;borde r-radius:5 px 0 0 5px ;backgroun d-color:#f afafa;text -align:rig ht}#cal-da y-tick{bor der:1px so lid #e1e1e 1;border-t op:0 solid ;border-ra dius:0 0 5 px 5px;bac kground-co lor:#edede d;text-ali gn:center} #cal-slide -box{borde r-top:0 so lid #8c8c8 c}#cal-sli de-content {padding:2 0px;color: #fff;backg round-imag e:url(../i mg/dark_wo od.png);-w ebkit-box- shadow:ins et 0 0 15p x 0 rgba(0 ,0,0,.5);b ox-shadow: inset 0 0 15px 0 rgb a(0,0,0,.5 )}#cal-sli de-tick{ba ckground-i mage:url(. ./img/tick .png?2)}#c al-slide-c ontent:hov er{backgro und-color: transparen t}#cal-sli de-content a.event-i tem{color: #fff;font- weight:400 ;line-heig ht:22px}.e vents-list {max-heigh t:47px;pad ding-left: 5px}.cal-c olumn{bord er-left:1p x solid #e 1e1e1}a.ca l-event-we ek{text-de coration:n one;color: #151515}.b adge-impor tant{backg round-colo r:#b94a48} |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.