<<<<<<< HEAD:public/stylesheets/icons.css
<<<<<<< HEAD:public/stylesheets/icons.css
=======
>>>>>>> b539350f09a6b8faa0db50f2223bfb1efe293c89:public/stylesheets/icons.css
/* From apple.com */
.pdf {background: url(../images/icons/pdf12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.html {background: url(../images/icons/html12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.qt {background: url(../images/icons/qt12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.ical {background: url(../images/icons/ical12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.dl {background: url(../images/icons/dl11x10.gif) left top no-repeat; display: inline; padding-left: 20px;}
.dmg {background: url(../images/icons/dmg12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.zip {background: url(../images/icons/zip12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.keynote {background: url(../images/icons/keynote12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.audio {background: url(../images/icons/audio12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}

/* NEW */
.doc, .jpg, .gif {background: url(../images/icons/doc12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.lock {background: url(../images/icons/lock12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.unlock {background: url(../images/icons/unlock12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.pdf_lg {background: url(../images/icons/pdflg12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.pencil {background: url(../images/icons/pencil12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.trashcan {background: url(../images/icons/trashcan12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.txt {background: url(../images/icons/txt12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
<<<<<<< HEAD:public/stylesheets/icons.css
=======
/* From apple.com */
.pdf {background: url(../images/icons/pdf12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.html {background: url(../images/icons/html12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.qt {background: url(../images/icons/qt12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.ical {background: url(../images/icons/ical12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.dl {background: url(../images/icons/dl11x10.gif) left top no-repeat; display: inline; padding-left: 20px;}
.dmg {background: url(../images/icons/dmg12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.zip {background: url(../images/icons/zip12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.keynote {background: url(../images/icons/keynote12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.audio {background: url(../images/icons/audio12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}

/* NEW */
.doc, .jpg, .gif {background: url(../images/icons/doc12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.lock {background: url(../images/icons/lock12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.unlock {background: url(../images/icons/unlock12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.pdf_lg {background: url(../images/icons/pdflg12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.pencil {background: url(../images/icons/pencil12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.trashcan {background: url(../images/icons/trashcan12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
.txt {background: url(../images/icons/txt12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}
>>>>>>> 2ec95fd5525bc30aa87e7388b0d6fdc14c22f276:public/stylesheets/icons.css
=======
>>>>>>> b539350f09a6b8faa0db50f2223bfb1efe293c89:public/stylesheets/icons.css
.xls {background: url(../images/icons/xls12x12.gif) left top no-repeat; display: inline; padding-left: 20px;}