Commit bca4edf1 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge commit '68e4054a' into staging

* commit '68e4054a':
  rtl-languages-layout
parents 415ea61d 68e4054a
......@@ -80,7 +80,7 @@ $light-font-family: 'Roboto-Light';
&::-moz-placeholder {@content}
&:-ms-input-placeholder {@content}
}
.genesys-page {
font-family: $default-font-family;
......@@ -334,7 +334,7 @@ $light-font-family: 'Roboto-Light';
font-family: 'FontAwesome';
font-size: 20px;
position: absolute;
left: 94%;
/*left: 94%;*/
top: 0;
width: 26px;
height: 100%;
......@@ -416,7 +416,7 @@ $light-font-family: 'Roboto-Light';
position: relative;
padding-left: 5px;
h2.short {
left: 5px;
/*left: 5px;*/
}
.all-stats {
margin-top: 85px;
......@@ -472,10 +472,10 @@ $light-font-family: 'Roboto-Light';
font-family: $heading-font-family;
font-size: 16px;
color: $dark-text-color;
margin-top: 16px;
margin-top: 0;
margin-bottom: 21px;
line-height: inherit;
padding: 0 10px;
padding: 0;
}
.form-group {
margin-left: 2px;
......@@ -510,8 +510,8 @@ $light-font-family: 'Roboto-Light';
font-family: $heading-font-family;
display: inline-block;
vertical-align: middle;
width: 60%;
padding-top: 36px;
/*width: 60%;
padding-top: 36px;*/
}
}
}
......@@ -519,11 +519,11 @@ $light-font-family: 'Roboto-Light';
.tab-content {
padding: 50px 0px 30px 0px;
margin-left: 5px;
/*margin-left: 5px;*/
background: $white-color;
.post-left-pad {
padding-left: 75px;
/*padding-left: 75px;*/
}
.all-posts {
padding: 10px 10px 0px;
......@@ -550,7 +550,7 @@ $light-font-family: 'Roboto-Light';
font-family: $default-font-family;
font-size: 16px;
line-height: 25px;
padding: 10px 10% 0px 0px;
/*padding: 10px 10% 0px 0px;*/
p {
margin: 0px 0 22px;
......@@ -621,13 +621,13 @@ $light-font-family: 'Roboto-Light';
#middle-col.col-md-8 {
background-color: $content-footer-bg;
.short {
left: 5px;
/*left: 5px;*/
}
}
#right-col.col-md-4 {
background-color: $content-footer-bg;
.short {
left: 0px;
/*left: 0px;*/
}
.blurp {
......@@ -812,13 +812,13 @@ $light-font-family: 'Roboto-Light';
min-width: 262px;
padding: 15px 20px 15px 20px;
position: absolute;
left: 2px;
/*left: 2px;*/
top: 0;
margin: 0;
text-transform: uppercase;
&:after {
left: 100%;
/*left: 100%;*/
top: 0;
position: absolute;
content: '';
......@@ -826,9 +826,9 @@ $light-font-family: 'Roboto-Light';
height: 0;
border-top: 0px solid transparent;
border-bottom: 49px solid transparent;
border-left-width: 50px;
/*border-left-width: 50px;
border-left-style: solid;
border-left-color: rgba(43, 41, 36, 0.7);
border-left-color: rgba(43, 41, 36, 0.7);*/
}
}
......@@ -837,7 +837,7 @@ $light-font-family: 'Roboto-Light';
&:after {
content: '';
position: absolute;
left: 67%;
/*left: 67%;*/
width: 4px;
height: 100%;
top: 0;
......@@ -894,7 +894,7 @@ $light-font-family: 'Roboto-Light';
}
.main-col {
padding: 33px 40px 49px 39px;
padding: 33px 40px 49px 40px;
background: $white-color;
float: left;
width: 66.6%;
......@@ -951,6 +951,7 @@ $light-font-family: 'Roboto-Light';
display: inline-block;
vertical-align: middle;
margin: 0;
padding: 0;
li {
vertical-align: middle;
......@@ -1068,7 +1069,7 @@ $light-font-family: 'Roboto-Light';
vertical-align: middle;
width: 14px;
height: 18px;
margin-right: 6px;
/*margin-right: 6px;*/
}
......@@ -1083,7 +1084,10 @@ $light-font-family: 'Roboto-Light';
.pagination {
margin: 20px 0;
padding: 0;
li {
display: inline-block;
margin: 0 -2px;
> span, > a {
background: #efeeef;
border: 1px solid #949490;
......@@ -1188,7 +1192,7 @@ $light-font-family: 'Roboto-Light';
div {
width: 20%;
text-align: right;
/*text-align: right;*/
}
&:nth-child(odd) {
background: #f8f7f4;
......@@ -1216,7 +1220,7 @@ $light-font-family: 'Roboto-Light';
height: auto;
li {
padding: 12px 0px 13px 10px;
/*padding: 12px 0px 13px 10px;*/
display: inline-block;
width: 100%;
vertical-align: top;
......@@ -1244,6 +1248,196 @@ $light-font-family: 'Roboto-Light';
}
}
//LTR and RTL rules outside genesys-page class
//header
#navbar .header-search form.form-inline .form-group:before {
html[dir="ltr"] & {
left: 94%;
}
html[dir="rtl"] & {
right: 94%;
}
}
//forms
form.form-horizontal .form-group {
html[dir="ltr"] & {
text-align: left;
}
html[dir="rtl"] & {
text-align: right;
}
& > div {
html[dir="ltr"] & {
border-left: 2px solid #E7E5DF;
}
html[dir="rtl"] & {
border-right: 2px solid #E7E5DF;
}
}
.control-label {
html[dir="ltr"] & {
text-align: left;
}
html[dir="rtl"] & {
text-align: right;
}
}
& > label[for="blurp-body"] + div,
& > label[for="faoInstitute-summary"] + div,
& > label[for="article-body"] + div,
& > label[for="article-summary"] + div {
html[dir="ltr"] & {
border-left: none;
}
html[dir="rtl"] & {
border-right: none;
}
}
input {
html[dir="ltr"] & {
text-align: left;
}
html[dir="rtl"] & {
text-align: right;
}
}
.checkbox {
html[dir="ltr"] & {
padding: 10px 0 11px 15px;
}
html[dir="rtl"] & {
padding: 10px 15px 11px 0;
}
}
}
//welcome page
h2.short {
html[dir="ltr"] & {
left: 2px;
}
html[dir="rtl"] & {
right: 2px;
}
&:after {
html[dir="ltr"] & {
left: 100%;
border-left-width: 50px;
border-left-style: solid;
border-left-color: rgba(43, 41, 36, 0.7);
}
html[dir="rtl"] & {
right: 100%;
border-right-width: 50px;
border-right-style: solid;
border-right-color: rgba(43, 41, 36, 0.7);
}
}
}
#content #middle-col.col-md-8 .short {
html[dir="ltr"] & {
left: 5px;
}
html[dir="rtl"] & {
right: 5px;
}
}
#content #right-col.col-md-4 .short {
html[dir="ltr"] & {
left: 0px;
}
html[dir="rtl"] & {
right: 0px;
}
}
#content .row.map #stats h2.short {
html[dir="ltr"] & {
left: 5px;
}
html[dir="rtl"] & {
right: 5px;
}
}
#content .see-also-row .see-also-block .content .body {
html[dir="ltr"] & {
padding-left: 5.7%;
}
html[dir="rtl"] & {
padding-right: 5.7%;
}
}
#content .tab-content {
html[dir="ltr"] & {
margin-left: 5px;
}
html[dir="rtl"] & {
margin-right: 5px;
}
}
#content .tab-content .post .post-content {
html[dir="ltr"] & {
padding: 10px 10% 0 0;
}
html[dir="rtl"] & {
padding: 10px 0 0 10%;
}
}
#content #middle-col.col-md-8 .post-left-pad {
html[dir="ltr"] & {
padding-left: 75px;
}
html[dir="rtl"] & {
padding-right: 75px;
}
}
.center-divider:after {
html[dir="ltr"] & {
left: 67%;
}
html[dir="rtl"] & {
right: 67%;
}
}
#content #right-col.col-md-4 .blurp p {
html[dir="ltr"] & {
padding-left: 5.7%;
}
html[dir="rtl"] & {
padding-right: 5.7%;
}
}
.funny-list li {
html[dir="ltr"] & {
padding: 12px 0px 13px 10px;
}
html[dir="rtl"] & {
padding: 12px 10px 13px 0px;
}
}
//institute page
.institutes-page {
.institute-list > div div {
html[dir="ltr"] & {
text-align: right;
}
html[dir="rtl"] & {
text-align: left;
}
}
.list-view-controls a:before {
html[dir="ltr"] & {
margin-right: 6px;
}
html[dir="rtl"] & {
margin-left: 6px;
}
}
}
//accession page
.accession-page {
......@@ -1624,7 +1818,12 @@ $light-font-family: 'Roboto-Light';
width: 90%;
}
select.column-changer + span.glyphicon.glyphicon-menu-down {
right: 20px;
html[dir="ltr"] & {
right: 20px;
}
html[dir="rtl"] & {
left: 20px;
}
top: 2px;
pointer-events: none;
}
......@@ -1686,11 +1885,16 @@ $light-font-family: 'Roboto-Light';
}
}
.btn-secondary {
html[dir="ltr"] & {
border-right-color: #bbbbbb;
}
html[dir="rtl"] & {
border-left-color: #bbbbbb;
}
border-radius: 0;
background-color: #e9e9e9;
border-bottom-color: #bbbbbb;
border-top-color: #bbbbbb;
border-right-color: #bbbbbb;
font-size: 12px;
padding: 6px 9px;
}
......@@ -1706,10 +1910,21 @@ $light-font-family: 'Roboto-Light';
-moz-appearance: none;
appearance: none;
position: relative;
html[dir="ltr"] & {
float: left;
}
html[dir="rtl"] & {
float: right;
}
}
span.glyphicon.glyphicon-menu-down {
html[dir="ltr"] & {
right: 1px;
}
html[dir="rtl"] & {
left: 1px;
}
position: absolute;
right: 1px;
z-index: 2;
top: 1px;
pointer-events: none;
......@@ -1757,6 +1972,13 @@ $light-font-family: 'Roboto-Light';
padding: 0;
line-height: 40px;
}
#collapseFilters #panel_art15 {
.panel-heading {
html[dir="rtl"] & {
height: auto;
}
}
}
#collapseFilters > .panel-body {
/*border-top: 1px solid #d5d4d3;*/
padding: 7px 20px 15px 20px;
......@@ -1765,9 +1987,14 @@ $light-font-family: 'Roboto-Light';
padding: 0 0 15px 0;
}
.panel-heading a:after {
html[dir="ltr"] & {
float: right;
}
html[dir="rtl"] & {
float: left;
}
font-family: 'FontAwesome';
content: "\f077";
float: right;
font-size: 14px;
}
.panel-heading a.collapsed:after {
......@@ -1812,10 +2039,15 @@ $light-font-family: 'Roboto-Light';
margin-top: 10px;
margin-bottom: 10px;
label {
html[dir="ltr"] & {
padding-left: 20px;
}
html[dir="rtl"] & {
padding-right: 20px;
}
font-size: 14px;
font-family: $default-font-family;
min-height: 22px;
padding-left: 20px;
margin-bottom: 0;
font-weight: normal;
cursor: pointer;
......@@ -1823,12 +2055,22 @@ $light-font-family: 'Roboto-Light';
}
input {
position: absolute;
margin: 4px 0 0 -20px;
html[dir="ltr"] & {
margin: 4px 0 0 -20px;
}
html[dir="rtl"] & {
margin: 4px -20px 0 0;
}
}
}
div.radio-wrapper {
input {
margin: 4px 0 0 0;
html[dir="ltr"] & {
margin: 4px 0 0 0;
}
html[dir="rtl"] & {
margin: 4px 0 0 0;
}
}
}
}
......@@ -1845,9 +2087,19 @@ $light-font-family: 'Roboto-Light';
margin: 10px 0;
a {
padding: 6px 15px 4px;
margin-right: 5px;
html[dir="ltr"] & {
margin-right: 5px;
}
html[dir="rtl"] & {
margin-left: 5px;
}
&:last-child {
margin-right: 0;
html[dir="ltr"] & {
margin-right: 0;
}
html[dir="rtl"] & {
margin-left: 0;
}
}
}
#shareLink {
......@@ -1857,8 +2109,15 @@ $light-font-family: 'Roboto-Light';
}
#displayColumns {
.view-columns {
html[dir="rtl"] & {
right: 0;
left: auto;
}
padding: 10px;
li {
html[dir="rtl"] & {
text-align: right;
}
color: #000000;
position: relative;
display: block;
......@@ -2057,7 +2316,7 @@ $light-font-family: 'Roboto-Light';
h1.green-bg {
color: #ffffff;
font-family: $heading-font-family;
padding: 20px 15px 23px 20px;
padding: 20px 20px 23px 20px;
font-size: 24px;
margin: 0 -15px 20px -15px;
}
......@@ -2076,7 +2335,12 @@ h1.green-bg {
height: auto;
}
.map-container {
padding-right: 0;
html[dir="ltr"] & {
padding-right: 0;
}
html[dir="rtl"] & {
padding-left: 0;
}
& > div {
padding-left: 0;
padding-right: 0;
......@@ -2086,6 +2350,9 @@ h1.green-bg {
font-size: 14px;
font-family: $default-font-family;
padding: 0 0 15px 20px;
html[dir="rtl"] & {
padding: 0 20px 15px 0;
}
.row > div:first-child {
color: #4d4c46;
}
......@@ -2157,7 +2424,12 @@ table.accessions {
}
thead tr {
td {
padding: 6px 5px 6px 10px;
html[dir="ltr"] & {
padding: 6px 5px 6px 10px;
}
html[dir="rtl"] & {
padding: 6px 10px 6px 5px;
}
p {
font-size: 14px;
}
......@@ -2166,21 +2438,46 @@ table.accessions {
tbody tr {
&:nth-of-type(odd) td {
background-color: #f8f7f5;
border-right: 1px solid #e7e5df;
html[dir="ltr"] & {
border-right: 1px solid #e7e5df;
}
html[dir="rtl"] & {
border-left: 1px solid #e7e5df;
}
&:first-child, &:last-child {
border-right: none;
html[dir="ltr"] & {
border-right: none;
}
html[dir="rtl"] & {
border-left: none;
}
}
}
&:nth-of-type(even) td {
background-color: #f3f2ee;
border-right: 1px solid #e7e5df;
html[dir="ltr"] & {
border-right: 1px solid #e7e5df;
}
html[dir="rtl"] & {
border-left: 1px solid #e7e5df;
}
&:first-child, &:last-child {
border-right: none;
html[dir="ltr"] & {
border-right: none;
}
html[dir="rtl"] & {
border-left: none;
}
}
}
}
tr td {
padding: 10px 5px 10px 10px;
html[dir="ltr"] & {