Skip to content

Commit

Permalink
Merge pull request vufind-org#17 from ajturpei/leiska2
Browse files Browse the repository at this point in the history 
Leiska2 - less fixes, minor changes and added toolbar
  • Loading branch information
@EreMaijala
EreMaijala committed Feb 24, 2015
2 parents df03a9f + 81cbf90 commit b72403f
Show file tree
Hide file tree
Showing 18 changed files with 308 additions and 66 deletions.
2 changes: 1 addition & 1 deletion themes/finna/css/finna.css
View file

Large diffs are not rendered by default.

Binary file added themes/finna/images/finna-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions themes/finna/images/finna-logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 49 additions & 7 deletions themes/finna/less/bootstrap.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,31 @@ label.list-group-item {border-radius:0;font-weight:normal;margin-top:0;padding-l
#modal .modal-body > h2:first-child {display:none}
.tab-content {padding:4px}

/* --- Finna records ... */
/* --- Finna local records ... */
.template-name-view #record h3 {
margin:0;
margin-bottom: 3px;
}
.record-authors {
.date-and-year();
}
.record-details {
& th {
width: 30%;
}
}

.show-details-button {
margin-bottom: 5px;
cursor: pointer;
}
.record-details {
margin:10px 0px;

margin:10px 0px;
}
.physical-details {
color: @gray-light;
}

@media(max-width:@screen-xs-max) {
.cover-wrapper, .record-title, .record-authors {
text-align: center;
Expand All @@ -371,7 +380,6 @@ label.list-group-item {border-radius:0;font-weight:normal;margin-top:0;padding-l
.twitter-typeahead {
background: transparent;
top: 3px;
margin-right: -5px;
vertical-align: top;
.tt-hint {display:none}
}
Expand Down Expand Up @@ -640,7 +648,6 @@ label.list-group-item {border-radius:0;font-weight:normal;margin-top:0;padding-l
text-decoration: none;
}
.sidebar .list-group-item i.fa.fa-square-o, .sidebar .list-group-item i.fa.fa-check-square-o {
font-size: 22px;
vertical-align: middle;
}

Expand Down Expand Up @@ -744,6 +751,11 @@ label.list-group-item {border-radius:0;font-weight:normal;margin-top:0;padding-l
width: 10px;
margin-left: -16px;
margin-right: 4px;
@media(max-width:@screen-xs-max) {
margin-top:-3px;
margin-right: 10px;
font-size: 1.3em;
}
}
.facet .jstree-default .jstree-open > .jstree-ocl:before {
content: "\e027";
Expand Down Expand Up @@ -772,6 +784,9 @@ ul.jstree-container-ul > li.jstree-node, .list-group.facet .list-group-item:not(
padding: 5px 10px 5px 20px;
background: whitesmoke;
border-bottom:2px solid @body-bg;
@media(max-width:@screen-xs-max) {
font-size: 1.15em;
}
}
.jstree-facet .jstree-container-ul {
padding: 0;
Expand All @@ -793,7 +808,30 @@ ul.jstree-container-ul > li.jstree-node, .list-group.facet .list-group-item:not(
cursor: pointer;
text-decoration: line-through;
}

//== PCI
.template-dir-primo.template-name-search .row.result, .sourcePrimo {
border-bottom: 1px solid @gray-lighter;
& .summary {
color: @gray-light;
}
}
.sourcePrimo .summary {
font-size: 1.1em;
}
.primo-available-online {
padding: 5px;
border: 3px solid @gray-lighter;
& p {
margin: 0px;
}
& a {
display: block;
}
}
.primo-available-online-record, .local-available-online-record {
margin: 10px 0px;
font-size: 1.1em;
}
//== PCI FACETS
#creationdateFilter, #publishDateFilter {
& input[type="text"] {
Expand Down Expand Up @@ -824,7 +862,11 @@ ul.jstree-container-ul > li.jstree-node, .list-group.facet .list-group-item:not(
}
}


//== CONTENT PAGES
.content-section {
padding-bottom: 20px;
border-bottom: 1px solid @gray-lighter;
}
//Finna mixins

.resetMarginsPaddings {
Expand Down
7 changes: 4 additions & 3 deletions themes/finna/less/bootstrap/breadcrumbs.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@

.breadcrumb {
margin: 0px;
margin-top: 10px;
margin-top: 15px;
list-style: none;
border-radius: @border-radius-base;

> li {
display: inline-block;
background-color: @breadcrumb-bg;
margin: 0px -2px;
padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;
+ li:before {
font-family: "icomoon";
content: "\e025"; // Unicode space added since inline-block means non-collapsing white-space
content: @breadcrumb-separator;
color: @breadcrumb-color;
font-size: 12px;
}
}
> li a {
Expand Down
7 changes: 3 additions & 4 deletions themes/finna/less/bootstrap/buttons.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,22 +238,21 @@
color: @body-bg;
}
&.prefilter-select {
color: rgb(136, 136, 136);
color: @gray;
font-weight: bold;
display: inline-block;
padding-right: 17px;
padding-top: 1px;
margin-top: 2px;
position: relative;
background: transparent;
line-height: 35px;
width: 26%;
width: 25%;

& select {
color: @gray;
}
}
&.prefilter-select:before {
top: 1px;
right: 12px;
background: @body-bg;
}
Expand Down
79 changes: 53 additions & 26 deletions themes/finna/less/bootstrap/finna/finnaicons.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
font-style: normal;
}

[class^="fa-"], [class*=" fa-"], .iconlabel:before, .slick-prev, .slick-next, .slick-dots li {
[class^="fa-"], [class*=" fa-"], .iconlabel:before, .slick-prev, .slick-next, .slick-dots li, .openUrlEmbed:before {
font-family: 'icomoon';
speak: none;
text-transform: none;
Expand All @@ -28,19 +28,19 @@
cursor: pointer;
}
.iconlabel {
color: #464646;
color: @gray;
background: none;
padding: 0px;
font-weight: 400;
margin-right: 10px;
font-size: 14px;
font-size: 1.1em;
&:before {
padding-right: 3px;
}
}
.template-name-results .iconlabel {
letter-spacing: 0px;
font-size: 13px;
}
.iconlabel:before {
padding-right: 3px;
font-size: 1em;
}
.fa-spinner {
margin-left: 5px;
Expand All @@ -65,20 +65,33 @@
/* --- set navbar logo display only the logo --- */
.navbar-header .fa-finnalogo {
width: 30px;
height: 40px;
background: url('../images/finna-logo.png'); // fallback if no svg support
background: url('../images/finna-logo.svg');
overflow: hidden;
vertical-align: middle;
background-repeat: no-repeat;
background-position: 0px 2px;
background-size: 340%;
}
.fa-finnalogo:before {
content: "\e60b";
font-weight:300;

.logo .finnalogo {
display: inline-block;
width: 200px;
height: 63px;
background: url('../images/finna-logo.png'); // fallback if no svg support
background: url('../images/finna-logo.svg');
&:hover {
cursor: pointer;
}
}
.iconlabel.ekirja:before, .iconlabel.ekirjanosa:before, .iconlabel.elektroninen:before {
content: "\e617";
}
.iconlabel.kirja:before, .iconlabel.kirjanosa:before, .iconlabel.book:before {
content: "\e616";
}
.fa-www-link:before {
.fa-www-link:before, .iconlabel.electronic:before, .fa-external-link:before, .openUrlEmbed:before {
content: "\e615";
}
.fa-handle-left:before, .slick-prev:before {
Expand Down Expand Up @@ -166,12 +179,16 @@
.fa-sign-in:before {
content: "\e042";
}
.fa-logout:before {
.fa-sign-out:before {
vertical-align: middle;
content: "\e042";
}
.fa-home:before {
content: "\e041";
}
.navbar .fa-home:before {
color: @navbar-default-link-color;
}
.fa-public:before {
content: "\e040";
}
Expand Down Expand Up @@ -389,24 +406,34 @@
.nav-pills .fa.fa-asterisk {
padding: 6px 7px;
}
@media(max-width:767px) {
.nav-pills .fa {
font-size: 16px;
padding: 8px 9px 9px 9px;
color: #fff;
background: #00a2b5;
border-radius: 50%;
margin-left:2px;
}

.nav-pills .fa.fa-asterisk {
padding: 8px 10px;
}
@media(max-width: @screen-sm-max) {
.nav-pills .fa {
font-size: 16px;
padding: 8px 9px 9px 9px;
color: #fff;
background: #00a2b5;
border-radius: 50%;
margin-left:2px;
}
.nav-pills .fa.fa-asterisk {
padding: 8px 10px;
}
}
.nav-pills .fa.fa-phone {
background: #64d448;
}
/* Addthis icons for sharing styling */
.addthis-share-buttons {
margin-right: 5px !important;
@media(max-width:@screen-xs-max) {
clear: left;
}
@media(min-width:@screen-md-min) and (max-width:@screen-md-max) {
clear: both;
margin-left: 5px !important;
}
}
.addthis_default_style .at300b {
padding: 0px !important;
}
Expand Down Expand Up @@ -459,7 +486,7 @@
color: #a94442;
}
.fa-x:before {
content:"";
content:"" !important;
}
.sidebar .list-group-item i.fa.fa-square-o {
display: none;
Expand Down
Loading

0 comments on commit b72403f

Please sign in to comment.