Bug 10320: (follow-up) remove stray merge conflict marker

[koha.git] / koha-tmpl / opac-tmpl / prog / en / css / opac.css

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index cada641..0311bdd 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -30,6 +30,10 @@ body {
     color : #C00;
 }
 
+a.ButtonPlus, a.ButtonLess {
+      text-decoration : none;
+}
+
 caption {
        font-size : 140%;
        font-weight : bold;
@@ -161,6 +165,56 @@ fieldset.action p {
        margin-bottom : 1em;
 }
 
+div.rows+div.rows {
+    margin-top : .6em;
+}
+
+div.rows {
+    float : left;
+    clear : left;
+    margin: 0 0 0 0;
+    padding: 0;
+    width: 100%;
+}
+
+
+div.rows span.label {
+    float: left;
+    font-weight : bold;
+    width: 9em;
+    margin-right: 1em;
+    text-align: left;
+}
+
+div.rows ol {
+    padding: .5em 1em 0 0;
+    list-style-type: none;
+}
+
+div.rows ol li li {
+    border-bottom: 0;
+}
+
+div.rows li {
+    border-bottom :  1px solid #EEE;
+    float : left;
+    clear : left;
+    padding-bottom: .2em;
+    padding-top: .1em;
+    list-style-type: none;
+    width: 100%;
+}
+
+div.rows ul li:first-child {
+    float: none;
+    clear: none;
+    margin-left: 0;
+}
+
+div.rows ul li {
+    margin-left : 9em;
+}
+
 form {
        display : inline;
        margin : 0;
@@ -737,7 +791,7 @@ input.deleteshelf:active {
 
 a.tag_add {
     background-image: url("../../images/sprite.png"); /* Tag results */
-    background-position: -10px -1104px;
+    background-position: -10px -1110px;
     background-repeat: no-repeat;
     padding-left : 13px;
     text-decoration: none;
@@ -745,7 +799,7 @@ a.tag_add {
 
 #login4tags {
     background-image: url("../../images/sprite.png"); /* Tag results disabled */
-    background-position: -10px -1124px;
+    background-position: -10px -1130px;
     background-repeat: no-repeat;
     padding-left : 13px;
     text-decoration: none;
@@ -775,6 +829,7 @@ a.tag_add {
        text-decoration : none;
        padding-left : 33px;
 }
+
 /* Search results place hold link */
 #placehold input.submit {
     background-image: url("../../images/sprite.png"); /* Place hold */
@@ -1448,6 +1503,10 @@ padding-left : .4em;
     margin-top : .5em;
 }
 
+.actions a {
+    white-space: nowrap;
+}
+
 .m880 {
     display:block; 
     text-align:right; 
@@ -1483,7 +1542,8 @@ padding-left : .4em;
 .actions a.addtocart,
 .actions a.addtoshelf,
 .actions a.addtolist,
-.actions a.tag_add {
+.actions a.tag_add,
+.actions a.removefromlist {
        margin-left : 1em;
        text-decoration : none;
 }
@@ -1505,6 +1565,16 @@ padding-left : .4em;
        display : none;
 }
 
+/* List contents remove from list link */
+.removefromlist  {
+    background-image : url("../../images/sprite.png"); /* Delete */
+    background-position : -8px -690px;
+    background-repeat: no-repeat;
+    text-decoration : none;
+    padding-left : 15px;
+    display : none;
+}
+
 /* Search results rows save to lists */
 .actions a.addtoshelf {
     background-image : url("../../images/sprite.png"); /* MARC view */
@@ -1682,6 +1752,10 @@ ul#i18nMenu li.more ul li a {
        background-image : none;
        padding: 0 1.3em;
 }
+.morelang,
+li.more {
+float:left
+}
 
 span.lang{
        float:left;
@@ -2033,7 +2107,6 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhisto
 #shelfbrowser #browser_next,
 #shelfbrowser #browser_previous {
     background-image : url("../../images/sprite.png");
-    background-position : -5px -988px;
     background-repeat: no-repeat;
     width : 16px;
 }
@@ -2049,10 +2122,10 @@ a#MARCview, a#MARCviewPop, a#ISBDview, a#Normalview, a#Fullhistory, a#Briefhisto
     width: 16px;
 }
 #shelfbrowser #browser_previous {
-background-position: -9px -1001px;
+background-position: -9px -1007px;
 }
 #shelfbrowser #browser_next {
-background-position: -9px -1051px;
+background-position: -9px -1057px;
 }
 
 #comments .commentline {
@@ -2254,13 +2327,13 @@ div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px;
 
 #renewselected_link {
     background-image : url("../../images/sprite.png");
-    background-position : -5px -988px;
+    background-position : -5px -986px;
     background-repeat: no-repeat;
 }
 
 #renewall_link {
     background-image : url("../../images/sprite.png");
-    background-position : -8px -964px;
+    background-position : -8px -967px;
     background-repeat: no-repeat;
 }
 
@@ -2787,6 +2860,7 @@ div.authorizedheading {
     width: 75%;
 }
 
+
 .contentblock {
     position: relative;
     margin-left: 2em;
@@ -2938,3 +3012,54 @@ a.reviewlink,a.reviewlink:visited {
 .branch-info-tooltip {
     display: none;
 }
+.lang {
+float:left;
+padding: 0.1em 0;
+}
+.notesrow label {
+    font-weight: bold;
+}
+.notesrow span {
+    display: block;
+}
+.notesrow textarea {
+    width: 100%;
+}
+
+.thumbnail-shelfbrowser span {
+    margin: 0px auto;
+}
+
+.sorting_asc {
+    padding-right: 19px;
+    background: url("../../images/asc.gif") no-repeat scroll right center #EEEEEE;
+}
+.sorting_desc {
+    padding-right: 19px;
+    background: url("../../images/desc.gif") no-repeat scroll right center #EEEEEE;
+}
+.sorting {
+    padding-right: 19px;
+    background: url("../../images/ascdesc.gif") no-repeat scroll right center #EEEEEE;
+}
+.nosort,
+.nosort.sorting_asc,
+.nosort.sorting_desc,
+.nosort.sorting {
+    padding-right: 19px;
+    background: #EEEEEE none;
+}
+
+#overdrive-results {
+    font-weight: bold;
+    padding-left: 1em;
+}
+
+.throbber {
+    vertical-align: middle;
+}
+
+#overdrive-results-list .star-rating-control {
+    display: block;
+    overflow: auto;
+}