Procházet zdrojové kódy

Merge branch 'dev'

master
Guillaume Bourgeois před 5 roky
rodič
revize
7178ef6943
2 změnil soubory, kde provedl 37 přidání a 26 odebrání
  1. +31
    -26
      producer/web/css/screen.css
  2. +6
    -0
      producer/web/sass/_layout.scss

+ 31
- 26
producer/web/css/screen.css Zobrazit soubor

@@ -420,12 +420,17 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
#main #img-big {
height: 130px;
overflow: hidden;
position: relative;
}
/* line 338, ../sass/_layout.scss */
/* line 340, ../sass/_layout.scss */
#main #img-big img.img-photo {
width: 100%;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
/* line 344, ../sass/_layout.scss */
/* line 350, ../sass/_layout.scss */
#main #infos-producer {
padding: 5px 10px;
margin-bottom: 0px;
@@ -435,20 +440,20 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
border-bottom: solid 1px #e0e0e0;
color: gray;
}
/* line 353, ../sass/_layout.scss */
/* line 359, ../sass/_layout.scss */
#main #infos-producer strong {
font-weight: bold;
}
/* line 357, ../sass/_layout.scss */
/* line 363, ../sass/_layout.scss */
#main #infos-producer .favorite {
float: right;
color: gray;
}
/* line 360, ../sass/_layout.scss */
/* line 366, ../sass/_layout.scss */
#main #infos-producer .favorite a {
color: black;
}
/* line 366, ../sass/_layout.scss */
/* line 372, ../sass/_layout.scss */
#main h2#page-title {
padding-left: 15px;
padding-right: 15px;
@@ -463,36 +468,36 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
top: -10px;
text-align: left;
}
/* line 380, ../sass/_layout.scss */
/* line 386, ../sass/_layout.scss */
#main h2#page-title #buttons {
margin-bottom: 15px;
font-family: "Arial";
}
/* line 387, ../sass/_layout.scss */
/* line 393, ../sass/_layout.scss */
#main #content {
padding: 0px 20px 20px 20px;
padding-bottom: 40px;
min-height: 300px;
}
/* line 392, ../sass/_layout.scss */
/* line 398, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "highvoltageregular";
margin-top: 30px;
margin-bottom: 20px;
}
/* line 397, ../sass/_layout.scss */
/* line 403, ../sass/_layout.scss */
#main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
margin-top: 0px;
}
/* line 402, ../sass/_layout.scss */
/* line 408, ../sass/_layout.scss */
#main #content h1 {
font-size: 30px;
}
/* line 406, ../sass/_layout.scss */
/* line 412, ../sass/_layout.scss */
#main #content h2 {
font-size: 25px;
}
/* line 411, ../sass/_layout.scss */
/* line 417, ../sass/_layout.scss */
#main #content h3 {
font-family: "highvoltageregular";
font-family: "capsuularegular";
@@ -502,29 +507,29 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
margin-bottom: 30px;
margin-top: 45px;
}
/* line 420, ../sass/_layout.scss */
/* line 426, ../sass/_layout.scss */
#main #content h3 span {
padding-top: 14px;
color: #323232;
}
/* line 426, ../sass/_layout.scss */
/* line 432, ../sass/_layout.scss */
#main #content h4 {
font-size: 20px;
}
/* line 430, ../sass/_layout.scss */
/* line 436, ../sass/_layout.scss */
#main #content h5 {
font-size: 18px;
}
/* line 434, ../sass/_layout.scss */
/* line 440, ../sass/_layout.scss */
#main #content h6 {
font-size: 16px;
}
/* line 440, ../sass/_layout.scss */
/* line 446, ../sass/_layout.scss */
#main #content form .form-group .hint-block {
color: gray;
}

/* line 448, ../sass/_layout.scss */
/* line 454, ../sass/_layout.scss */
#footer-producer {
text-align: center;
position: absolute;
@@ -532,28 +537,28 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 0px;
width: 100%;
}
/* line 455, ../sass/_layout.scss */
/* line 461, ../sass/_layout.scss */
#footer-producer a {
color: #FF7F00;
}
/* line 457, ../sass/_layout.scss */
/* line 463, ../sass/_layout.scss */
#footer-producer a:active {
text-decoration: underline;
}

/* line 463, ../sass/_layout.scss */
/* line 469, ../sass/_layout.scss */
#footer {
background-color: #FFF8DC;
height: 100px;
float: right;
text-align: center;
}
/* line 469, ../sass/_layout.scss */
/* line 475, ../sass/_layout.scss */
#footer .content {
padding-top: 20px;
color: black;
}
/* line 473, ../sass/_layout.scss */
/* line 479, ../sass/_layout.scss */
#footer .content a {
color: black;
font-family: "capsuularegular";
@@ -561,11 +566,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding-left: 10px;
padding-right: 10px;
}
/* line 480, ../sass/_layout.scss */
/* line 486, ../sass/_layout.scss */
#footer .content a:hover {
text-decoration: underline;
}
/* line 487, ../sass/_layout.scss */
/* line 493, ../sass/_layout.scss */
#footer #code-source img {
height: 20px;
}

+ 6
- 0
producer/web/sass/_layout.scss Zobrazit soubor

@@ -335,8 +335,14 @@ ul.pagination {
#img-big {
height: 130px ;
overflow: hidden ;
position: relative ;
img.img-photo {
width: 100% ;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}

Načítá se…
Zrušit
Uložit